Update mkportable
authorSean Engelhardt <sean.engelhardt@intevation.de>
Tue, 8 Dec 2015 10:02:23 +0000 (11:02 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 8 Dec 2015 15:04:44 +0000 (16:04 +0100)
* src/mkportable-full.h: remove references to non existing files,
  link existing files to their new file-path
* src/mkportable-light.h: remove references to non existing files,
  link existing files to their new file-path
* src/mkportable-vanilla.h: remove references to non existing files,
  link existing files to their new file-path
* src/mkportable.c: adjust the new path of gpgconf.exe

src/mkportable-full.h
src/mkportable-light.h
src/mkportable-vanilla.h
src/mkportable.c

index f2df2fe..3d0d1c8 100644 (file)
@@ -11,9 +11,7 @@ const char * const full_files[] =
   "dbus-launch.exe",
   "dbus-monitor.exe",
   "dbus-send.exe",
-  "dirmngr-client.exe",
-  "dirmngr.exe",
-  "dirmngr_ldap.exe",
+  "../GnuPG/bin/dirmngr.exe",
   "etc/fonts/fonts.conf",
   "etc/gtk-2.0/im-multipress.conf",
   "etc/pango/pango.modules",
@@ -29,33 +27,24 @@ const char * const full_files[] =
   "glib-genmarshal.exe",
   "gobject-query.exe",
   "gpa.exe",
-  "gpg-agent.exe",
-  "gpg-connect-agent.exe",
+  "../GnuPG/bin/gpg-agent.exe",
+  "../GnuPG/bin/gpg-connect-agent.exe",
   "gpg-error.exe",
-  "gpg-preset-passphrase.exe",
-  "gpg-protect-tool.exe",
-  "gpg2.exe",
-  "gpg2keys_curl.exe",
-  "gpg2keys_finger.exe",
-  "gpg2keys_hkp.exe",
-  "gpg2keys_kdns.exe",
-  "gpg2keys_ldap.exe",
-  "gpgconf.exe",
+  "../GnuPG/bin/gpgconf.exe",
   "gpgme-w32spawn.exe",
-  "gpgsm.exe",
-  "gpgtar.exe",
-  "gpgv2.exe",
+  "../GnuPG/bin/gpgsm.exe",
+  "../GnuPG/bin/gpgtar.exe",
   "gresource.exe",
   "gsettings.exe",
   "gspawn-win32-helper-console.exe",
   "gspawn-win32-helper.exe",
   "gtk-query-immodules-2.0.exe",
   "gtk-update-icon-cache.exe",
-  "include/assuan.h",
-  "include/gcrypt.h",
+  "../GnuPG/include/assuan.h",
+  "../GnuPG/include/gcrypt.h",
   "include/gpg-error.h",
   "include/gpgme.h",
-  "include/ksba.h",
+  "../GnuPG/include/ksba.h",
   "intl.dll",
   "kbuildsycoca4.exe",
   "kdebugdialog.exe",
@@ -77,14 +66,13 @@ const char * const full_files[] =
   "lib/gtk-2.0/2.10.0/immodules/im-viqr.dll",
   "lib/gtk-2.0/modules/libgail.dll",
   "lib/kde4/kcm_kleopatra.dll",
-  "libadns-1.dll",
-  "libassuan-0.dll",
+  "../GnuPG/bin/libadns-1.dll",
+  "../GnuPG/bin/libassuan-0.dll",
   "libatk-1.0-0.dll",
   "libattica.dll",
   "libcairo-2.dll",
   "libcairo-gobject-2.dll",
   "libcairo-script-interpreter-2.dll",
-  "libcurl-4.dll",
   "libdbus-1.dll",
   "libdbusmenu-qt.dll",
   "libexpat-1.dll",
@@ -93,21 +81,17 @@ const char * const full_files[] =
   "libfontconfig-1.dll",
   "libgailutil-18.dll",
   "libgcc_s_sjlj-1.dll",
-  "libgcrypt-20.dll",
+  "../GnuPG/bin/libgcrypt-20.dll",
   "libgdk-win32-2.0-0.dll",
   "libgdk_pixbuf-2.0-0.dll",
   "libgio-2.0-0.dll",
   "libglib-2.0-0.dll",
   "libgmodule-2.0-0.dll",
-  "libgnutls-26.dll",
-  "libgnutls-extra-26.dll",
-  "libgnutls-openssl-27.dll",
   "libgobject-2.0-0.dll",
   "libgpg-error-0.dll",
   "libgpgme++.dll",
   "libgpgme-11.dll",
   "libgpgme-glib-11.dll",
-  "libgsasl-7.dll",
   "libgthread-2.0-0.dll",
   "libgtk-win32-2.0-0.dll",
   "libiconv-2.dll",
@@ -120,20 +104,18 @@ const char * const full_files[] =
   "libkleopatraclientcore.dll",
   "libkleopatraclientgui.dll",
   "libkmime.dll",
-  "libksba-8.dll",
+  "../GnuPG/bin/libksba-8.dll",
   "libpango-1.0-0.dll",
   "libpangocairo-1.0-0.dll",
   "libpangoft2-1.0-0.dll",
   "libpangowin32-1.0-0.dll",
   "libpng14-14.dll",
   "libqgpgme.dll",
-  "libtasn1-3.dll",
-  "libw32pth-0.dll",
   "md5sum.exe",
   "pango-querymodules.exe",
   "paperkey.exe",
   "pinentry-gtk-2.exe",
-  "pinentry-qt4.exe",
+  "pinentry-qt.exe",
   "pinentry-w32.exe",
   "plugins/imageformats/qgif4.dll",
   "plugins/imageformats/qico4.dll",
@@ -142,14 +124,10 @@ const char * const full_files[] =
   "plugins/imageformats/qsvg4.dll",
   "plugins/imageformats/qtiff4.dll",
   "pub/gpa.exe",
-  "pub/gpg-connect-agent.exe",
-  "pub/gpg.exe",
-  "pub/gpg2.exe",
-  "pub/gpgconf.exe",
-  "pub/gpgsm.exe",
-  "pub/gpgv.exe",
-  "pub/libgcc_s_sjlj-1.dll",
-  "pub/libstdc++-6.dll",
+  "../GnuPG/bin/gpg-connect-agent.exe",
+  "../GnuPG/bin/gpg.exe",
+  "../GnuPG/bin/gpgsm.exe",
+  "../GnuPG/bin/gpgv.exe",
   "qdbus.exe",
   "qt.conf",
   "QtCore4.dll",
@@ -158,8 +136,7 @@ const char * const full_files[] =
   "QtNetwork4.dll",
   "QtSvg4.dll",
   "QtXml4.dll",
-  "scdaemon.exe",
-  "scute.dll",
+  "../GnuPG/bin/scdaemon.exe",
   "sha1sum.exe",
   "sha256sum.exe",
   "share/applications/kde4/kleopatra.desktop",
@@ -318,17 +295,9 @@ const char * const full_files[] =
   "share/doc/HTML/en/kleopatra/menuview.html",
   "share/doc/HTML/en/kleopatra/menuwindow.html",
   "share/glib-2.0/schemas/gschema.dtd",
-  "share/gnupg/gpg-agent.man",
-  "share/gnupg/gpg-conf.skel",
-  "share/gnupg/gpg-connect-agent.man",
-  "share/gnupg/gpg2.man",
-  "share/gnupg/gpgconf.man",
-  "share/gnupg/gpgsm.man",
-  "share/gnupg/gpgv2.man",
+  "../GnuPG/share/gnupg/gpg-conf.skel",
   "share/gnupg/help.*.txt",
   "share/gnupg/paperkey.man",
-  "share/gnupg/qualified.txt",
-  "share/gnupg/scdaemon.man",
   "share/gpa/gpa-logo.ppm",
   "share/gpa/gpa.png",
   "share/gpg4win/gpg4win-compendium-de.pdf",
index 91ee2f1..7405c4b 100644 (file)
@@ -1,8 +1,6 @@
 const char * const light_files[] =
 {
-  "dirmngr-client.exe",
-  "dirmngr.exe",
-  "dirmngr_ldap.exe",
+  "../GnuPG/bin/dirmngr.exe",
   "etc/fonts/fonts.conf",
   "etc/gtk-2.0/im-multipress.conf",
   "etc/pango/pango.modules",
@@ -16,22 +14,13 @@ const char * const light_files[] =
   "glib-genmarshal.exe",
   "gobject-query.exe",
   "gpa.exe",
-  "gpg-agent.exe",
-  "gpg-connect-agent.exe",
+  "../GnuPG/bin/gpg-agent.exe",
+  "../GnuPG/bin/gpg-connect-agent.exe",
   "gpg-error.exe",
-  "gpg-preset-passphrase.exe",
-  "gpg-protect-tool.exe",
-  "gpg2.exe",
-  "gpg2keys_curl.exe",
-  "gpg2keys_finger.exe",
-  "gpg2keys_hkp.exe",
-  "gpg2keys_kdns.exe",
-  "gpg2keys_ldap.exe",
-  "gpgconf.exe",
+  "../GnuPG/bin/gpgconf.exe",
   "gpgme-w32spawn.exe",
-  "gpgsm.exe",
-  "gpgtar.exe",
-  "gpgv2.exe",
+  "../GnuPG/bin/gpgsm.exe",
+  "../GnuPG/bin/gpgtar.exe",
   "gresource.exe",
   "gsettings.exe",
   "gspawn-win32-helper-console.exe",
@@ -53,73 +42,53 @@ const char * const light_files[] =
   "lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll",
   "lib/gtk-2.0/2.10.0/immodules/im-viqr.dll",
   "lib/gtk-2.0/modules/libgail.dll",
-  "libadns-1.dll",
-  "libassuan-0.dll",
+  "../GnuPG/bin/libadns-1.dll",
+  "../GnuPG/bin/libassuan-0.dll",
   "libatk-1.0-0.dll",
   "libcairo-2.dll",
   "libcairo-gobject-2.dll",
   "libcairo-script-interpreter-2.dll",
-  "libcurl-4.dll",
   "libexpat-1.dll",
   "libffi-6.dll",
   "libfontconfig-1.dll",
   "libgailutil-18.dll",
-  "libgcrypt-20.dll",
+  "../GnuPG/bin/libgcrypt-20.dll",
   "libgdk-win32-2.0-0.dll",
   "libgdk_pixbuf-2.0-0.dll",
   "libgio-2.0-0.dll",
   "libglib-2.0-0.dll",
   "libgmodule-2.0-0.dll",
-  "libgnutls-26.dll",
-  "libgnutls-extra-26.dll",
-  "libgnutls-openssl-27.dll",
   "libgobject-2.0-0.dll",
   "libgpg-error-0.dll",
   "libgpgme-11.dll",
   "libgpgme-glib-11.dll",
-  "libgsasl-7.dll",
   "libgthread-2.0-0.dll",
   "libgtk-win32-2.0-0.dll",
   "libiconv-2.dll",
   "libintl-8.dll",
-  "libksba-8.dll",
+  "../GnuPG/bin/libksba-8.dll",
   "libpango-1.0-0.dll",
   "libpangocairo-1.0-0.dll",
   "libpangoft2-1.0-0.dll",
   "libpangowin32-1.0-0.dll",
   "libpng14-14.dll",
-  "libtasn1-3.dll",
-  "libw32pth-0.dll",
   "md5sum.exe",
   "pango-querymodules.exe",
   "paperkey.exe",
   "pinentry-gtk-2.exe",
   "pinentry-w32.exe",
   "pub/gpa.exe",
-  "pub/gpg-connect-agent.exe",
-  "pub/gpg.exe",
-  "pub/gpg2.exe",
-  "pub/gpgconf.exe",
-  "pub/gpgsm.exe",
-  "pub/gpgv.exe",
-  "pub/libgcc_s_sjlj-1.dll",
-  "pub/libstdc++-6.dll",
-  "scdaemon.exe",
-  "scute.dll",
+  "../GnuPG/bin/gpg-connect-agent.exe",
+  "../GnuPG/bin/gpg.exe",
+  "../GnuPG/bin/gpgsm.exe",
+  "../GnuPG/bin/gpgv.exe",
+  "../GnuPG/bin/scdaemon.exe",
   "sha1sum.exe",
   "sha256sum.exe",
   "share/glib-2.0/schemas/gschema.dtd",
-  "share/gnupg/gpg-agent.man",
-  "share/gnupg/gpg-conf.skel",
-  "share/gnupg/gpg-connect-agent.man",
-  "share/gnupg/gpg2.man",
-  "share/gnupg/gpgconf.man",
-  "share/gnupg/gpgsm.man",
-  "share/gnupg/gpgv2.man",
+  "../GnuPG/share/gnupg/gpg-conf.skel",
   "share/gnupg/help.*.txt",
   "share/gnupg/paperkey.man",
-  "share/gnupg/qualified.txt",
-  "share/gnupg/scdaemon.man",
   "share/gpa/gpa-logo.ppm",
   "share/gpa/gpa.png",
   "share/gpg4win/HOWTO-SMIME.*.txt",
index cbed38e..a401c57 100644 (file)
@@ -1,67 +1,37 @@
 const char * const vanilla_files[] =
 {
-  "dirmngr-client.exe",
-  "dirmngr.exe",
-  "dirmngr_ldap.exe",
+  "../GnuPG/bin/dirmngr.exe",
   "gdk-pixbuf-pixdata.exe",
   "gdk-pixbuf-query-loaders.exe",
-  "gpg-agent.exe",
-  "gpg-connect-agent.exe",
+  "../GnuPG/bin/gpg-agent.exe",
+  "../GnuPG/bin/gpg-connect-agent.exe",
   "gpg-error.exe",
-  "gpg-preset-passphrase.exe",
-  "gpg-protect-tool.exe",
-  "gpg2.exe",
-  "gpg2keys_curl.exe",
-  "gpg2keys_finger.exe",
-  "gpg2keys_hkp.exe",
-  "gpg2keys_kdns.exe",
-  "gpg2keys_ldap.exe",
-  "gpgconf.exe",
-  "gpgsm.exe",
-  "gpgtar.exe",
-  "gpgv2.exe",
+  "../GnuPG/bin/gpgconf.exe",
+  "../GnuPG/bin/gpgsm.exe",
+  "../GnuPG/bin/gpgtar.exe",
   "intl.dll",
-  "libadns-1.dll",
-  "libassuan-0.dll",
-  "libcurl-4.dll",
+  "../GnuPG/bin/libadns-1.dll",
+  "../GnuPG/bin/libassuan-0.dll",
   "libffi-6.dll",
-  "libgcrypt-20.dll",
+  "../GnuPG/bin/libgcrypt-20.dll",
   "libgdk_pixbuf-2.0-0.dll",
-  "libgnutls-26.dll",
-  "libgnutls-extra-26.dll",
-  "libgnutls-openssl-27.dll",
   "libgpg-error-0.dll",
   "libiconv-2.dll",
   "libintl-8.dll",
-  "libksba-8.dll",
-  "libtasn1-3.dll",
-  "libw32pth-0.dll",
+  "../GnuPG/bin/libksba-8.dll",
   "md5sum.exe",
   "paperkey.exe",
   "pinentry-w32.exe",
-  "pub/gpg-connect-agent.exe",
-  "pub/gpg.exe",
-  "pub/gpg2.exe",
-  "pub/gpgconf.exe",
-  "pub/gpgsm.exe",
-  "pub/gpgv.exe",
-  "pub/libgcc_s_sjlj-1.dll",
-  "pub/libstdc++-6.dll",
-  "scdaemon.exe",
-  "scute.dll",
+  "../GnuPG/bin/gpg-connect-agent.exe",
+  "../GnuPG/bin/gpg.exe",
+  "../GnuPG/bin/gpgsm.exe",
+  "../GnuPG/bin/gpgv.exe",
+  "../GnuPG/bin/scdaemon.exe",
   "sha1sum.exe",
   "sha256sum.exe",
-  "share/gnupg/gpg-agent.man",
-  "share/gnupg/gpg-conf.skel",
-  "share/gnupg/gpg-connect-agent.man",
-  "share/gnupg/gpg2.man",
-  "share/gnupg/gpgconf.man",
-  "share/gnupg/gpgsm.man",
-  "share/gnupg/gpgv2.man",
+  "../GnuPG/share/gnupg/gpg-conf.skel",
   "share/gnupg/help.*.txt",
   "share/gnupg/paperkey.man",
-  "share/gnupg/qualified.txt",
-  "share/gnupg/scdaemon.man",
   "share/gpg4win/HOWTO-SMIME.*.txt",
   "share/gpg4win/README.*.txt",
   "share/gpg4win/versioninfo.txt",
index 2bf11aa..c28b048 100644 (file)
@@ -347,7 +347,7 @@ check_all_files (void)
   int i;
 
   /* First a quick check for gpgconf.  */
-  name = "gpgconf.exe";
+  name = "../GnuPG/bin/gpgconf.exe";
   if (access_sourcename (name))
     {
       err ("file '%s' not found in the source directory", name);
@@ -594,7 +594,7 @@ copy_all_files (void)
      to install a copy under the name pinentry.exe.  */
   switch (install_type)
     {
-    case iFULL:    copy_file ("pinentry-qt4.exe",   "pinentry.exe"); break;
+    case iFULL:    copy_file ("pinentry-qt.exe",   "pinentry.exe"); break;
     case iLIGHT:   copy_file ("pinentry-gtk-2.exe", "pinentry.exe"); break;
     case iVANILLA: copy_file ("pinentry-w32.exe",   "pinentry.exe"); break;
     }