[Gpg4win-commits] r46 - in trunk: . include packages src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 7 18:47:32 CET 2005
Author: werner
Date: 2005-11-07 18:47:18 +0100 (Mon, 07 Nov 2005)
New Revision: 46
Added:
trunk/src/gpg4win-splash.bmp
trunk/src/gpg4win-splash.wav
trunk/src/inst-man_advanced_de.nsi
trunk/src/inst-man_novice_de.nsi
trunk/src/uninst-man_advanced_de.nsi
trunk/src/uninst-man_novice_de.nsi
Modified:
trunk/ChangeLog
trunk/README
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/download.sh
trunk/src/Makefile.am
trunk/src/gpg4win-src.nsi
trunk/src/gpg4win.nsi
trunk/src/inst-gnupg.nsi
trunk/src/inst-gpgee.nsi
trunk/src/inst-gpgol.nsi
trunk/src/inst-sections.nsi
trunk/src/inst-winpt.nsi
trunk/src/installer-finish.nsi
trunk/src/installer.nsi
Log:
Add dummy manual packages and a very stupid splash screen
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/ChangeLog 2005-11-07 17:47:18 UTC (rev 46)
@@ -1,3 +1,26 @@
+2005-11-07 Werner Koch <wk at g10code.com>
+
+ * packages/download.sh: Add dummy manual pages.
+
+ * src/installer.nsi: Move compression type to ...
+ * src/gpg4win.nsi: .. here and ...
+ * src/gpg4win-src.nsi: .. here. Use zlib for sources.
+
+ * src/gpg4win-splash.bmp: New.
+ * src/gpg4win-splash.wav: New.
+ * src/installer.nsi: Reserve these files
+ * src/inst-sections.nsi: Show silly splash screen.
+
+ * include/config.nsi.in: Add dummy packages for the manuals.
+ * src/uninst-man_advanced_de.nsi, src/uninst-man_novice_de.nsi
+ * src/inst-man_advanced_de.nsi, src/inst-man_novice_de.nsi: Ditto.
+ * src/Makefile.am (gpg4win_spkgs): Ditto.
+ * src/inst-sections.nsi: Ditto.
+
+ * src/installer-finish.nsi: Ditto.
+
+ * src/inst-gnupg.nsi: Make section read-only.
+
2005-11-04 Marcus Brinkmann <marcus at g10code.de>
Released 0.0.1.
Modified: trunk/README
===================================================================
--- trunk/README 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/README 2005-11-07 17:47:18 UTC (rev 46)
@@ -44,13 +44,13 @@
is required for menu shortcuts.
5. Add detection of packages to configure.ac. Check out the available
- mcros in m4/gpg4win.m4. Depending on the way an upstream package
+ macros in m4/gpg4win.m4. Depending on the way an upstream package
is packaged, you might need to write a new macro.
6. Add download information to packages/download.sh.
-Then run the usual "aclocal -I m4 && automake && autoconf" or whatever
-to create the actual configure file and run configure as described above.
+Then run the usual "./autogen.sh" to create the actual configure file
+and run configure as described above.
Copyright 2005 g10 Code GmbH
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/configure.ac 2005-11-07 17:47:18 UTC (rev 46)
@@ -88,6 +88,8 @@
GPG4WIN_SPKG([gpgol], [gpgme])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
GPG4WIN_SPKG([winpt], [gpgme gnupg])
+GPG4WIN_SPKG([man_novice_de])
+GPG4WIN_SPKG([man_advanced_de])
GPG4WIN_FINALIZE
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/include/config.nsi.in 2005-11-07 17:47:18 UTC (rev 46)
@@ -1,4 +1,4 @@
-# config.nsi - Configuration settings for gpg4win.nsi.
+# config.nsi - Configuration settings for gpg4win.nsi. -*- nsi -*-
# Copyright (C) 2005 g10 Code GmbH
#
# This file is part of GPG4Win.
@@ -125,3 +125,11 @@
!define gpg4win_pkg_gettext @gpg4win_pkg_gettext@
!define gpg4win_pkg_gettext_version @gpg4win_pkg_gettext_version@
!define gpg4win_pkg_gettext_src @gpg4win_pkg_gettext_src@
+
+ at HAVE_PKG_MAN_NOVICE_DE@
+!define gpg4win_pkg_man_novice_de @gpg4win_pkg_man_novice_de@
+!define gpg4win_pkg_man_novice_de_version @gpg4win_pkg_man_novice_de_version@
+
+ at HAVE_PKG_MAN_ADVANCED_DE@
+!define gpg4win_pkg_man_advanced_de @gpg4win_pkg_man_advanced_de@
+!define gpg4win_pkg_man_advanced_de_version @gpg4win_pkg_man_advanced_de_version@
Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/packages/download.sh 2005-11-07 17:47:18 UTC (rev 46)
@@ -108,3 +108,7 @@
${WGET} -c ${server_g10code}/gpgme-1.2.0-cvs.tar.bz2
${WGET} -c ${server_g10code}/gpa-0.7.1-cvs.tar.bz2
${WGET} -c ${server_g10code}/gpgol-0.9.4-cvs.tar.bz2
+
+# Dummy manual pages
+${WGET} -c ${server_g10code}/man_novice_de-0.0.0-cvs.tar.gz
+${WGET} -c ${server_g10code}/man_advanced_de-0.0.0-cvs.tar.gz
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/Makefile.am 2005-11-07 17:47:18 UTC (rev 46)
@@ -19,10 +19,11 @@
EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
- libiconv.def libintl.def
+ libiconv.def libintl.def gpg4win-splash.bmp gpg4win-splash.wav
# Supported source packages.
-gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa winpt
+gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa winpt \
+ man_novice_de man_advanced_de
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
Added: trunk/src/gpg4win-splash.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/src/gpg4win-splash.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/gpg4win-splash.wav
===================================================================
(Binary files differ)
Property changes on: trunk/src/gpg4win-splash.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/gpg4win-src.nsi
===================================================================
--- trunk/src/gpg4win-src.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/gpg4win-src.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -64,6 +64,9 @@
# The installation directory.
!define ipdir "playground/install/pkgs"
+# For source packages we use the standard zip method because it takes
+# ages to compress a large archive of already packed sources.
+SetCompressor zlib
# Now include the generic parts.
!include "installer.nsi"
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/gpg4win.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -53,6 +53,7 @@
Dateiversion ${PROD_VERSION}"
+
# The copyright license of the package. Define only one of these.
!define LICENSE_GPL
# !define LICENSE_LGPL
@@ -72,7 +73,14 @@
# The installation directory.
!define ipdir "playground/install/pkgs"
+# Select the best compression algorithm available. The dictionary
+# size is the default (8 MB).
+!ifndef SOURCES
+SetCompressor lzma
+# SetCompressorDictSize 8
+!endif
+
# Now include the generic parts.
!define HAVE_STARTMENU
!include "installer.nsi"
Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-gnupg.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -24,7 +24,9 @@
!define prefix ${ipdir}/gnupg-${gpg4win_pkg_gnupg_version}
-Section "gnupg" SEC_gnupg
+Section "GnuPG" SEC_gnupg
+ SectionIn RO
+
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_gnupg}"
@@ -54,4 +56,6 @@
LangString DESC_SEC_gnupg ${LANG_ENGLISH} \
"GNU Privacy Guard"
LangString DESC_SEC_gnupg ${LANG_GERMAN} \
- "GNU Privacy Guard"
+ "Der GNU Privacy Guard (GnuPG) ist der Kernbestandteil \
+ dieser Software. GnuPG stellt die eigentlichen \
+ Verschlüsselungsfunktionen sowie die Schlüsselverwaltung bereit."
Modified: trunk/src/inst-gpgee.nsi
===================================================================
--- trunk/src/inst-gpgee.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-gpgee.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -24,7 +24,7 @@
!define prefix ${ipdir}/gpgee-${gpg4win_pkg_gpgee_version}
-Section "gpgee" SEC_gpgee
+Section "GPGee" SEC_gpgee
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_gpgee_src}"
@@ -46,6 +46,8 @@
LangString DESC_SEC_gpgee ${LANG_ENGLISH} \
"GPG Explorer Extensions"
LangString DESC_SEC_gpgee ${LANG_GERMAN} \
- "GPG Explorer Erweiterungen"
+ "GPG Explorer Erweiterungen (GPGee) ist eine Erweiterung für \
+ den Explorer, die es ermöglicht, Dateien über das Kontextmenü zu \
+ verschlüsseln."
Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-gpgol.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -23,7 +23,7 @@
!define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
-Section "gpgol" SEC_gpgol
+Section "GPGol" SEC_gpgol
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_gpgol}"
@@ -39,4 +39,5 @@
LangString DESC_SEC_gpgol ${LANG_ENGLISH} \
"GnuPG for Outlook"
LangString DESC_SEC_gpgol ${LANG_GERMAN} \
- "GnuPG für Outlook"
+ "GnuPG für Outlook (GPGol) is eine Erweiterung für Outlook 2000, die \
+ verwendet wird um Nachrichten mit OpenPGP zu verschlüsseln."
Added: trunk/src/inst-man_advanced_de.nsi
===================================================================
--- trunk/src/inst-man_advanced_de.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-man_advanced_de.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -0,0 +1,42 @@
+# inst-man_advanced_de.nsi - Installer snippet -*- coding: latin-1; -*-
+# Copyright (C) 2005 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/man_advanced_de-${gpg4win_pkg_man_advanced_de_version}
+
+
+Section "Advanced Manual (de)" SEC_man_advanced_de
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_man_advanced_de}"
+!else
+
+ SetOutPath "$INSTDIR\share\gpg4win"
+ File "${prefix}/share/man_advanced_de/man_advanced_de.html"
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_man_advanced_de ${LANG_ENGLISH} \
+ "Gpg4Win Manual for the Advanced User (German)"
+LangString DESC_SEC_man_advanced_de ${LANG_GERMAN} \
+ "Gpg4Win Handbuch für den Durchblicker"
Added: trunk/src/inst-man_novice_de.nsi
===================================================================
--- trunk/src/inst-man_novice_de.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-man_novice_de.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -0,0 +1,42 @@
+# inst-man_novice_de.nsi - Installer snippet -*- coding: latin-1; -*-
+# Copyright (C) 2005 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/man_novice_de-${gpg4win_pkg_man_novice_de_version}
+
+
+Section "Novice Manual (de)" SEC_man_novice_de
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_man_novice_de}"
+!else
+
+ SetOutPath "$INSTDIR\share\gpg4win"
+ File "${prefix}/share/man_novice_de/man_novice_de.html"
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_man_novice_de ${LANG_ENGLISH} \
+ "Gpg4Win Manual for the Novice User (German)"
+LangString DESC_SEC_man_novice_de ${LANG_GERMAN} \
+ "Gpg4Win Handbuch für den Einsteiger"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-sections.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -67,9 +67,21 @@
!ifdef HAVE_PKG_GPGEE
!include "inst-gpgee.nsi"
!endif
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+!include "inst-man_novice_de.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+!include "inst-man_advanced_de.nsi"
+!endif
# We have to invoke the uninstallers in reverse order!
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+!include "uninst-man_advanced_de.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+!include "uninst-man_novice_de.nsi"
+!endif
!ifdef HAVE_PKG_GPGEE
!include "uninst-gpgee.nsi"
!endif
@@ -274,6 +286,15 @@
FunctionEnd
Function .onInit
+ SetOutPath $TEMP
+ File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
+ File /oname=gpgspltmp.wav "${TOP_SRCDIR}/src/gpg4win-splash.wav"
+ advsplash::show 3000 600 400 -1 $TEMP\gpgspltmp
+ Pop $0 # $0 has '1' if the user closed the splash screen early,
+ # '0' if everything closed normal, and '-1' if some error occured.
+ Delete $TEMP\gpgspltmp.wav
+ Delete $TEMP\gpgspltmp.bmp
+
Call CalcDepends
FunctionEnd
@@ -285,6 +306,9 @@
# This must be in a central place. Urgs.
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+!ifdef HAVE_PKG_GNUPG
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gnupg} $(DESC_SEC_gnupg)
+!endif
!ifdef HAVE_PKG_GPGOL
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgol} $(DESC_SEC_gpgol)
!endif
@@ -297,9 +321,12 @@
!ifdef HAVE_PKG_GPGEE
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgee} $(DESC_SEC_gpgee)
!endif
-!ifdef HAVE_PKG_GNUPG
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gnupg} $(DESC_SEC_gnupg)
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_de} $(DESC_SEC_man_novice_de)
!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_advanced_de} $(DESC_SEC_man_advanced_de)
+!endif
!insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -309,14 +336,56 @@
!ifdef HAVE_STARTMENU
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+
!ifdef HAVE_PKG_WINPT
+ SectionGetFlags ${SEC_winpt} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_winpt_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WINPT.lnk" \
"$INSTDIR\winpt.exe"
+ no_winpt_menu:
!endif
+
!ifdef HAVE_PKG_GPA
+ SectionGetFlags ${SEC_gpa} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_gpa_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPA.lnk" \
"$INSTDIR\gpa.exe"
+ no_gpa_menu:
!endif
+
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+ SectionGetFlags ${SEC_man_novice_de} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_menu
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Novice Manual.lnk" \
+ "$INSTDIR\share\gpg4win\man_novice_de.html"
+ no_man_novice_de_menu:
+!endif
+
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+ SectionGetFlags ${SEC_man_advanced_de} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_menu
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Advanced Manual.lnk" \
+ "$INSTDIR\share\gpg4win\man_novice_de.html"
+ no_man_advanced_de_menu:
+!endif
+
+!ifdef HAVE_PKG_GPGEE
+ SectionGetFlags ${SEC_gpgee} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_gpgee_menu
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPGee Manual.lnk" \
+ "$INSTDIR\GPGee.hlp"
+ no_gpgee_menu:
+!endif
+
+
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG FAQ.lnk" \
+ "$INSTDIR\share\gnupg\faq.html"
+
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \
"$INSTDIR\${PACKAGE}-uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END
Modified: trunk/src/inst-winpt.nsi
===================================================================
--- trunk/src/inst-winpt.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/inst-winpt.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -24,7 +24,7 @@
!define prefix ${ipdir}/winpt-${gpg4win_pkg_winpt_version}
-Section "winpt" SEC_winpt
+Section "WinPT" SEC_winpt
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_winpt}"
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/installer-finish.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -41,11 +41,22 @@
!ifdef HAVE_STARTMENU
!insertmacro MUI_STARTMENU_GETFOLDER ${STARTMENU_FOLDER} $R0
!ifdef HAVE_PKG_WINPT
- Delete "$SMPROGRAMS\$R0\WINPT.lnk"
+ Delete "$SMPROGRAMS\$R0\WinPT.lnk"
!endif
!ifdef HAVE_PKG_GPA
Delete "$SMPROGRAMS\$R0\GPA.lnk"
!endif
+!ifdef HAVE_PKG_MAN_NOVICE_DE
+ Delete "$SMPROGRAMS\$R0\Novice Manual.lnk"
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_DE
+ Delete "$SMPROGRAMS\$R0\Advanced Manual.lnk"
+!endif
+!ifdef HAVE_PKG_GPGEE
+ Delete "$SMPROGRAMS\$R0\GPGee Manual.lnk"
+!endif
+
+
Delete "$SMPROGRAMS\$R0\Uninstall.lnk"
RMDir "$SMPROGRAMS\$R0"
DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
Modified: trunk/src/installer.nsi
===================================================================
--- trunk/src/installer.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/installer.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -33,7 +33,10 @@
# We use the modern UI.
!include "MUI.nsh"
+# Fix some translations
+
+
# Set the package name. Note that this name should not be sufficed
# with the version because this would get displayed in the start menu.
Name "${PRETTY_PACKAGE}"
@@ -54,12 +57,6 @@
"Install Directory"
-# Select the best compression algorithm available. The dictionary
-# size is the default (8 MB).
-SetCompressor lzma
-# SetCompressorDictSize 8
-
-
# Add version information to the file properties.
VIProductVersion "${PROD_VERSION}"
VIAddVersionKey "ProductName" "${PRETTY_PACKAGE_SHORT} (${VERSION})"
@@ -149,10 +146,11 @@
!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
+ReserveFile "${NSISDIR}/Plugins/advsplash.dll"
+ReserveFile "${TOP_SRCDIR}/src/gpg4win-splash.bmp"
+ReserveFile "${TOP_SRCDIR}/src/gpg4win-splash.wav"
ReserveFile "${TOP_SRCDIR}/COPYING"
-
# Language support
# The About string as displayed on the first page.
Added: trunk/src/uninst-man_advanced_de.nsi
===================================================================
--- trunk/src/uninst-man_advanced_de.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/uninst-man_advanced_de.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -0,0 +1,40 @@
+# uninst-man_advanced_de.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2005 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/man_advanced_de-${gpg4win_pkg_man_advanced_de_version}
+
+
+; Uninstaller section.
+Section "-un.man_advanced_de"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_man_advanced_de}"
+ Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\share\gpg4win\man_advanced_de.html"
+ RMDir "$INSTDIR\share\gpg4win"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
Added: trunk/src/uninst-man_novice_de.nsi
===================================================================
--- trunk/src/uninst-man_novice_de.nsi 2005-11-04 09:35:51 UTC (rev 45)
+++ trunk/src/uninst-man_novice_de.nsi 2005-11-07 17:47:18 UTC (rev 46)
@@ -0,0 +1,40 @@
+# uninst-man_novice_de.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2005 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/man_novice_de-${gpg4win_pkg_man_novice_de_version}
+
+
+; Uninstaller section.
+Section "-un.man_novice_de"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_man_novice_de}"
+ Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\share\gpg4win\man_novice_de.html"
+ RMDir "$INSTDIR\share\gpg4win"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list