[Gpg4win-commits] r239 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-03-29 20:00:09 +0200 (Wed, 29 Mar 2006)
New Revision: 239

Added:
   trunk/src/installer-options.ini.in
Removed:
   trunk/src/installer-options.ini
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-sections.nsi
Log:
Arghh, yet another nsis oddity


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-03-29 17:23:00 UTC (rev 238)
+++ trunk/ChangeLog	2006-03-29 18:00:09 UTC (rev 239)
@@ -2,6 +2,8 @@
 
 	Released 1.0.0rc1.
 
+	* src/installer-options.ini: Renamed to ..
+	* src/installer-options.ini.in: .. this.
 	* configure.ac (BUILD_ISODATE): New.
 	* include/config.nsi.in: Ditto.
 	* src/gpg4win.nsi: Display it on the Welcome page

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-03-29 17:23:00 UTC (rev 238)
+++ trunk/src/Makefile.am	2006-03-29 18:00:09 UTC (rev 239)
@@ -19,7 +19,7 @@
 
 
 EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
-        inst-gpg4win.nsi uninst-gpg4win.nsi installer-options.ini \
+        inst-gpg4win.nsi uninst-gpg4win.nsi installer-options.ini.in \
 	libiconv.def libintl.def  gpg4win-splash.wav \
 	exdll.h g4wihelp.c g4wihelp.nsi config.site loreley.mid
 
@@ -204,6 +204,9 @@
 	   < $(top_srcdir)/doc/README.en.txt \
            | awk '{printf "%s\r\n", $$0}' >README.en.txt
 
+installer-options.ini : $(top_srcdir)/src/installer-options.ini.in
+	cat $(top_srcdir)/src/installer-options.ini.in >installer-options.ini
+
 README.de.txt : versioninfo.txt $(top_srcdir)/doc/README.de.txt
 	sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
 	-e '/!NEWSFILE!/{r $(top_srcdir)/NEWS' -e 'd;}' \
@@ -216,7 +219,8 @@
 # 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 \
-                        g4wihelp.dll  README.en.txt README.de.txt
+                        g4wihelp.dll  README.en.txt README.de.txt \
+			installer-options.ini
 	$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
 		-DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
 
@@ -225,7 +229,7 @@
 	touch stamps/stamp-dist-self
 
 gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final \
-                            stamps/stamp-dist-self
+                            stamps/stamp-dist-self installer-options.ini
 	$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
 		-DSRCDIR=$(srcdir) $(srcdir)/gpg4win-src.nsi
 

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2006-03-29 17:23:00 UTC (rev 238)
+++ trunk/src/inst-sections.nsi	2006-03-29 18:00:09 UTC (rev 239)
@@ -374,7 +374,10 @@
   # Note that we delete gpgspltmp.wav in .onInst{Failed,Success}
 !endif
 
-  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "${TOP_SRCDIR}/src/installer-options.ini"
+  # We can't use TOP_SRCDIR dir as the name of the file needs to be
+  # the same while building and running the installer.  Thus we
+  # generate the file from a template.
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "installer-options.ini"
 
   Call CalcDepends
   Call CheckOtherGnuPGApps

Deleted: trunk/src/installer-options.ini
===================================================================
--- trunk/src/installer-options.ini	2006-03-29 17:23:00 UTC (rev 238)
+++ trunk/src/installer-options.ini	2006-03-29 18:00:09 UTC (rev 239)
@@ -1,40 +0,0 @@
-[Settings]
-NumFields=4
-
-; The number of the fields here is known in installer.nsi.
-; The tags must be "[Field N]" with N=1..NumFields
-
-[Field 1]
-Type=Label
-Left=0
-Right=-1
-Top=0
-Bottom=20
-
-[Field 2]
-Type=Checkbox
-Left=0
-Right=-1
-Top=30
-Bottom=40
-;Text=Start Menu
-State=1
-
-[Field 3]
-Type=Checkbox
-Left=0
-Right=-1
-Top=50
-Bottom=60
-;Text=Desktop
-State=0
-
-[Field 4]
-Type=Checkbox
-Left=0
-Right=-1
-Top=70
-Bottom=80
-;Text=Quick Launch Bar
-State=0
-

Copied: trunk/src/installer-options.ini.in (from rev 237, trunk/src/installer-options.ini)