From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11696 invoked by alias); 16 Feb 2015 14:52:29 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 11637 invoked by uid 10076); 16 Feb 2015 14:52:29 -0000 Date: Mon, 16 Feb 2015 14:52:00 -0000 Message-ID: <20150216145229.11601.qmail@sourceware.org> From: gratz@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.869-10-g06eb661 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 532d85e8d77b783b95ba321ae75db2dffebe9f98 X-Git-Newrev: 06eb6617d0aa9fdd9fecb760df760e237929ac21 X-SW-Source: 2015-q1/txt/msg00026.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=06eb6617d0aa9fdd9fecb760df760e237929ac21 commit 06eb6617d0aa9fdd9fecb760df760e237929ac21 Author: Achim Gratz Date: Sat Feb 14 19:40:52 2015 +0100 Create XZ compressed archive using git ls-files * Makefile.am (setup-src): Create file list for archive from git-ls-files instead of cvs and create an XZ compressed archive. https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=ba3279e3a40f344152cf5badf82292fa51446af5 commit ba3279e3a40f344152cf5badf82292fa51446af5 Author: Achim Gratz Date: Sat Feb 14 18:42:12 2015 +0100 Use git-describe to determine release version * Makefile.am (VER): Use git-describe to construct version string based on annotated release tags. (setup_version.c): Echo setup version, use round parens instead of curlies. Diff: --- ChangeLog | 12 ++++++++++++ Makefile.am | 18 ++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24a5229..afe5d1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2015-02-16 Achim Gratz > + + * Makefile.am (setup-src): Create file list for archive from + git-ls-files instead of cvs and create an XZ compressed archive. + +2015-02-16 Achim Gratz > + + * Makefile.am (VER): Use git-describe to construct version string + based on annotated release tags. + (setup_version.c): Echo setup version, use round parens instead of + curlies. + 2015-02-10 Corinna Vinschen * Makefile.am (VER): Don't use ChangeLog revision number since git diff --git a/Makefile.am b/Makefile.am index 676f08d..88330d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -276,11 +276,13 @@ inilint_SOURCES = \ csu_util/version_compare.h \ regex/regex.c -VER := $(shell cd ${srcdir} && git rev-list master --count ChangeLog) +GITVER := $(shell cd $(srcdir) && git describe --match release_\* --abbrev=6 HEAD || "N/A") +VER := $(subst release_,,$(GITVER)) setup_version.c : $(srcdir)/ChangeLog Makefile + @echo "Setup version: " $(VER) $(AM_V_GEN)(echo '#define VERSION_PREFIX "%%% setup-version"';\ - echo 'static const char version_store[] = VERSION_PREFIX " '${VER}'";';\ + echo 'static const char version_store[] = VERSION_PREFIX " '$(VER)'";';\ echo 'const char *setup_version = version_store + sizeof (VERSION_PREFIX);') > version.tmp && \ mv version.tmp setup_version.c @@ -290,15 +292,11 @@ res.o: @SETUP@.exe.manifest .rc.o: $(AM_V_GEN)$(WINDRES) --include-dir $(srcdir) -o $@ $< -# static const char version_store[] = VERSION_PREFIX " 2.686"; setup-src: - @ver=setup-$$(sed -n 's/^static const char version_store.* VERSION_PREFIX " \([^"]*\)".*$$/\1/p' setup_version.c);\ - cd ${srcdir};\ - rm -f $$ver;\ - ln -sf . $$ver;\ - cvs status -R | sed -n "s%^ *Repository revision:.*/cvs/cygwin-apps/setup/\(.*\),v%$$ver/\1%p" |\ - sort | tar -T - -cjf ${CURDIR}/$$ver-src.tar.bz2;\ - echo $$ver-src.tar.bz2; exec rm -f $$ver + @ver=setup-$(VER);\ + cd ${srcdir}; rm -f $$ver; ln -sf . $$ver;\ + git ls-files | tar -T - -cJf ${CURDIR}/$$ver-src.tar.xz;\ + echo $$ver-src.tar.xz; exec rm -f $$ver # optional: strip and compress executable .PHONY: strip upx