[Gpg4win-commits] r701 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-01-30 18:28:34 +0100 (Wed, 30 Jan 2008)
New Revision: 701

Added:
   trunk/src/inst-final.nsi
Modified:
   trunk/src/Makefile.am
   trunk/src/inst-gnupg2.nsi
   trunk/src/inst-sections.nsi
Log:
Add a final section to make sure that the outpath is set properly.


Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-01-30 16:48:41 UTC (rev 700)
+++ trunk/src/Makefile.am	2008-01-30 17:28:34 UTC (rev 701)
@@ -66,7 +66,8 @@
         inst-oxygen-icons.nsi  	   uninst-oxygen-icons.nsi    \
         inst-kdelibs.nsi  	   uninst-kdelibs.nsi         \
         inst-kleopatra.nsi  	   uninst-kleopatra.nsi       \
-	inst-bzip2.nsi             uninst-bzip2.nsi
+	inst-bzip2.nsi             uninst-bzip2.nsi           \
+        inst-final.nsi
 
 # Need to clean the dll because we bypassed automake.
 CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \

Added: trunk/src/inst-final.nsi
===================================================================
--- trunk/src/inst-final.nsi	2008-01-30 16:48:41 UTC (rev 700)
+++ trunk/src/inst-final.nsi	2008-01-30 17:28:34 UTC (rev 701)
@@ -0,0 +1,27 @@
+# inst-final.nsi - Hidden section for last actions. -*- coding: latin-1; -*-
+# Copyright (C) 2008 g10 Code GmbH
+# 
+# This file is part of Gpg4win.
+# 
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+# This is the very last section installed.
+Section "-final" SEC_final
+
+  # Set outpath back so that the Finish page gets what it expects.
+  SetOutPath "$INSTDIR"
+
+SectionEnd

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2008-01-30 16:48:41 UTC (rev 700)
+++ trunk/src/inst-gnupg2.nsi	2008-01-30 17:28:34 UTC (rev 701)
@@ -105,10 +105,6 @@
 
   no_config_gpg_conf_files:
 
-# Switch outpath back to standard so that the finish page can show the
-# README file.  Fixme:  We should have a final section to do this.
-  SetOutPath "$INSTDIR"
-
 !endif
 ${MementoSectionEnd}
 

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2008-01-30 16:48:41 UTC (rev 700)
+++ trunk/src/inst-sections.nsi	2008-01-30 17:28:34 UTC (rev 701)
@@ -149,6 +149,7 @@
 !ifdef HAVE_PKG_MAN_ADVANCED_DE
 !include "inst-man_advanced_de.nsi"
 !endif
+!include "inst-final.nsi"
 
 # We have to invoke the uninstallers in reverse order!