[Gpg4win-commits] r509 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Aug 30 15:10:32 CEST 2007
Author: marcus
Date: 2007-08-30 15:10:30 +0200 (Thu, 30 Aug 2007)
New Revision: 509
Modified:
trunk/ChangeLog
trunk/README
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/download.sh
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/gpg4win.nsi
trunk/src/inst-sections.nsi
Log:
2007-08-30 Marcus Brinkmann <marcus at g10code.de>
* packages/download.sh: Implement new "name" command and remove
"ren" command.
* packages/packages.current: Add qt.
* configure.ac: Add qt.
* include/config.nsi.in: Add qt.
* src/Makefile.am (EXTRA_DIST): Add inst-qt.nsi and uninst-qt.nsi.
(gpg4win_bpkgs): Add qt.
* src/uninst-qt.nsi, src/inst-qt.nsi: New files.
* src/inst-sections.nsi: Run installer and uninstaller for qt.
(CalcDepends): Handle qt.
* src/gpg4win.nsi: Remove qt from light installer.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/ChangeLog 2007-08-30 13:10:30 UTC (rev 509)
@@ -1,3 +1,17 @@
+2007-08-30 Marcus Brinkmann <marcus at g10code.de>
+
+ * packages/download.sh: Implement new "name" command and remove
+ "ren" command.
+ * packages/packages.current: Add qt.
+ * configure.ac: Add qt.
+ * include/config.nsi.in: Add qt.
+ * src/Makefile.am (EXTRA_DIST): Add inst-qt.nsi and uninst-qt.nsi.
+ (gpg4win_bpkgs): Add qt.
+ * src/uninst-qt.nsi, src/inst-qt.nsi: New files.
+ * src/inst-sections.nsi: Run installer and uninstaller for qt.
+ (CalcDepends): Handle qt.
+ * src/gpg4win.nsi: Remove qt from light installer.
+
2007-08-24 Marcus Brinkmann <marcus at g10code.de>
* src/inst-gnupg.nsi: Write compatibility key to registry for GPGee.
Modified: trunk/README
===================================================================
--- trunk/README 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/README 2007-08-30 13:10:30 UTC (rev 509)
@@ -75,11 +75,12 @@
1. Add constants for the package FOO into include/config.nsi.in .
2. Create 2 new installer scripts, named src/inst-foo.nsi and
- uninst-foo.nsi .
+ uninst-foo.nsi and add them to EXTRA_DIST in src/Makefile.am.
3. Add foo to one the variables gpg4win_bpgks (if foo should not be
build be the gpg4win) or gpg4win_spkgs (if foo should be build by
- gpg4win) in src/Makefile.am
+ gpg4win) in src/Makefile.am . Also add any required configure
+ flags etc.
4. Add FOO to inst-sections.nsi.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/configure.ac 2007-08-30 13:10:30 UTC (rev 509)
@@ -212,6 +212,9 @@
GPG4WIN_IPKG([man_novice_en])
#GPG4WIN_IPKG([man_advanced_en])
+# Qt related stuff.
+GPG4WIN_BPKG_GNUWIN32([qt])
+
GPG4WIN_FINALIZE
# Throw an error if required tools are missing
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/include/config.nsi.in 2007-08-30 13:10:30 UTC (rev 509)
@@ -200,6 +200,12 @@
!define gpg4win_pkg_gettext_version @gpg4win_pkg_gettext_version@
!define gpg4win_pkg_gettext_src @gpg4win_pkg_gettext_src@
+ at HAVE_PKG_QT@
+!define gpg4win_pkg_qt @gpg4win_pkg_qt@
+!define gpg4win_pkg_qt_version @gpg4win_pkg_qt_version@
+!define gpg4win_pkg_qt_dev @gpg4win_pkg_qt_dev@
+!define gpg4win_pkg_qt_src @gpg4win_pkg_qt_src@
+
# Internal packages.
@HAVE_PKG_MAN_NOVICE_DE@
Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/packages/download.sh 2007-08-30 13:10:30 UTC (rev 509)
@@ -118,6 +118,14 @@
server="$value"
name=
;;
+ name)
+ if [ -z "$value" ]; then
+ echo "syntax error in name statement, line $lnr" >&2
+ exit 1
+ fi
+ name="$value"
+ echo "using name \`$name'"
+ ;;
file)
if [ -z "$value" ]; then
echo "syntax error in file statement, line $lnr" >&2
@@ -128,12 +136,14 @@
exit 1
fi
url="$server/$value"
- name=`basename "$value"`
+ if [ -z "$name" ]; then
+ name=`basename "$value"`
+ fi
if [ -f "$name" -a "$force" = "no" ]; then
echo "package \`$url' ... already exists"
else
echo -n "downloading \`$url' ..."
- if ${WGET} -c -q "$url" ; then
+ if ${WGET} -c -q "$url" -O "$name" ; then
echo " okay"
else
echo " FAILED (line $lnr)"
@@ -141,24 +151,6 @@
fi
fi
;;
- ren)
- if [ -z "$value" ]; then
- echo "syntax error in ren statement, line $lnr" >&2
- exit 1
- fi
- if [ -z "$name" ]; then
- echo "no file name for ren statement, line $lnr" >&2
- exit 1
- fi
- echo -n "renaming \`$name' ..."
- if mv -f "$name" "$value" ; then
- echo " okay"
- else
- echo " FAILED (line $lnr)"
- echo "line $lnr: renaming $name failed" >> '.#download.failed'
- fi
- name="$value"
- ;;
chk)
if [ -z "$value" ]; then
echo "syntax error in chk statement, line $lnr" >&2
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/packages/packages.current 2007-08-30 13:10:30 UTC (rev 509)
@@ -231,8 +231,8 @@
file gnupg/gnupg-1.4.7.tar.bz2
chk 22149105845c79068771837c8deb7d5ba0854927
+name gnupg2-2.0.6.tar.bz2
file gnupg/gnupg-2.0.6.tar.bz2
-ren gnupg2-2.0.6.tar.bz2
chk 4aa9a3ecc954126cfc0a30bef94ec6e1fbbc7009
file libgpg-error/libgpg-error-1.5.tar.bz2
@@ -266,4 +266,20 @@
chk bb9182cd4c6bd6677ba9cdcca262dcc1b1d22c3c
+#
+# Qt
+#
+server http://www.kdab.net/~frank/qt-win
+name qt-win-opensource-4.3.1-bin.zip
+file Qt-Win-Opensource-4.3.1.zip
+chk 36da6ba5a271bb66dd4e92a6b237ec8051edbf92
+
+name qt-win-opensource-4.3.1-lib.zip
+file Qt-Win-Opensource-4.3.1-dev.zip
+chk c73998ac45b17ec4b7a52de6ef8f7f0e95d9818a
+
+server ftp://ftp.trolltech.com/pub/qt/source
+name qt-win-opensource-4.3.1-src.zip
+file qt-win-opensource-src-4.3.1.zip
+chk 7dcdaafe5ab451b1bc9af0e5db080e7b5d484732
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/src/Makefile.am 2007-08-30 13:10:30 UTC (rev 509)
@@ -58,10 +58,10 @@
inst-w32pth.nsi uninst-w32pth.nsi \
inst-winpt.nsi uninst-winpt.nsi \
inst-zlib.nsi uninst-zlib.nsi \
+ inst-qt.nsi uninst-qt.nsi \
inst-bzip2.nsi uninst-bzip2.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
@@ -202,8 +202,8 @@
# Supported binary packages.
-gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
- atk gtk+ gpgee crypt regex
+gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
+ atk gtk+ gpgee crypt regex qt
# libiconv needs some special magic to generate a usable import
# library.
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/src/gpg4win.nsi 2007-08-30 13:10:30 UTC (rev 509)
@@ -30,6 +30,9 @@
!undef HAVE_PKG_MAN_NOVICE_DE
!undef HAVE_PKG_MAN_NOVICE_EN
!undef HAVE_PKG_MAN_ADVANCED_DE
+!ifdef HAVE_PKG_QT
+!undef HAVE_PKG_QT
+!endif
!ifdef HAVE_PKG_GNUPG2
!undef HAVE_PKG_GNUPG2
!endif
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-08-29 15:10:49 UTC (rev 508)
+++ trunk/src/inst-sections.nsi 2007-08-30 13:10:30 UTC (rev 509)
@@ -1,5 +1,5 @@
# inst-sections.nsi - Installer for GPG4Win sections. -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2006 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007 g10 Code GmbH
#
# This file is part of GPG4Win.
#
@@ -116,6 +116,9 @@
#!ifdef HAVE_PKG_EUDORAGPG
#!include "inst-eudoragpg.nsi"
#!endif
+!ifdef HAVE_PKG_QT
+!include "inst-qt.nsi"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "inst-man_novice_en.nsi"
!endif
@@ -143,6 +146,9 @@
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "uninst-man_novice_en.nsi"
!endif
+!ifdef HAVE_PKG_QT
+!include "uninst-qt.nsi"
+!endif
#!ifdef HAVE_PKG_EUDORAGPG
#!include "uninst-eudoragpg.nsi"
#!endif
@@ -452,6 +458,9 @@
!ifdef HAVE_PKG_PINENTRY
!insertmacro UnselectSection ${SEC_pinentry}
!endif
+!ifdef HAVE_PKG_QT
+ !insertmacro UnselectSection ${SEC_qt}
+!endif
# Then enable all dependencies in reverse build list order!
@@ -637,6 +646,7 @@
!endif
# Package "libiconv" has no dependencies.
+ # Package "qt" has no dependencies.
FunctionEnd
More information about the Gpg4win-commits
mailing list