glom r1658 - in trunk: . win32

[arminb svn gnome org]

Author: arminb
Date: Fri Aug 15 14:44:25 2008
New Revision: 1658
URL: http://svn.gnome.org/viewvc/glom?rev=1658&view=rev

Log:
2008-08-15  Armin Burgmeier  <armin openismus com>

	* win32/build_installer:
	* win32/glom.iss.in: We use self-built postgresql binaries again, so
	we don't need to ship all the libraries the official ones are built
	against.

Modified:
   trunk/ChangeLog
   trunk/win32/build-installer
   trunk/win32/glom.iss.in

Modified: trunk/win32/build-installer
==============================================================================
--- trunk/win32/build-installer	(original)
+++ trunk/win32/build-installer	Fri Aug 15 14:44:25 2008
@@ -205,16 +205,17 @@
 cp $POSTGRESDIR/bin/initdb.exe installer/bin || exit
 cp $POSTGRESDIR/bin/pg_ctl.exe installer/bin || exit
 
-cp $POSTGRESDIR/bin/libpq.dll installer/bin || exit
+cp $POSTGRESDIR/lib/libpq.dll installer/bin || exit
+strip installer/bin/postgres.exe installer/bin/initdb.exe installer/bin/pg_ctl.exe installer/bin/libpq.dll
 # This is required by libpq.dll:
-cp $POSTGRESDIR/bin/libintl3.dll installer/bin || exit
-cp $POSTGRESDIR/bin/libiconv2.dll installer/bin || exit
-cp $POSTGRESDIR/bin/krb5_32.dll installer/bin || exit
-cp $POSTGRESDIR/bin/k5sprt32.dll installer/bin || exit
-cp $POSTGRESDIR/bin/gssapi32.dll installer/bin || exit
-cp $POSTGRESDIR/bin/comerr32.dll installer/bin || exit
-cp $POSTGRESDIR/bin/libeay32.dll installer/bin || exit
-cp $POSTGRESDIR/bin/ssleay32.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/libintl3.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/libiconv2.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/krb5_32.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/k5sprt32.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/gssapi32.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/comerr32.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/libeay32.dll installer/bin || exit
+#cp $POSTGRESDIR/bin/ssleay32.dll installer/bin || exit
 
 mkdir -p installer/share/postgresql || exit
 cp $POSTGRESDIR/share/postgres.bki installer/share/postgresql || exit
@@ -234,7 +235,8 @@
 mkdir -p installer/lib/postgresql || exit
 cp $POSTGRESDIR/lib/*.dll installer/lib/postgresql || exit
 # These are not conversion modules
-rm installer/lib/postgresql/libecpg.dll installer/lib/postgresql/libecpg_compat.dll installer/lib/postgresql/libpgtypes.dll installer/lib/postgresql/pgevent.dll installer/lib/postgresql/plpgsql.dll || exit
+rm installer/lib/postgresql/libecpg.dll installer/lib/postgresql/libecpg_compat.dll installer/lib/postgresql/libpgtypes.dll installer/lib/postgresql/libpq.dll installer/lib/postgresql/pgevent.dll installer/lib/postgresql/plpgsql.dll || exit
+strip installer/lib/postgresql/*.dll
 
 echo "Copying shared data (glade files, icons, etc.)..."
 

Modified: trunk/win32/glom.iss.in
==============================================================================
--- trunk/win32/glom.iss.in	(original)
+++ trunk/win32/glom.iss.in	Fri Aug 15 14:44:25 2008
@@ -92,14 +92,14 @@
 Source: "bin/initdb.exe"; DestDir: "{app}/bin"; Components: main
 Source: "bin/pg_ctl.exe"; DestDir: "{app}/bin"; Components: main
 Source: "bin/libpq.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/libintl3.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/libiconv2.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/krb5_32.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/k5sprt32.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/gssapi32.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/comerr32.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/libeay32.dll"; DestDir: "{app}/bin"; Components: main
-Source: "bin/ssleay32.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/libintl3.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/libiconv2.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/krb5_32.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/k5sprt32.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/gssapi32.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/comerr32.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/libeay32.dll"; DestDir: "{app}/bin"; Components: main
+;Source: "bin/ssleay32.dll"; DestDir: "{app}/bin"; Components: main
 
 ; TODO: I would like to install these into {app}/share/postgresql, but postgres
 ; does not find them then. Perhaps we should install all of postgres elsewhere,