r19513 - gnucash/trunk/packaging/win32 - Windows version:

[Geert Janssens]

Author: gjanssens
Date: 2010-08-30 13:10:31 -0400 (Mon, 30 Aug 2010)
New Revision: 19513
Trac: http://svn.gnucash.org/trac/changeset/19513

Modified:
   gnucash/trunk/packaging/win32/dist-impl.sh
   gnucash/trunk/packaging/win32/gnucash.iss.in
Log:
Windows version:
* reduce footprint by not packaging unused files
* move gnc-mod required files to bin
* remove libdir from the PATH

Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh	2010-08-30 17:08:36 UTC (rev 19512)
+++ gnucash/trunk/packaging/win32/dist-impl.sh	2010-08-30 17:10:31 UTC (rev 19513)
@@ -218,15 +218,13 @@
 function dist_libdbi() {
     setup LibDBI
     cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
-    cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
-    cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
-    cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
+    cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${DIST_UDIR}/bin
+    cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${DIST_UDIR}/bin
     cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
-    cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
+    cp -a ${_PGSQL_UDIR}/lib/*.dll ${DIST_UDIR}/bin
     cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
-    cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
     mkdir ${DIST_UDIR}/lib/dbd
-    cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
+    cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${DIST_UDIR}/lib/dbd
 }
 
 function dist_webkit() {
@@ -241,7 +239,7 @@
     mkdir -p $DIST_UDIR/etc/gconf/schemas
     cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
     mkdir -p $DIST_UDIR/lib
-    cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
+    cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
     mkdir -p $DIST_UDIR/share
     cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
     cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin

Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in	2010-08-30 17:08:36 UTC (rev 19512)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in	2010-08-30 17:10:31 UTC (rev 19513)
@@ -237,7 +237,7 @@
   FileString := FileString + '#'#13#10 ;
 
   FileString := FileString + '[Variables]'#13#10 ;
-  FileString := FileString + 'PATH=' + pkglibdir + ';' + libdir + ';{PATH}'#13#10 ;
+  FileString := FileString + 'PATH=' + pkglibdir + ';{PATH}'#13#10 ;
   FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
   FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
   FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;