GNOME.org
 

glom r1970 - in trunk: . glom glom/libglom glom/libglom/connectionpool_backends win32

Author: arminb
Date: Mon Mar  9 12:13:04 2009
New Revision: 1970
URL: http://svn.gnome.org/viewvc/glom?rev=1970&view=rev

Log:


Removed:
   trunk/win32/querymodules.bat
Modified:
   trunk/ChangeLog
   trunk/glom/libglom/connectionpool.cc
   trunk/glom/libglom/connectionpool_backends/postgres_self.cc
   trunk/glom/main.cc
   trunk/win32/Makefile.am
   trunk/win32/README
   trunk/win32/build-installer
   trunk/win32/glom.iss.in

Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc	(original)
+++ trunk/glom/libglom/connectionpool.cc	Mon Mar  9 12:13:04 2009
@@ -27,8 +27,15 @@
 #include <glibmm/i18n.h>
 
 #ifndef G_OS_WIN32
-#include <libepc/shell.h> //For epc_shell_set_progress_hooks().
-#include <libepc/publisher.h>
+# include <libepc/shell.h> //For epc_shell_set_progress_hooks().
+# include <libepc/publisher.h>
+#else
+// objidl.h, included by windows.h, defines a type called DATADIR, so we need
+// to undef it temporarily.
+# define GLOM_SAVE_DATADIR DATADIR
+# undef DATADIR
+# include <windows.h>
+# define DATADIR GLOM_SAVE_DATADIR
 #endif
 
 #ifdef GLOM_ENABLE_MAEMO

Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.cc
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.cc	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.cc	Mon Mar  9 12:13:04 2009
@@ -381,7 +381,7 @@
   // POSTGRES_UTILS_PATH is defined in config.h, based on the configure.
   // Make sure to use double quotes for the executable path, because the
   // CreateProcess() API used on Windows does not support single quotes.
-  const std::string command_postgres_start = "\"" + get_path_to_postgres_executable("postmaster") + "\" -D \"" + dbdir_data + "\" "
+  const std::string command_postgres_start = "\"" + get_path_to_postgres_executable("postgres") + "\" -D \"" + dbdir_data + "\" "
                                   + " -p " + port_as_text
                                   + " -i " //Equivalent to -h "*", which in turn is equivalent to listen_addresses in postgresql.conf. Listen to all IP addresses, so any client can connect (with a username+password)
                                   + " -c hba_file=\"" + dbdir + "/config/pg_hba.conf\""

Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc	(original)
+++ trunk/glom/main.cc	Mon Mar  9 12:13:04 2009
@@ -151,7 +151,7 @@
 
 #ifdef G_OS_WIN32
   // Load translations relative to glom.exe on Windows
-  gchar* dir = g_win32_get_package_installation_subdirectory(NULL, NULL, "lib/locale");
+  gchar* dir = g_win32_get_package_installation_subdirectory(NULL, NULL, "share/locale");
   bindtextdomain(GETTEXT_PACKAGE, dir);
   g_free(dir);
 #else

Modified: trunk/win32/Makefile.am
==============================================================================
--- trunk/win32/Makefile.am	(original)
+++ trunk/win32/Makefile.am	Mon Mar  9 12:13:04 2009
@@ -1,2 +1,2 @@
 # Stuff to build the Windows installer:
-EXTRA_DIST = glom.iss.in build-installer querymodules.bat
+EXTRA_DIST = glom.iss.in build-installer README

Modified: trunk/win32/README
==============================================================================
--- trunk/win32/README	(original)
+++ trunk/win32/README	Mon Mar  9 12:13:04 2009
@@ -1,9 +1,12 @@
 To create the Windows installer for glom, ideally all you have to do is to run
 the build-installer script, after having installed all dependencies to the
-correct places (that means precompiled ones to /, and self-built
-ones to /local/). Also, you will need to have postgresql installed at
-C:\postgres and Python at C:\Python25. The Inno Setup compiler (iscc) needs to
-be in your PATH.
+correct places. I'm using official Windows builds from ftp.gnome.org where
+possible. The GTK+ all-in-one bundle is expected in /bundle, GtkSourceView in
+/gtksourceview and libgda in /libgda. Others are still in /, but this might
+change in future. Self-built dependencies (most C++ libraries) are expected
+in /local. Also, you will need to have postgresql installed at C:\postgres
+and Python at C:\Python25. The Inno Setup compiler (iscc) needs to be in your
+PATH.
 
 There are many paths hardcoded to fit my own build environment. Feel free to
 generalize the script, to make it more adaptive to other environments.

Modified: trunk/win32/build-installer
==============================================================================
--- trunk/win32/build-installer	(original)
+++ trunk/win32/build-installer	Mon Mar  9 12:13:04 2009
@@ -60,14 +60,13 @@
 cp /bin/libORBitCosNaming-2-0.dll installer/bin || exit
 cp /bin/libORBit-imodule-2-0.dll installer/bin || exit
 
-cp /bundle/bin/libglade-2.0-0.dll installer/bin || exit
 cp /bin/libgconf-2-4.dll installer/bin || exit
-#cp /local/bin/libgnomevfs-2-0.dll installer/bin || exit
-cp /bin/libgoocanvas-3.dll installer/bin || exit
+cp /libglade/bin/libglade-2.0-0.dll installer/bin || exit
+cp /goocanvas/bin/libgoocanvas-3.dll installer/bin || exit
 
-cp /local/bin/libgda-3.0-2.dll installer/bin || exit
-cp /local/bin/libgdasql-3.0-2.dll installer/bin || exit
-cp /local/bin/libgda-report-3.0-2.dll installer/bin || exit
+cp /libgda/bin/libgda-4.0-4.dll installer/bin || exit
+#cp /libgda/bin/libgdasql-3.0-2.dll installer/bin || exit
+cp /libgda/bin/libgda-report-4.0-4.dll installer/bin || exit
 
 cp /local/bin/libsigc-2.0-0.dll installer/bin || exit
 cp /local/bin/libglibmm-2.4-1.dll installer/bin || exit
@@ -79,13 +78,13 @@
 cp /local/bin/libxml++-2.6-2.dll installer/bin || exit
 cp /local/bin/libgtkmm-2.4-1.dll installer/bin || exit
 cp /local/bin/libgtksourceviewmm-2.0-2.dll installer/bin || exit
-cp /local/bin/libgoocanvasmm-0.1-3.dll installer/bin || exit
+cp /local/bin/libgoocanvasmm-0.1-4.dll installer/bin || exit
 cp /local/bin/libgconfmm-2.6-1.dll installer/bin || exit
-cp /local/bin/libgdamm-3.0-10.dll installer/bin || exit
+cp /local/bin/libgdamm-4.0-10.dll installer/bin || exit
 cp /local/bin/libglademm-2.4-1.dll installer/bin || exit
 
 cp /local/bin/libbakery-2.6--6-1.dll installer/bin || exit
-cp /local/bin/libglom-0.dll installer/bin || exit
+cp /local/bin/libglom-1.0-0.dll installer/bin || exit
 
 echo "Stripping DLL files..."
 strip installer/bin/*.dll || exit
@@ -99,9 +98,12 @@
 cp /bundle/bin/iconv.dll installer/bin || exit
 cp /bundle/bin/zlib1.dll installer/bin || exit
 
+cp /libgda/bin/libdb47.dll installer/bin # TODO: TEMP!
+
 echo "Copying Python..."
 
 # TODO: Find out Windows directory somehow, perhaps by looking at PATH?
+# There is $WINDIR already.
 cp /c/WINDOWS/system32/python25.dll installer/bin || exit
 
 # We through all python modules into python/. Glom sets PYTHONPATH accordingly.
@@ -142,18 +144,15 @@
 #mkdir -p installer/lib/gtk-2.0/2.10.0/immodules || exit
 #cp /lib/gtk-2.0/2.10.0/immodules/*.dll installer/lib/gtk-2.0/2.10.0/immodules || exit
 #strip installer/lib/gtk-2.0/2.10.0/immodules/*.dll || exit
-#cp /bin/gtk-query-immodules-2.0.exe installer || exit
 
 mkdir -p installer/lib/gtk-2.0/2.10.0/engines || exit
 cp /bundle/lib/gtk-2.0/2.10.0/engines/libwimp.dll installer/lib/gtk-2.0/2.10.0/engines || exit
 strip installer/lib/gtk-2.0/2.10.0/engines/libwimp.dll || exit
 
-#mkdir -p installer/lib/gtk-2.0/2.10.0/loaders || exit
-#cp /lib/gtk-2.0/2.10.0/loaders/*.dll installer/lib/gtk-2.0/2.10.0/loaders || exit
-#strip installer/lib/gtk-2.0/2.10.0/loaders/*.dll || exit
-#cp /bin/gdk-pixbuf-query-loaders.exe installer || exit
+mkdir -p installer/lib/gtk-2.0/2.10.0/loaders || exit
+cp /bundle/lib/gtk-2.0/2.10.0/loaders/*.dll installer/lib/gtk-2.0/2.10.0/loaders || exit
+strip installer/lib/gtk-2.0/2.10.0/loaders/*.dll || exit
 
-# TODO: Can we omit this?
 mkdir -p installer/etc/gtk-2.0
 cp /bundle/etc/gtk-2.0/gtk.immodules installer/etc/gtk-2.0 || exit -1
 cp /bundle/etc/gtk-2.0/gdk-pixbuf.loaders installer/etc/gtk-2.0 || exit -1
@@ -163,31 +162,32 @@
 mkdir -p installer/etc/gtk-2.0 || exit
 echo "gtk-theme-name = \"MS-Windows\"" > installer/etc/gtk-2.0/gtkrc || exit
 
-mkdir -p installer/lib/libgda-3.0/providers || exit
-cp /local/lib/libgda-3.0/providers/*.dll installer/lib/libgda-3.0/providers || exit
-strip installer/lib/libgda-3.0/providers/*.dll || exit
-
-#mkdir -p installer/lib/gnome-vfs-2.0/modules || exit
-#cp /lib/gnome-vfs-2.0/modules/*.dll installer/lib/gnome-vfs-2.0/modules || exit
-#strip installer/lib/gnome-vfs-2.0/modules/*.dll || exit
+# TODO: We only need SQLite and postgres providers
+mkdir -p installer/lib/libgda-4.0/providers || exit
+cp /libgda/lib/libgda-4.0/providers/*.dll installer/lib/libgda-4.0/providers || exit
+strip installer/lib/libgda-4.0/providers/*.dll || exit
 
-#mkdir -p installer/etc/gnome-vfs-2.0/modules || exit
-#cp /local/etc/gnome-vfs-2.0/modules/default-modules.conf installer/etc/gnome-vfs-2.0/modules || exit
+mkdir -p installer/etc/libgda-4.0 || exit
+cp /libgda/etc/libgda-4.0/config installer/etc/libgda-4.0 || exit
 
 echo "Copying locales..."
 
 # We need to keep the locale files from share/locale in share/locale and those
 # from lib/locale in lib/locale:
-cp /bundle/share/locale installer/share -R || exit
-cp /share/locale installer/share -R || exit
-#cp /lib/locale installer/lib -R || exit
-cp /local/lib/locale installer/lib -R || exit
-cp /gtksourceview/lib/locale installer/lib -R || exit
+cp /bundle/share/locale installer/share -R || exit # GTK+ + deps
+cp /share/locale installer/share -R || exit # GConf2
+cp /local/share/locale installer/share -R || exit # bakery, glom
+# TODO: Switch to >=GtkSourceView 2.5, which has locales in share/
+cp /gtksourceview/lib/locale installer/lib -R || exit # gtksourceview
+# TODO: libgda-4.0 locales (wait for them being present in official binaries)
+# TODO: Bail if a translation file is missing
+
+TRANSLATIONS="atk10.mo gtk20.mo bakery.mo GConf2.mo glib20.mo gtk20.mo gtk20-properties.mo gtksourceview-2.0.mo libgda-4.0.mo glom.mo"
 
-find installer/lib/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo |  grep -v libgda-3.0.mo | xargs rm
+find installer/lib/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo |  grep -v libgda-4.0.mo | xargs rm
 find installer/lib/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty
 
-find installer/share/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo |  grep -v libgda-3.0.mo | xargs rm
+find installer/share/locale/ -type f | grep -v atk10.mo | grep -v gtk20.mo | grep -v bakery.mo | grep -v GConf2.mo | grep -v glib20.mo | grep -v glom.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo |  grep -v libgda-4.0.mo | xargs rm
 find installer/share/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty
 
 echo "Copying executable..."
@@ -201,8 +201,8 @@
 cp $POSTGRESDIR/bin/pg_ctl.exe 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:
+strip installer/bin/postgres.exe installer/bin/initdb.exe installer/bin/pg_ctl.exe installer/bin/libpq.dll || exit
+# This is required by libpq.dll in the official installer
 #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
@@ -239,17 +239,16 @@
 cp -R /gtksourceview/share/gtksourceview-2.0/language-specs installer/share/gtksourceview-2.0 || exit
 cp -R /gtksourceview/share/gtksourceview-2.0/styles installer/share/gtksourceview-2.0 || exit
 
-mkdir -p installer/share/libgda-3.0/dtd
-cp /local/share/libgda-3.0/*.xml installer/share/libgda-3.0/
-cp /local/share/libgda-3.0/dtd/*.dtd installer/share/libgda-3.0/dtd
+mkdir -p installer/share/libgda-4.0/dtd
+cp /libgda/share/libgda-4.0/*.xml installer/share/libgda-4.0/
+cp /libgda/share/libgda-4.0/dtd/*.dtd installer/share/libgda-4.0/dtd
 
 mkdir -p installer/share/glom/glade || exit
 cp /local/share/glom/glade/glom.glade installer/share/glom/glade || exit
 cp /local/share/glom/glade/glom_developer.glade installer/share/glom/glade || exit
 cp -R /local/share/glom/doc installer/share/glom/ || exit
 cp -R /local/share/glom/pixmaps installer/share/glom/ || exit
-
-# TODO: /local/share/glom/xslt/* (what is this used for?)
+cp -R /local/share/glom/xslt installer/share/glom || exit
 
 mkdir -p installer/share/icons/hicolor/48x48/apps || exit
 cp /local/share/icons/hicolor/48x48/apps/glom.png installer/share/icons/hicolor/48x48/apps || exit
@@ -257,6 +256,8 @@
 # This is used for the glom icon in the initial dialog. I'm not sure why GTK
 # does not already get it from the icons/ directory, but it took me already
 # long enough to figure out that this works:
+# TODO: Maybe we'll need to use gtk_icon_theme_append_search_path to tell GTK+
+# where we store the icon.
 mkdir -p installer/share/pixmaps
 cp /local/share/icons/hicolor/16x16/apps/glom.png installer/share/pixmaps || exit
 

Modified: trunk/win32/glom.iss.in
==============================================================================
--- trunk/win32/glom.iss.in	(original)
+++ trunk/win32/glom.iss.in	Mon Mar  9 12:13:04 2009
@@ -63,9 +63,9 @@
 Source: "bin\libORBit-imodule-2-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libORBitCosNaming-2-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgconf-2-4.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgda-3.0-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgda-report-3.0-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgdasql-3.0-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgda-4.0-4.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgda-report-4.0-4.dll"; DestDir: "{app}\bin"; Components: main
+;Source: "bin\libgdasql-4.0-4.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgettextpo-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libglade-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgoocanvas-3.dll"; DestDir: "{app}\bin"; Components: main
@@ -75,12 +75,12 @@
 Source: "bin\libbakery-2.6--6-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libcairomm-1.0-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgconfmm-2.6-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgdamm-3.0-10.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgdamm-4.0-10.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgdkmm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libglademm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libglibmm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgiomm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "bin\libgoocanvasmm-0.1-3.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libgoocanvasmm-0.1-4.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgtkmm-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libgtksourceviewmm-2.0-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\libpangomm-1.4-1.dll"; DestDir: "{app}\bin"; Components: main
@@ -119,18 +119,16 @@
 Source: "python/*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
 
 ; Glom executables
-Source: "bin\libglom-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "bin\libglom-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "bin\Glom.exe"; DestDir: "{app}\bin"; Components: main
 
 ; Modules
 ;Source: "lib/gtk-2.0/2.10.0/immodules/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/immodules"; Components: gtk
 ;Source: "gtk-query-immodules-2.0.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
-Source: "etc/gtk-2.0/gdk-pixbuf.loaders"; DestDir: "{app}\etc\gtk-2.0"; Components: gtk;
 
 Source: "lib/gtk-2.0/2.10.0/engines/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/engines"; Components: gtk
 
-;Source: "lib/gtk-2.0/2.10.0/loaders/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/loaders"; Components: gtk
-;Source: "gdk-pixbuf-query-loaders.exe"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
+Source: "lib/gtk-2.0/2.10.0/loaders/*"; DestDir: "{app}/lib/gtk-2.0/2.10.0/loaders"; Components: gtk
 Source: "etc/gtk-2.0/gdk-pixbuf.loaders"; DestDir: "{app}\etc\gtk-2.0"; Components: gtk;
 
 ;Source: "lib/pango/1.6.0/modules/*"; DestDir: "{app}/lib/pango/1.6.0/modules"; Components: gtk;
@@ -148,9 +146,11 @@
 Source: "share/gtksourceview-2.0/styles/*"; DestDir: "{app}/share/gtksourceview-2.0/styles"; Components: main
 
 ; libgda
-Source: "share/libgda-3.0/*"; DestDir: "{app}/share/libgda-3.0"; Components: main
-Source: "share/libgda-3.0/dtd/*"; DestDir: "{app}/share/libgda-3.0/dtd"; Components: main
-Source: "lib/libgda-3.0/providers/*"; DestDir: "{app}/lib/libgda-3.0/providers"; Components: main
+Source: "share/libgda-4.0/*"; DestDir: "{app}/share/libgda-4.0"; Components: main
+Source: "share/libgda-4.0/dtd/*"; DestDir: "{app}/share/libgda-4.0/dtd"; Components: main
+; TODO: We only need postgresql and SQLite providers
+Source: "lib/libgda-4.0/providers/*"; DestDir: "{app}/lib/libgda-4.0/providers"; Components: main
+Source: "etc/libgda-4.0/config"; DestDir: "{app}/etc/libgda-4.0"; Components: main
 
 ; Icons
 Source: "share/icons/hicolor/48x48/apps/glom.png"; DestDir: "{app}/share/icons/hicolor/48x48/apps"; Components: main
@@ -161,6 +161,7 @@
 Source: "share/glom/glade/glom_developer.glade"; DestDir: "{app}/share/glom/glade"; Components: main
 Source: "share/glom/doc/*"; Destdir: "{app}/share/glom/doc/"; Components: main; Flags: recursesubdirs
 Source: "share/glom/pixmaps/*"; Destdir: "{app}/share/glom/pixmaps/"; Components: main; Flags: recursesubdirs
+Source: "share/glom/xslt/*"; DestDir: "{app}/share/glom/xslt/"; Components: main; Flags: recursesubdirs
 
 ;Source: "share/themes/MS-Windows/*"; DestDir: "{app}/share/themes/MS-Windows"; Flags: recursesubdirs; Components: gtk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]