[Gpg4win-commits] r116 - in trunk: . doc/manual-de src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Fri Jan 6 20:45:13 CET 2006
Author: werner
Date: 2006-01-06 20:45:13 +0100 (Fri, 06 Jan 2006)
New Revision: 116
Added:
trunk/src/inst-gpg4win.nsi
trunk/src/uninst-gpg4win.nsi
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/configure.ac
trunk/doc/manual-de/Makefile.am
trunk/src/Makefile.am
trunk/src/gpg4win.mk.in
trunk/src/inst-man_advanced_de.nsi
trunk/src/inst-man_novice_de.nsi
trunk/src/inst-sections.nsi
trunk/src/uninst-man_advanced_de.nsi
trunk/src/uninst-man_novice_de.nsi
Log:
Record versions of installed packages.
Include actual manuals.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/ChangeLog 2006-01-06 19:45:13 UTC (rev 116)
@@ -1,3 +1,17 @@
+2006-01-06 Werner Koch <wk at g10code.com>
+
+ * src/gpg4win.mk.in (VERSIONINFO_macro): New. Use it where
+ appropriate.
+
+ * configure.ac: Test for texi2dvi, dvipdf and sha1sum.
+
+ * Makefile.am (SUBDIRS): Build doc prior to src.
+
+ * src/inst-man_novice_de.nsi: Install einsteiger.pdf.
+ * src/uninst-man_novice_de.nsi: Likewise.
+ * src/inst-man_advanced_de.nsi: Install druchblicker.pdf
+ * src/uninst-man_advanced_de.nsi: Likewise.
+
2006-01-05 Werner Koch <wk at g10code.com>
Released 0.5.0.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/Makefile.am 2006-01-06 19:45:13 UTC (rev 116)
@@ -21,7 +21,7 @@
AUTOMAKE_OPTIONS = dist-bzip2
DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
-SUBDIRS = packages include src doc
+SUBDIRS = packages include doc src
EXTRA_DIST = autogen.sh README.SVN \
patches/gnupg-1.4.2/01-po-subdirs.patch \
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/NEWS 2006-01-06 19:45:13 UTC (rev 116)
@@ -1,6 +1,7 @@
Noteworthy changes in version 0.5.1
------------------------------------------------
+
Noteworthy changes in version 0.5.0 (2006-01-05)
------------------------------------------------
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/configure.ac 2006-01-06 19:45:13 UTC (rev 116)
@@ -70,10 +70,14 @@
AC_CHECK_PROGS(STOW, stow)
AC_CHECK_PROGS(MAKENSIS, makensis)
AC_CHECK_PROGS(ZCAT, zcat)
+AC_CHECK_PROGS(TEXI2DVI, texi2dvi)
+AC_CHECK_PROGS(DVIPDF, dvipdf)
+AC_CHECK_PROGS(SHA1SUM, sha1sum)
AC_PROG_INSTALL
missing_tools=
-for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS; do
+for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
+ DVIPDF SHA1SUM ; do
eval tmp='$'$i
if test -z "$tmp"; then
missing_tools="$missing_tools `echo $i | tr 'A-Z' 'a-z'`"
Modified: trunk/doc/manual-de/Makefile.am
===================================================================
--- trunk/doc/manual-de/Makefile.am 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/doc/manual-de/Makefile.am 2006-01-06 19:45:13 UTC (rev 116)
@@ -50,4 +50,4 @@
$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
%.pdf : %.dvi
- TEXPICTS=$(srcdir) dvipdf $< $@
+ TEXPICTS=$(srcdir) $(DVIPDF) $< $@
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/Makefile.am 2006-01-06 19:45:13 UTC (rev 116)
@@ -19,11 +19,12 @@
EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
+ inst-gpg4win.nsi uninst-gpg4win.nsi \
libiconv.def libintl.def gpg4win-splash.bmp gpg4win-splash.wav \
exdll.h g4wihelp.c g4wihelp.nsi config.site loreley.mid
# Need to clean the dll because we bypassed automake.
-CLEANFILES = g4wihelp.dll
+CLEANFILES = g4wihelp.dll versioninfo.txt
# Supported source packages.
gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
@@ -181,11 +182,25 @@
$(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list))) \
$(addsuffix .nsi,$(addprefix uninst-,$(gpg4win_build_list)))
+
+# Prepare the versioninfo file. The pipeline extracts the last
+# occurrence of a package with the same name, sorts the entries and
+# writes the file with DOS line endings. This helps to avoid
+# duplicate entries in case one package has been rebuild (which is
+# common when developing a new version).
+versioninfo.txt : playground/build/versioninfo.txt
+ set -e; \
+ ( while read a b; do echo "$$a $$(basename $$b)"; \
+ done < playground/build/versioninfo.txt \
+ | sort -k2 -sf | tac | uniq -f1 ; \
+ echo '=========== SHA-1 checksum ============= == package ==' \
+ ) | tac | awk '{printf "%s\r\n", $$0}' > versioninfo.txt
+
# 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 \
- g4wihelp.dll
+ g4wihelp.dll versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/gpg4win.mk.in 2006-01-06 19:45:13 UTC (rev 116)
@@ -71,6 +71,11 @@
export CONFIG_SITE="$(tsdir)/src/config.site"
endef
+# Support macro. Record version number of file $(1).
+define VERSIONINFO_macro
+ $(SHA1SUM) "$(1)" >> "$(bdir)/versioninfo.txt"
+endef
+
# Support macro. Unpack the archive $(1).
define DEFLATE_macro
case "$(1)" in \
@@ -101,6 +106,7 @@
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories
(cd $(bdir); \
$(call SETVARS,$(1)); \
+ $(call VERSIONINFO_macro,$$$${pkg}); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
@@ -155,6 +161,7 @@
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories
(cd $(bdir); \
$(call SETVARS,$(1)); \
+ $(call VERSIONINFO_macro,$$$${pkg}); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
@@ -199,6 +206,7 @@
($(call SETVARS,$(1)); \
$(MKDIR) "$$$${pkgidir}"; \
cd $$$${pkgidir}; \
+ $(call VERSIONINFO_macro,$$$${pkg}); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-install
@@ -208,6 +216,7 @@
($(call SETVARS,$(1)); \
$(MKDIR) "$$$${pkgidir_dev}"; \
(cd $$$${pkgidir_dev}; \
+ $(call VERSIONINFO_macro,$$$${pkg_dev}); \
$(call DEFLATE_macro,$$$${pkg_dev})); \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
touch stamps/stamp-$(1)-01-install-dev
Added: trunk/src/inst-gpg4win.nsi
===================================================================
--- trunk/src/inst-gpg4win.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/inst-gpg4win.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -0,0 +1,36 @@
+# inst-gpg4win.nsi - Hidden section for common files. -*- 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
+
+
+# This is the very first section installed.
+Section "-gpg4win"
+
+!ifdef SOURCES
+ #
+!else
+ SetOutPath "$INSTDIR\share\gpg4win"
+
+ File "${BUILD_DIR}/versioninfo.txt"
+
+!endif
+
+SectionEnd
+
+
+
Modified: trunk/src/inst-man_advanced_de.nsi
===================================================================
--- trunk/src/inst-man_advanced_de.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/inst-man_advanced_de.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -21,17 +21,17 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/man_advanced_de-${gpg4win_pkg_man_advanced_de_version}
Section "$(DESC_Name_man_advanced_de)" SEC_man_advanced_de
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_man_advanced_de}"
+ # No need to include anything as the manuals are part of gpg4win
+ # File "${gpg4win_pkg_man_advanced_de}"
!else
SetOutPath "$INSTDIR\share\gpg4win"
- File "${prefix}/share/man_advanced_de/man_advanced_de.html"
+ File "${BUILD_DIR}/../doc/manual-de/durchblicker.pdf"
!endif
SectionEnd
Modified: trunk/src/inst-man_novice_de.nsi
===================================================================
--- trunk/src/inst-man_novice_de.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/inst-man_novice_de.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -21,17 +21,17 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/man_novice_de-${gpg4win_pkg_man_novice_de_version}
Section "$(DESC_Name_man_novice_de)" SEC_man_novice_de
SetOutPath "$INSTDIR"
!ifdef SOURCES
- File "${gpg4win_pkg_man_novice_de}"
+ # No need to include anything as the manuals are part of gpg4win
+ # File "${gpg4win_pkg_man_novice_de}"
!else
SetOutPath "$INSTDIR\share\gpg4win"
- File "${prefix}/share/man_novice_de/man_novice_de.html"
+ File "${BUILD_DIR}/../doc/manual-de/einsteiger.pdf"
!endif
SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/inst-sections.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -19,6 +19,8 @@
# Sections
+!include "inst-gpg4win.nsi"
+
!ifdef HAVE_PKG_GNUPG
!include "inst-gnupg.nsi"
!endif
@@ -163,6 +165,9 @@
!include "uninst-gnupg.nsi"
!endif
+!include "uninst-gpg4win.nsi"
+
+
# Dependency Management
!include "Sections.nsh"
@@ -498,7 +503,7 @@
IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_menu
CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_novice_de).lnk" \
- "$INSTDIR\share\gpg4win\man_novice_de.html" \
+ "$INSTDIR\share\gpg4win\einsteiger.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
no_man_novice_de_menu:
!endif
@@ -509,7 +514,7 @@
IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_menu
CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Name_man_advanced_de).lnk" \
- "$INSTDIR\share\gpg4win\man_novice_de.html" \
+ "$INSTDIR\share\gpg4win\durchblicker.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
no_man_advanced_de_menu:
!endif
Added: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/uninst-gpg4win.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -0,0 +1,37 @@
+# uninst-gpg4win.nsi - Hidden uninstaller. -*- 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
+
+
+# This is the very last section of the uninstaller.
+Section "-un.gpg4win"
+!ifdef SOURCES
+
+!else
+
+ Delete "$INSTDIR\share\gpg4win\versioninfo.txt"
+
+ RMDir "$INSTDIR\share\gpg4win"
+
+ # Try to remove otehr top directories.
+ RMDir "$INSTDIR\lib"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
Modified: trunk/src/uninst-man_advanced_de.nsi
===================================================================
--- trunk/src/uninst-man_advanced_de.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/uninst-man_advanced_de.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -21,17 +21,20 @@
!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
+ #Push "${gpg4win_pkg_man_advanced_de}"
+ #Call un.SourceDelete
!else
+ # Note, that we will delete the dummy package which might have been
+ # installed by versions of gpg4win pre 0.5.1
Delete "$INSTDIR\share\gpg4win\man_advanced_de.html"
+
+ Delete "$INSTDIR\share\gpg4win\durchblicker.pdf"
RMDir "$INSTDIR\share\gpg4win"
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
Modified: trunk/src/uninst-man_novice_de.nsi
===================================================================
--- trunk/src/uninst-man_novice_de.nsi 2006-01-05 20:48:46 UTC (rev 115)
+++ trunk/src/uninst-man_novice_de.nsi 2006-01-06 19:45:13 UTC (rev 116)
@@ -21,17 +21,19 @@
!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
+ #Push "${gpg4win_pkg_man_novice_de}"
+ #Call un.SourceDelete
!else
+ # Note, that we will delete the dummy package which might have been
+ # installed by versions of gpg4win pre 0.5.1
Delete "$INSTDIR\share\gpg4win\man_novice_de.html"
+
+ Delete "$INSTDIR\share\gpg4win\einsteiger.pdf"
RMDir "$INSTDIR\share\gpg4win"
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
More information about the Gpg4win-commits
mailing list