[Gpg4win-commits] r453 - in trunk: . po src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jul 10 13:24:36 CEST 2007
Author: werner
Date: 2007-07-10 13:24:34 +0200 (Tue, 10 Jul 2007)
New Revision: 453
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/po/ChangeLog
trunk/po/Rules-nsis
trunk/src/Makefile.am
Log:
nsis-msgfmt fixes
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-10 09:10:57 UTC (rev 452)
+++ trunk/ChangeLog 2007-07-10 11:24:34 UTC (rev 453)
@@ -2,6 +2,12 @@
Released 1.1.1.
+ * src/Makefile.am (EXTRA_DIST): Remove $(common_nsi). Add all
+ installer scripts explicitly.
+
+ * Makefile.am (EXTRA_DIST): Removed old patches for Sylpheed.
+ (AUTOMAKE_OPTIONS): Add no-dist-gzip.
+
* src/gpg4win.nsi [GPG4WIN_LIGHT]: Undef gnupg2 and related libs.
Undef the English novices manual.
* src/installer-finish.nsi: Delete the link for the English novices
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-07-10 09:10:57 UTC (rev 452)
+++ trunk/Makefile.am 2007-07-10 11:24:34 UTC (rev 453)
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
+AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc --disable-pkg-man_advanced_en
SUBDIRS = po packages include doc src
@@ -32,27 +32,12 @@
patches/glib-2.12.12/01-giowin32.patch \
patches/glib-2.12.12/02-gspawn-w32.patch \
patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
- patches/sylpheed-claws-2.3.1/01-locale-dir.patch \
- patches/sylpheed-claws-2.3.1/02-fix-plugin-dir.patch \
- patches/sylpheed-claws-2.3.1/03-std-plugins.patch \
- patches/sylpheed-claws-2.3.1/04-pgpcore-def.patch \
- patches/sylpheed-claws-2.3.1/05-pgpinline-def.patch \
- patches/sylpheed-claws-2.3.1/06-pgpmime-def.patch \
- patches/sylpheed-claws-2.3.1/07-mbox.patch \
- patches/sylpheed-claws-2.3.1/08-w32-logo.patch \
- patches/sylpheed-claws-2.3.1/09-w32-icon.patch \
- patches/sylpheed-claws-2.3.1/99-auto.patch \
patches/sylpheed-claws-2.4.0/01-w32-logo.patch \
patches/sylpheed-claws-2.4.0/02-w32-icon.patch \
patches/sylpheed-claws-2.4.0/03-plugins-symbols.patch \
patches/sylpheed-claws-2.4.0/04-font-prefs.patch \
patches/sylpheed-claws-2.4.0/05-textviewer.patch \
patches/sylpheed-claws-2.4.0/99-auto.patch \
- patches/claws-mail-2.9.2/01-w32-logo.patch \
- patches/claws-mail-2.9.2/02-w32-icon.patch \
- patches/claws-mail-2.9.2/03-w32-port.patch \
- patches/claws-mail-2.9.2/04-smime-plugin.patch \
- patches/claws-mail-2.9.2/99-auto.patch \
patches/claws-mail-2.10.0/01-w32-logo.patch \
patches/claws-mail-2.10.0/02-w32-icon.patch \
patches/claws-mail-2.10.0/03-w32-port.patch \
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2007-07-10 09:10:57 UTC (rev 452)
+++ trunk/po/ChangeLog 2007-07-10 11:24:34 UTC (rev 453)
@@ -1,3 +1,8 @@
+2007-07-10 Werner Koch <wk at g10code.com>
+
+ * Rules-nsis (%.nsi): Remove dependency on nsis-msgfmt and call
+ make on it instead.
+
2007-07-09 Werner Koch <wk at g10code.com>
* de.po: Add description for gnupg2.
Modified: trunk/po/Rules-nsis
===================================================================
--- trunk/po/Rules-nsis 2007-07-10 09:10:57 UTC (rev 452)
+++ trunk/po/Rules-nsis 2007-07-10 11:24:34 UTC (rev 453)
@@ -1,4 +1,4 @@
-# Rules-nsis - Special Makefile rules for NSIS message catalogs.
+# Rules-nsis - Special Makefile rules for NSIS msg catalogs. -*- Makefile -*-
# Copyright (C) 2007 g10 Code GmbH
#
# This file is part of GPG4Win.
@@ -32,7 +32,8 @@
# We extend the GMO file mechanism to also handle NSIS files.
$(GMOFILES): %.gmo: %.nsi
-%.nsi : %.po nsis-msgfmt
+%.nsi : %.po
+ $(MAKE) nsis-msgfmt
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && dir="" || dir="$(srcdir)/"; \
echo "rm -f $${dir}$${lang}.nsi && ./nsis-msgfmt $${dir}$${lang}.po > $${dir}$${lang}.nsi"; \
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-07-10 09:10:57 UTC (rev 452)
+++ trunk/src/Makefile.am 2007-07-10 11:24:34 UTC (rev 453)
@@ -18,13 +18,49 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi \
- inst-gpg4win.nsi uninst-gpg4win.nsi installer-options.ini.in \
- libiconv.def libintl.def gpg4win-splash.wav gpgwrap.c \
- exdll.h g4wihelp.c g4wihelp.nsi config.site loreley.mid \
- inst-man_novice_en.nsi inst-man_advanced_en.nsi \
- uninst-man_novice_en.nsi uninst-man_advanced_en.nsi
+EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
+ installer-options.ini.in libiconv.def libintl.def loreley.mid \
+ gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
+ inst-sections.nsi installer.nsi installer-finish.nsi \
+ inst-gpg4win.nsi uninst-gpg4win.nsi \
+ inst-atk.nsi uninst-atk.nsi \
+ inst-cairo.nsi uninst-cairo.nsi \
+ inst-claws-mail.nsi uninst-claws-mail.nsi \
+ inst-crypt.nsi uninst-crypt.nsi \
+ inst-dirmngr.nsi uninst-dirmngr.nsi \
+ inst-eudoragpg.nsi uninst-eudoragpg.nsi \
+ inst-gettext.nsi uninst-gettext.nsi \
+ inst-glib.nsi uninst-glib.nsi \
+ inst-gnupg2.nsi uninst-gnupg2.nsi \
+ inst-gnupg.nsi uninst-gnupg.nsi \
+ inst-gpa.nsi uninst-gpa.nsi \
+ inst-gpgee.nsi uninst-gpgee.nsi \
+ inst-gpgme.nsi uninst-gpgme.nsi \
+ inst-gpgol.nsi uninst-gpgol.nsi \
+ inst-gtk+.nsi uninst-gtk+.nsi \
+ inst-jpeg.nsi uninst-jpeg.nsi \
+ inst-libassuan.nsi uninst-libassuan.nsi \
+ inst-libgcrypt.nsi uninst-libgcrypt.nsi \
+ inst-libgpg-error.nsi uninst-libgpg-error.nsi \
+ inst-libiconv.nsi uninst-libiconv.nsi \
+ inst-libksba.nsi uninst-libksba.nsi \
+ inst-libpng.nsi uninst-libpng.nsi \
+ inst-man_advanced_de.nsi uninst-man_advanced_de.nsi \
+ inst-man_advanced_en.nsi uninst-man_advanced_en.nsi \
+ inst-man_novice_de.nsi uninst-man_novice_de.nsi \
+ inst-man_novice_en.nsi uninst-man_novice_en.nsi \
+ inst-pango.nsi uninst-pango.nsi \
+ inst-pinentry.nsi uninst-pinentry.nsi \
+ inst-pkgconfig.nsi uninst-pkgconfig.nsi \
+ inst-pthreads-w32.nsi uninst-pthreads-w32.nsi \
+ inst-regex.nsi uninst-regex.nsi \
+ inst-sylpheed-claws.nsi uninst-sylpheed-claws.nsi \
+ inst-w32pth.nsi uninst-w32pth.nsi \
+ inst-winpt.nsi uninst-winpt.nsi \
+ inst-zlib.nsi uninst-zlib.nsi
+
+
# Need to clean the dll because we bypassed automake.
CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
installer-options.ini NEWS.tmp gpgwrap.exe
More information about the Gpg4win-commits
mailing list