[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-92-g2635df7
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Feb 24 14:56:05 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, kleo-kf5 has been updated
via 2635df7aed7aac81dc7983c3651b9ad660f10dd3 (commit)
via d1b1b6b7856664410b7c89d24cccb13b09dc0ec3 (commit)
from 1100a025c802c08fb5b791a128937eec355cad48 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2635df7aed7aac81dc7983c3651b9ad660f10dd3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Feb 24 14:54:48 2016 +0100
Move installers into subdir and print success
* Makefile.am (copy-release): Update path of installers
* src/Makefile.am: Move installers into subdir.
* src/gpg4win.mk.in: Add installers subdir to directories target.
diff --git a/Makefile.am b/Makefile.am
index fc0f1c7..708c7bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,19 +59,19 @@ copy-news:
cp NEWS doc/website/NEWS.last
-copy-release: gpg4win-$(VERSION).tar.bz2 src/gpg4win-$(VERSION).exe \
- src/gpg4win-light-$(VERSION).exe \
- src/gpg4win-vanilla-$(VERSION).exe
+copy-release: gpg4win-$(VERSION).tar.bz2 installers/gpg4win-$(VERSION).exe \
+ installers/gpg4win-light-$(VERSION).exe \
+ installers/gpg4win-vanilla-$(VERSION).exe
@echo Copying $(VERSION) to $(RELEASEHOST) >&2
@set -e;\
if ssh "$$(echo $(RELEASEHOST)|cut -d: -f -1)" \
test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe|cut -d: -f2-)";\
then echo "This release has already been copied to the server" >&2 ;\
else scp gpg4win-$(VERSION).tar.bz2 \
- src/gpg4win-$(VERSION).exe \
- src/gpg4win-light-$(VERSION).exe \
- src/gpg4win-vanilla-$(VERSION).exe \
- src/gpg4win-src-$(VERSION).exe $(RELEASEHOST)/ ;\
+ installers/gpg4win-$(VERSION).exe \
+ installers/gpg4win-light-$(VERSION).exe \
+ installers/gpg4win-vanilla-$(VERSION).exe \
+ installers/gpg4win-src-$(VERSION).exe $(RELEASEHOST)/ ;\
for f in en de ; do \
scp src/README.$$f.txt \
$(RELEASEHOST)/README-$(VERSION).$$f.txt; \
diff --git a/src/Makefile.am b/src/Makefile.am
index 903f2c2..0c92cc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -545,31 +545,35 @@ installer-options.ini : $(top_srcdir)/src/installer-options.ini.in
# For some nut-crazy reason someone thought it would be a great idea
# if makensis changed to the directory of the source file at startup.
# So we have to pull a couple of strings to correct this.
-gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
+installers/gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
g4wihelp.dll \
$(foosum_exe) \
$(README_files) $(HOWTO_files) \
license.blurb installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
- -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win.nsi
+ -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win.nsi && \
+ mv gpg4win-$(VERSION).exe installers/gpg4win-$(VERSION).exe
-gpg4win-light-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
+installers/gpg4win-light-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
g4wihelp.dll \
$(foosum_exe) \
$(README_files) $(HOWTO_files) \
license.blurb installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) \
- -DGPG4WIN_LIGHT=1 $(srcdir)/gpg4win.nsi
+ -DGPG4WIN_LIGHT=1 $(srcdir)/gpg4win.nsi && \
+ mv gpg4win-light-$(VERSION).exe installers/gpg4win-light-$(VERSION).exe
-gpg4win-vanilla-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
+
+installers/gpg4win-vanilla-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
g4wihelp.dll \
$(foosum_exe) \
$(README_files) $(HOWTO_files) \
license.blurb installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) \
- -DGPG4WIN_VANILLA=1 $(srcdir)/gpg4win.nsi
+ -DGPG4WIN_VANILLA=1 $(srcdir)/gpg4win.nsi && \
+ mv gpg4win-vanilla-$(VERSION).exe installers/gpg4win-vanilla-$(VERSION).exe
gpg4win-$(VERSION).wix: gpg4win.nsi $(common_nsi) stamps/stamp-final \
$(foosum_exe) \
@@ -607,11 +611,13 @@ stamps/stamp-dist-self: versioninfo.txt
(set -e; cd ..; make dist-bzip2)
touch stamps/stamp-dist-self
-gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final \
+installers/gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsii) \
+ stamps/stamp-final \
stamps/stamp-dist-self installer-options.ini \
license.blurb
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
- -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win-src.nsi
+ -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win-src.nsi && \
+ mv gpg4win-src-$(VERSION).exe installers/gpg4win-src-$(VERSION).exe
license.blurb: $(top_srcdir)/doc/license-page $(top_srcdir)/doc/GPLv3
cat $(top_srcdir)/doc/license-page $(top_srcdir)/doc/GPLv3 >$@
@@ -639,31 +645,37 @@ mkportable.exe: mkportable.c \
$(STRIP) $@
if BUILD_SOURCE_INSTALLER
-all_src = gpg4win-src-$(VERSION).exe
+all_src = installers/gpg4win-src-$(VERSION).exe
else
all_src =
endif
if BUILD_LIGHT_INSTALLER
-all_light = gpg4win-light-$(VERSION).exe
+all_light = installers/gpg4win-light-$(VERSION).exe
else
all_light =
endif
if BUILD_VANILLA_INSTALLER
-all_vanilla = gpg4win-vanilla-$(VERSION).exe
+all_vanilla = installers/gpg4win-vanilla-$(VERSION).exe
else
all_vanilla =
endif
if BUILD_FULL_INSTALLER
-all_full = gpg4win-$(VERSION).exe
+all_full = installers/gpg4win-$(VERSION).exe
else
all_full =
endif
all-local: $(all_full) $(all_light) $(all_vanilla) $(all_src)
+ @echo "###################################################"
+ @echo " Gpg4win $(VERSION) successfully build!"
+ @echo " Installers can be found under src/installers"
+ @echo "###################################################"
clean-local:
- rm -f gpg4win-$(VERSION).exe gpg4win-light-$(VERSION).exe \
- gpg4win-vanilla-$(VERSION).exe gpg4win-src-$(VERSION).exe
+ rm -f installers/gpg4win-$(VERSION).exe \
+ installers/gpg4win-light-$(VERSION).exe \
+ installers/gpg4win-vanilla-$(VERSION).exe \
+ installers/gpg4win-src-$(VERSION).exe
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 16447c6..c26408a 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -39,6 +39,7 @@ pkg_files =
stamps/stamp-directories:
$(MKDIR) stamps
$(MKDIR) playground
+ $(MKDIR) installers
$(MKDIR) $(bdir)
$(MKDIR) $(idir)
$(MKDIR) $(ipdir)
commit d1b1b6b7856664410b7c89d24cccb13b09dc0ec3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Feb 24 11:00:22 2016 +0100
Improve error messages for dup packages
* configure.ac: Print removal hint for duplicate packages.
* m4/gpg4win.m4 (GPG4WIN_FIND): Store potentially dup file names.
diff --git a/configure.ac b/configure.ac
index cb0b6c8..351d556 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,7 +386,15 @@ if test -n "$gpg4win_dup_sources"; then
tmp="$tmp
$i"
done
- AC_MSG_ERROR([Packages with more that one source version:$tmp])
+ tmp2="
+You might remove them with:"
+ for i in $gpg4win_rm_candidates; do
+ if ! grep -q $(basename $i) packages/packages.current; then
+ tmp2="$tmp2
+rm $i"
+ fi
+ done
+ AC_MSG_ERROR([Packages with more that one source version:$tmp$tmp2])
fi
diff --git a/m4/gpg4win.m4 b/m4/gpg4win.m4
index f3a65d7..930e58f 100644
--- a/m4/gpg4win.m4
+++ b/m4/gpg4win.m4
@@ -159,7 +159,8 @@ AC_DEFUN([GPG4WIN_FIND],
for _gpg4win_f in $_gpg4win_file; do
AS_IF([test "$_gpg4win_found" = yes],
[AC_MSG_WARN(found more than one sources for $1 in $_gpg4win_dir)
- gpg4win_dup_sources="$gpg4win_dup_sources $1"])
+ gpg4win_dup_sources="$gpg4win_dup_sources $1";
+ gpg4win_rm_candidates="$gpg4win_rm_candidates $_gpg4win_file"])
_gpg4win_found=yes
done
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 14 +++++++-------
configure.ac | 10 +++++++++-
m4/gpg4win.m4 | 3 ++-
src/Makefile.am | 40 ++++++++++++++++++++++++++--------------
src/gpg4win.mk.in | 1 +
5 files changed, 45 insertions(+), 23 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list