[Gpg4win-commits] r362 - in trunk: . doc include src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Nov 30 09:58:00 CET 2006
Author: werner
Date: 2006-11-30 09:58:00 +0100 (Thu, 30 Nov 2006)
New Revision: 362
Added:
trunk/doc/manual/
trunk/src/inst-man_advanced_en.nsi
trunk/src/inst-man_novice_en.nsi
trunk/src/uninst-man_advanced_en.nsi
trunk/src/uninst-man_novice_en.nsi
Removed:
trunk/doc/manual-de/
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/Makefile.am
trunk/include/config.nsi.in
trunk/src/inst-man_novice_de.nsi
trunk/src/inst-sections.nsi
Log:
Renamed manual directory.
Preparatins for adding english manuals.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/ChangeLog 2006-11-30 08:58:00 UTC (rev 362)
@@ -1,3 +1,15 @@
+2006-11-30 Werner Koch <wk at g10code.com>
+
+ * include/config.nsi.in: Add definitions for the english manuals.
+ * configure.ac: Adjusted name of manual directory.
+ * src/inst-man_novice_de.nsi: Ditto.
+ * src/inst-man_advanced_de.nsi: Ditto.
+ * src/inst-man_advanced_en.nsi: New.
+ * src/inst-man_novice_en.nsi: New.
+ * src/uninst-man_novice_en.nsi: New.
+ * src/uninst-man_advanced_en.nsi: New.
+ * src/inst-sections.nsi: Include the new installers sections.
+
2006-10-13 Werner Koch <wk at g10code.com>
Released 1.0.7.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/configure.ac 2006-11-30 08:58:00 UTC (rev 362)
@@ -29,7 +29,7 @@
m4_define([my_version], [1.0.8])
m4_define([my_issvn], [yes])
-m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
+m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gpg4win], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
[gpg4win-devel at wald.intevation.org])
@@ -166,6 +166,8 @@
#GPG4WIN_SPKG([eudoragpg])
GPG4WIN_IPKG([man_novice_de])
GPG4WIN_IPKG([man_advanced_de])
+GPG4WIN_IPKG([man_novice_en])
+GPG4WIN_IPKG([man_advanced_en])
GPG4WIN_FINALIZE
@@ -188,6 +190,6 @@
AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
AC_CONFIG_FILES(doc/Makefile)
AC_CONFIG_FILES(doc/logo/Makefile)
-AC_CONFIG_FILES(doc/manual-de/Makefile doc/manual-de/version.tex)
+AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
AC_CONFIG_FILES(doc/website/Makefile)
AC_OUTPUT
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/doc/ChangeLog 2006-11-30 08:58:00 UTC (rev 362)
@@ -1,3 +1,8 @@
+2006-11-30 Werner Koch <wk at g10code.com>
+
+ * manual-de/: Renamed to manual/.
+ * Makefile.am (SUBDIRS): Likewise
+
2006-10-02 Werner Koch <wk at g10code.com>
* website/index-de.htm4, website/index.htm4: Changed All-Downloads
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/doc/Makefile.am 2006-11-30 08:58:00 UTC (rev 362)
@@ -19,4 +19,4 @@
EXTRA_DIST = nsi-mode.el README.en.txt README.de.txt pkg-copyright.txt
-SUBDIRS = logo manual-de website
+SUBDIRS = logo manual website
Copied: trunk/doc/manual (from rev 361, trunk/doc/manual-de)
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/include/config.nsi.in 2006-11-30 08:58:00 UTC (rev 362)
@@ -161,3 +161,8 @@
@HAVE_PKG_MAN_NOVICE_DE@
@HAVE_PKG_MAN_ADVANCED_DE@
+
+ at HAVE_PKG_MAN_NOVICE_EN@
+
+ at HAVE_PKG_MAN_ADVANCED_EN@
+
Added: trunk/src/inst-man_advanced_en.nsi
===================================================================
--- trunk/src/inst-man_advanced_en.nsi 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/src/inst-man_advanced_en.nsi 2006-11-30 08:58:00 UTC (rev 362)
@@ -0,0 +1,53 @@
+# inst-man_advanced_en.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
+
+
+Section "$(DESC_Name_man_advanced_en)" SEC_man_advanced_en
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ # No need to include anything as the manuals are part of gpg4win
+ # File "${gpg4win_pkg_man_advanced_en}"
+!else
+
+ SetOutPath "$INSTDIR\share\gpg4win"
+ File "${BUILD_DIR}/../doc/manual/durchblicker-en.pdf"
+!endif
+SectionEnd
+
+
+LangString DESC_Name_man_advanced_en ${LANG_ENGLISH} \
+ "Advanced Manual"
+LangString DESC_Name_man_advanced_en ${LANG_GERMAN} \
+ "Durchblickerhandbuch (Englisch)"
+
+LangString DESC_SEC_man_advanced_en ${LANG_ENGLISH} \
+ "Gpg4Win Manual for the Advanced User"
+LangString DESC_SEC_man_advanced_en ${LANG_GERMAN} \
+ "Gpg4Win Handbuch für den Durchblicker (Englisch)"
+
+
+LangString DESC_Menu_man_advanced_en ${LANG_ENGLISH} \
+ "Show the online manual of Gpg4Win for advanced users"
+LangString DESC_Menu_man_advanced_en ${LANG_GERMAN} \
+ "Das englische Online-Handbuch von Gpg4Win für den Durchblicker anzeigen"
Modified: trunk/src/inst-man_novice_de.nsi
===================================================================
--- trunk/src/inst-man_novice_de.nsi 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/src/inst-man_novice_de.nsi 2006-11-30 08:58:00 UTC (rev 362)
@@ -31,7 +31,7 @@
!else
SetOutPath "$INSTDIR\share\gpg4win"
- File "${BUILD_DIR}/../doc/manual-de/einsteiger.pdf"
+ File "${BUILD_DIR}/../doc/manual/einsteiger.pdf"
!endif
SectionEnd
Added: trunk/src/inst-man_novice_en.nsi
===================================================================
--- trunk/src/inst-man_novice_en.nsi 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/src/inst-man_novice_en.nsi 2006-11-30 08:58:00 UTC (rev 362)
@@ -0,0 +1,52 @@
+# inst-man_novice_en.nsi - Installer snippet -*- coding: latin-1; -*-
+# Copyright (C) 2006 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
+
+
+Section "$(DESC_Name_man_novice_en)" SEC_man_novice_en
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ # No need to include anything as the manuals are part of gpg4win
+ # File "${gpg4win_pkg_man_novice_en}"
+!else
+
+ SetOutPath "$INSTDIR\share\gpg4win"
+ File "${BUILD_DIR}/../doc/manual/einsteiger-en.pdf"
+!endif
+SectionEnd
+
+
+LangString DESC_Name_man_novice_en ${LANG_ENGLISH} \
+ "Novice Manual"
+LangString DESC_Name_man_novice_en ${LANG_GERMAN} \
+ "Einsteigerhandbuch (Englisch)"
+
+LangString DESC_SEC_man_novice_en ${LANG_ENGLISH} \
+ "Gpg4Win Manual for the Novice User"
+LangString DESC_SEC_man_novice_en ${LANG_GERMAN} \
+ "Gpg4Win Handbuch für den Einsteiger (Englisch)"
+
+LangString DESC_Menu_man_novice_en ${LANG_ENGLISH} \
+ "Show the online manual of Gpg4Win for novice users"
+LangString DESC_Menu_man_novice_en ${LANG_GERMAN} \
+ "Das englische Online-Handbuch von Gpg4Win für den Einsteiger anzeigen"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/src/inst-sections.nsi 2006-11-30 08:58:00 UTC (rev 362)
@@ -87,6 +87,12 @@
#!ifdef HAVE_PKG_EUDORAGPG
#!include "inst-eudoragpg.nsi"
#!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+!include "inst-man_novice_en.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+!include "inst-man_advanced_en.nsi"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!include "inst-man_novice_de.nsi"
!endif
@@ -102,6 +108,12 @@
!ifdef HAVE_PKG_MAN_NOVICE_DE
!include "uninst-man_novice_de.nsi"
!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+!include "uninst-man_advanced_en.nsi"
+!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+!include "uninst-man_novice_en.nsi"
+!endif
#!ifdef HAVE_PKG_EUDORAGPG
#!include "uninst-eudoragpg.nsi"
#!endif
@@ -461,6 +473,12 @@
#!ifdef HAVE_PKG_EUDORAGPG
# !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
#!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_en} $(DESC_SEC_man_novice_en)
+!endif
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_advanced_en} $(DESC_SEC_man_advanced_en)
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_de} $(DESC_SEC_man_novice_de)
!endif
@@ -534,6 +552,28 @@
# no_eudoragpg_menu:
#!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+ SectionGetFlags ${SEC_man_novice_en} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_en_menu
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_novice_en).lnk" \
+ "$INSTDIR\share\gpg4win\einsteiger-en.pdf" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_en)
+ no_man_novice_en_menu:
+!endif
+
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+ SectionGetFlags ${SEC_man_advanced_en} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_en_menu
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_advanced_en).lnk" \
+ "$INSTDIR\share\gpg4win\durchblicker-en.pdf" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_en)
+ no_man_advanced_en_menu:
+!endif
+
!ifdef HAVE_PKG_MAN_NOVICE_DE
SectionGetFlags ${SEC_man_novice_de} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -625,6 +665,28 @@
no_sylpheed_desktop:
!endif
+!ifdef HAVE_PKG_MAN_NOVICE_EN
+ SectionGetFlags ${SEC_man_novice_en} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_en_desktop
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Name_man_novice_en).lnk" \
+ "$INSTDIR\share\gpg4win\einsteiger-en.pdf" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_en)
+ no_man_novice_en_desktop:
+!endif
+
+!ifdef HAVE_PKG_MAN_ADVANCED_EN
+ SectionGetFlags ${SEC_man_advanced_en} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_en_desktop
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Name_man_advanced_en).lnk" \
+ "$INSTDIR\share\gpg4win\durchblicker-en.pdf" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_en)
+ no_man_advanced_en_desktop:
+!endif
+
!ifdef HAVE_PKG_MAN_NOVICE_DE
SectionGetFlags ${SEC_man_novice_de} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
Added: trunk/src/uninst-man_advanced_en.nsi
===================================================================
--- trunk/src/uninst-man_advanced_en.nsi 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/src/uninst-man_advanced_en.nsi 2006-11-30 08:58:00 UTC (rev 362)
@@ -0,0 +1,39 @@
+# uninst-man_advanced_en.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
+
+
+; Uninstaller section.
+Section "-un.man_advanced_en"
+!ifdef SOURCES
+ #Push "${gpg4win_pkg_man_advanced_en}"
+ #Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\share\gpg4win\durchblicker-en.pdf"
+ RMDir "$INSTDIR\share\gpg4win"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
Added: trunk/src/uninst-man_novice_en.nsi
===================================================================
--- trunk/src/uninst-man_novice_en.nsi 2006-11-03 14:39:45 UTC (rev 361)
+++ trunk/src/uninst-man_novice_en.nsi 2006-11-30 08:58:00 UTC (rev 362)
@@ -0,0 +1,38 @@
+# uninst-man_novice_en.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
+
+; Uninstaller section.
+Section "-un.man_novice_en"
+!ifdef SOURCES
+ #Push "${gpg4win_pkg_man_novice_en}"
+ #Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\share\gpg4win\einsteiger-en.pdf"
+ RMDir "$INSTDIR\share\gpg4win"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list