[Gpg4win-commits] r43 - in trunk: . include src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Fri Nov 4 10:30:18 CET 2005
Author: marcus
Date: 2005-11-04 10:30:18 +0100 (Fri, 04 Nov 2005)
New Revision: 43
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/include/config.nsi.in
trunk/src/Makefile.am
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.mk.in
trunk/src/gpg4win.nsi
trunk/src/installer.nsi
Log:
2005-11-04 Marcus Brinkmann <marcus at g10code.de>
* Makefile.am (EXTRA_DIST): Add missing backslash.
* include/config.nsi.in (top_srcdir): Remove.
* src/Makefile.am (gpg4win-src-$(VERSION).exe): Pass TOP_SRCDIR,
SRCDIR and BUILD_DIR (absolute path) as defined values. Also, use
$(srcdir) for nsi source file.
(gpg4win-src-$(VERSION).exe): Likewise.
* src/gpg4win.nsi: Change directory to build directory.
Add include dirs ${TOP_SRCDIR} and ${SRCDIR}.
* src/gpg4win-src.nsi: Likewise.
* src/installer.nsi: Use ${TOP_SRCDIR} to access COPYING file.
* src/gpg4win.mk (stamps/stamp-final): Depend on
stamps/stamp-directories.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/ChangeLog 2005-11-04 09:30:18 UTC (rev 43)
@@ -1,3 +1,18 @@
+2005-11-04 Marcus Brinkmann <marcus at g10code.de>
+
+ * Makefile.am (EXTRA_DIST): Add missing backslash.
+ * include/config.nsi.in (top_srcdir): Remove.
+ * src/Makefile.am (gpg4win-src-$(VERSION).exe): Pass TOP_SRCDIR,
+ SRCDIR and BUILD_DIR (absolute path) as defined values. Also, use
+ $(srcdir) for nsi source file.
+ (gpg4win-src-$(VERSION).exe): Likewise.
+ * src/gpg4win.nsi: Change directory to build directory.
+ Add include dirs ${TOP_SRCDIR} and ${SRCDIR}.
+ * src/gpg4win-src.nsi: Likewise.
+ * src/installer.nsi: Use ${TOP_SRCDIR} to access COPYING file.
+ * src/gpg4win.mk (stamps/stamp-final): Depend on
+ stamps/stamp-directories.
+
2005-11-03 Werner Koch <wk at g10code.com>
* include/config.nsi.in: Adjusted for WinPT being a source package now.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/Makefile.am 2005-11-04 09:30:18 UTC (rev 43)
@@ -23,8 +23,7 @@
SUBDIRS = packages include src
-EXTRA_DIST = \
- autogen.sh README.SVN
+EXTRA_DIST = autogen.sh README.SVN \
patches/gnupg-1.4.2/01-po-subdirs.patch \
patches/gpgme-1.1.0/01-gpgme-def.patch \
patches/gpgme-1.1.0/02-libtool-dll.patch
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/include/config.nsi.in 2005-11-04 09:30:18 UTC (rev 43)
@@ -21,7 +21,6 @@
!define _PACKAGE @PACKAGE@
!define _VERSION @VERSION@
-!define top_srcdir @top_srcdir@
!define build @build_cpu at -@build_os@
!define host @host_cpu at -@host_os@
!define MAKE @MAKE@
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/src/Makefile.am 2005-11-04 09:30:18 UTC (rev 43)
@@ -138,11 +138,16 @@
$(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list))) \
$(addsuffix .nsi,$(addprefix uninst-,$(gpg4win_build_list)))
+# 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
- $(MAKENSIS) gpg4win.nsi
+ $(MAKENSIS) -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
+ -DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final
- $(MAKENSIS) gpg4win-src.nsi
+ $(MAKENSIS) -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
+ -DSRCDIR=$(srcdir) $(srcdir)/gpg4win-src.nsi
all-local: gpg4win-$(VERSION).exe gpg4win-src-$(VERSION).exe
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/src/gpg4win-src.nsi 2005-11-04 09:30:18 UTC (rev 43)
@@ -17,13 +17,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!cd "${BUILD_DIR}"
+!addincludedir "${TOP_SRCDIR}"
+!addincludedir "${SRCDIR}"
+!include "../include/config.nsi"
# We need StrRep.
!include "StrFunc.nsh"
-
-!include "../include/config.nsi"
-
# The package name and version. PRETTY_PACKAGE is a user visible name
# only while PACKAGE is useful for filenames etc. PROD_VERSION is the
# product version and needs to be in the format "MAJ.MIN.MIC.BUILDNR".
Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/src/gpg4win.mk.in 2005-11-04 09:30:18 UTC (rev 43)
@@ -191,6 +191,7 @@
# Insert the template for each binary package.
$(foreach bpkg, $(gpg4win_bpkgs), $(eval $(call BPKG_template,$(bpkg))))
+stamps/stamp-final: stamps/stamp-directories
stamps/stamp-final: $(addprefix stamps/stamp-final-,$(gpg4win_build_list))
touch stamps/stamp-final
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/src/gpg4win.nsi 2005-11-04 09:30:18 UTC (rev 43)
@@ -17,6 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!cd "${BUILD_DIR}"
+!addincludedir "${TOP_SRCDIR}"
+!addincludedir "${SRCDIR}"
!include "../include/config.nsi"
# The package name and version. PRETTY_PACKAGE is a user visible name
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2005-11-03 12:57:23 UTC (rev 42)
+++ trunk/src/installer.nsi 2005-11-04 09:30:18 UTC (rev 43)
@@ -108,7 +108,7 @@
!define MUI_LICENSEPAGE_BUTTON "$(^NextBtn)"
!define MUI_PAGE_HEADER_SUBTEXT "$(T_GPLHeader)"
!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(T_GPLShort)"
-!insertmacro MUI_PAGE_LICENSE "../COPYING"
+!insertmacro MUI_PAGE_LICENSE "${TOP_SRCDIR}/COPYING"
!define MUI_PAGE_CUSTOMFUNCTION_SHOW PrintNonAdminWarning
!insertmacro MUI_PAGE_COMPONENTS
@@ -150,7 +150,7 @@
!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-ReserveFile "../COPYING"
+ReserveFile "${TOP_SRCDIR}/COPYING"
# Language support
More information about the Gpg4win-commits
mailing list