gedit r6686 - in branches/win32: . win32

[icq svn gnome org]

Author: icq
Date: Mon Dec 22 16:06:13 2008
New Revision: 6686
URL: http://svn.gnome.org/viewvc/gedit?rev=6686&view=rev

Log:
2008-12-22  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * win32/build-installer:
        * win32/gedit.iss.in:
        Fix a few paths and comment python files for now.



Modified:
   branches/win32/ChangeLog
   branches/win32/win32/build-installer
   branches/win32/win32/gedit.iss.in

Modified: branches/win32/win32/build-installer
==============================================================================
--- branches/win32/win32/build-installer	(original)
+++ branches/win32/win32/build-installer	Mon Dec 22 16:06:13 2008
@@ -29,30 +29,30 @@
 # TODO: There are no usable libxslt Windows binaries, therefore I built this myself:
 #cp /local/bin/libxslt-1.dll installer/bin || exit
 
-cp /bundle/bin/libglib-2.0-0.dll installer/bin || exit
-cp /bundle/bin/libgio-2.0-0.dll installer/bin || exit
-cp /bundle/bin/libgmodule-2.0-0.dll installer/bin || exit
-cp /bundle/bin/libgobject-2.0-0.dll installer/bin || exit
-cp /bundle/bin/libgthread-2.0-0.dll installer/bin || exit
+cp /bin/libglib-2.0-0.dll installer/bin || exit
+cp /bin/libgio-2.0-0.dll installer/bin || exit
+cp /bin/libgmodule-2.0-0.dll installer/bin || exit
+cp /bin/libgobject-2.0-0.dll installer/bin || exit
+cp /bin/libgthread-2.0-0.dll installer/bin || exit
 
 # TODO: We can probably omit these, as we do not use g_spawn on Windows anymore
-cp /bundle/bin/gspawn-win32-helper.exe installer/bin || exit
-cp /bundle/bin/gspawn-win32-helper-console.exe installer/bin || exit
+cp /bin/gspawn-win32-helper.exe installer/bin || exit
+cp /bin/gspawn-win32-helper-console.exe installer/bin || exit
 
-cp /bundle/bin/libatk-1.0-0.dll installer/bin || exit
-cp /bundle/bin/libcairo-2.dll installer/bin || exit
-cp /bundle/bin/libpng12-0.dll installer/bin || exit
-cp /bundle/bin/jpeg62.dll installer/bin || exit
-cp /bundle/bin/libtiff3.dll installer/bin || exit
-
-cp /bundle/bin/libpango-1.0-0.dll installer/bin || exit
-cp /bundle/bin/libpangocairo-1.0-0.dll installer/bin || exit
-cp /bundle/bin/libpangowin32-1.0-0.dll installer/bin || exit
+cp /bin/libatk-1.0-0.dll installer/bin || exit
+cp /bin/libcairo-2.dll installer/bin || exit
+cp /bin/libpng12-0.dll installer/bin || exit
+cp /bin/jpeg62.dll installer/bin || exit
+cp /bin/libtiff3.dll installer/bin || exit
+
+cp /bin/libpango-1.0-0.dll installer/bin || exit
+cp /bin/libpangocairo-1.0-0.dll installer/bin || exit
+cp /bin/libpangowin32-1.0-0.dll installer/bin || exit
 
-cp /bundle/bin/libgdk-win32-2.0-0.dll installer/bin || exit
-cp /bundle/bin/libgdk_pixbuf-2.0-0.dll installer/bin || exit
+cp /bin/libgdk-win32-2.0-0.dll installer/bin || exit
+cp /bin/libgdk_pixbuf-2.0-0.dll installer/bin || exit
 
-cp /bundle/bin/libgtk-win32-2.0-0.dll installer/bin || exit
+cp /bin/libgtk-win32-2.0-0.dll installer/bin || exit
 cp /gtksourceview/bin/libgtksourceview-2.0-0.dll installer/bin || exit
 
 cp /bin/libORBit-2-0.dll installer/bin || exit
@@ -68,50 +68,51 @@
 # stripping libxml2.dll renders it unusable (although not changing it in size).
 # We therefore copy it after having stripped the rest. Same with the other DLLs
 # here. Perhaps those were built with MSVC.
-cp /bundle/bin/libxml2.dll installer/bin || exit
-cp /bundle/bin/intl.dll installer/bin || exit
-cp /bundle/bin/iconv.dll installer/bin || exit
-cp /bundle/bin/zlib1.dll installer/bin || exit
+cp /bin/libxml2.dll installer/bin || exit
+cp /bin/intl.dll installer/bin || exit
+cp /bin/iconv.dll installer/bin || exit
+cp /bin/zlib1.dll installer/bin || exit
 
+#FIXME: We have to build with Python
 echo "Copying Python..."
 
 # TODO: Find out Windows directory somehow, perhaps by looking at PATH?
-cp /c/WINDOWS/system32/python25.dll installer/bin || exit
+#cp /c/WINDOWS/system32/python25.dll installer/bin || exit
 
 # We through all python modules into python/. Glom sets PYTHONPATH accordingly.
-mkdir -p installer/python || exit
+#mkdir -p installer/python || exit
 
 # TODO: Perhaps some scripts need more python modules.
-cp $PYTHONDIR/Lib/*.py installer/python || exit
+#cp $PYTHONDIR/Lib/*.py installer/python || exit
 
-mkdir -p installer/python/encodings || exit
-cp $PYTHONDIR/Lib/encodings/*.py installer/python/encodings || exit
+#mkdir -p installer/python/encodings || exit
+#cp $PYTHONDIR/Lib/encodings/*.py installer/python/encodings || exit
 
-cp $PYTHONDIR/Lib/site-packages/glom.pyd installer/python || exit
-strip installer/python/glom.pyd || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/python || exit
-strip installer/python/gda.pyd || exit
-
-cp $PYTHONDIR/Lib/site-packages/pygtk.py installer/python || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/*.pyd installer/python || exit
-
-mkdir -p installer/python/gobject || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gobject/*.py installer/python/gobject || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gobject/*.pyd installer/python/gobject || exit
-
-mkdir -p installer/python/cairo || exit
-cp $PYTHONDIR/Lib/site-packages/cairo/*.py installer/python/cairo || exit
-cp $PYTHONDIR/Lib/site-packages/cairo/*.pyd installer/python/cairo || exit
-
-mkdir -p installer/python/gtk || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.py installer/python/gtk || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.pyd installer/python/gtk || exit
+#cp $PYTHONDIR/Lib/site-packages/glom.pyd installer/python || exit
+#strip installer/python/glom.pyd || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/python || exit
+#strip installer/python/gda.pyd || exit
+
+#cp $PYTHONDIR/Lib/site-packages/pygtk.py installer/python || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/*.pyd installer/python || exit
+
+#mkdir -p installer/python/gobject || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gobject/*.py installer/python/gobject || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gobject/*.pyd installer/python/gobject || exit
+
+#mkdir -p installer/python/cairo || exit
+#cp $PYTHONDIR/Lib/site-packages/cairo/*.py installer/python/cairo || exit
+#cp $PYTHONDIR/Lib/site-packages/cairo/*.pyd installer/python/cairo || exit
+
+#mkdir -p installer/python/gtk || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.py installer/python/gtk || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gtk/*.pyd installer/python/gtk || exit
 
 echo "Copying modules..."
 
-cp $PYTHONDIR/Lib/site-packages/glom.pyd installer/bin || exit
-cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/bin || exit
-strip installer/bin/*.pyd || exit
+#cp $PYTHONDIR/Lib/site-packages/glom.pyd installer/bin || exit
+#cp $PYTHONDIR/Lib/site-packages/gtk-2.0/gda.pyd installer/bin || exit
+#strip installer/bin/*.pyd || exit
 
 #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
@@ -119,7 +120,7 @@
 #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
+cp /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
@@ -129,11 +130,11 @@
 
 # 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
+cp /etc/gtk-2.0/gtk.immodules installer/etc/gtk-2.0 || exit -1
+cp /etc/gtk-2.0/gdk-pixbuf.loaders installer/etc/gtk-2.0 || exit -1
 
 mkdir -p installer/share/themes || exit
-cp -R /bundle/share/themes/MS-Windows installer/share/themes || exit
+cp -R /share/themes/MS-Windows installer/share/themes || exit
 mkdir -p installer/etc/gtk-2.0 || exit
 echo "gtk-theme-name = \"MS-Windows\"" > installer/etc/gtk-2.0/gtkrc || exit
 
@@ -141,16 +142,12 @@
 
 # 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 /local/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
 
-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 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 gedit.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 GConf2.mo | grep -v glib20.mo | grep -v gedit.mo | grep -v gtk20.mo | grep -v gtk20-properties.mo | grep -v gtksourceview-2.0.mo | xargs rm
 find installer/share/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty
 
 echo "Copying executable..."
@@ -161,8 +158,8 @@
 echo "Copying shared data (ui files, icons, etc.)..."
 
 mkdir -p installer/share/gtksourceview-2.0 || exit
-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
+cp -R /local/share/gtksourceview-2.0/language-specs installer/share/gtksourceview-2.0 || exit
+cp -R /local/share/gtksourceview-2.0/styles installer/share/gtksourceview-2.0 || exit
 
 #GtkBuilder files and xml files
 mkdir -p installer/share/gedit-2/ui || exit
@@ -182,14 +179,14 @@
 mkdir -p installer/share/gedit-2/plugins || exit
 cp -R /local/share/gedit-2/plugins/* installer/share/gedit-2/plugins || exit
 
-mkdir -p installer/share/icons/hicolor/48x48/apps || exit
-cp /local/share/icons/hicolor/48x48/apps/gedit.png installer/share/icons/hicolor/48x48/apps || exit
+#mkdir -p installer/share/icons/hicolor/48x48/apps || exit
+#cp /local/share/icons/hicolor/48x48/apps/gedit.png installer/share/icons/hicolor/48x48/apps || exit
 
 # 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:
-mkdir -p installer/share/pixmaps
-cp /local/share/icons/hicolor/16x16/apps/gedit.png installer/share/pixmaps || exit
+#mkdir -p installer/share/pixmaps
+#cp /local/share/icons/hicolor/16x16/apps/gedit.png installer/share/pixmaps || exit
 
 echo "Creating installer..."
 

Modified: branches/win32/win32/gedit.iss.in
==============================================================================
--- branches/win32/win32/gedit.iss.in	(original)
+++ branches/win32/win32/gedit.iss.in	Mon Dec 22 16:06:13 2008
@@ -41,7 +41,7 @@
 Source: "bin\jpeg62.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libtiff3.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libxml2.dll"; DestDir: "{app}\bin"; Components: gtk
-Source: "bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: gtk
+;Source: "bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libglib-2.0-0.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libgobject-2.0-0.dll"; DestDir: "{app}\bin"; Components: gtk
 Source: "bin\libgio-2.0-0.dll"; DestDir: "{app}\bin"; Components: gtk
@@ -67,14 +67,14 @@
 Source: "bin\libgtksourceview-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
 
 ; Python modules
-Source: "bin\python25.dll"; DestDir: "{app}\bin"; Components: python
+;Source: "bin\python25.dll"; DestDir: "{app}\bin"; Components: python
 ; TODO: I would like to install these into python/ instead of /bin, but I
 ; could not get python to locate them there (setting PYTHONPATH with setenv()
 ; in Glom's main() does not work).
 ; TODO: Change component of gda.pyd and glom.pyd to main instead of python
 ; since we also need these when the user installed python and pygtk on its own.
-Source: "python/*.py"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
-Source: "python/*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
+;Source: "python/*.py"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
+;Source: "python/*.pyd"; DestDir: "{app}\bin"; Components: python; Flags: recursesubdirs
 
 ; gedit executables
 Source: "bin\gedit.exe"; DestDir: "{app}\bin"; Components: main
@@ -97,29 +97,23 @@
 Source: "etc/gtk-2.0/gtkrc"; DestDir: "{app}/etc/gtk-2.0"; Components: gtk
 ;Source: "querymodules.bat"; DestDir: "{app}\bin"; Components: gtk; Flags: deleteafterinstall;
 
-;Source: "lib/gnome-vfs-2.0/modules/*.dll"; DestDir: "{app}/lib/gnome-vfs-2.0/modules"; Components: main;
-;Source: "etc/gnome-vfs-2.0/modules/default-modules.conf"; DestDir: "{app}/etc/gnome-vfs-2.0/modules"; Components: main;
-
 ; GtkSourceView
 Source: "share/gtksourceview-2.0/language-specs/*"; DestDir: "{app}/share/gtksourceview-2.0/language-specs"; Components: main
 Source: "share/gtksourceview-2.0/styles/*"; DestDir: "{app}/share/gtksourceview-2.0/styles"; Components: main
 
 ; Icons
-Source: "share/icons/hicolor/48x48/apps/gedit.png"; DestDir: "{app}/share/icons/hicolor/48x48/apps"; Components: main
-Source: "share/pixmaps/gedit.png"; DestDir: "{app}/share/pixmaps"; Components: main
+;Source: "share/icons/hicolor/48x48/apps/gedit.png"; DestDir: "{app}/share/icons/hicolor/48x48/apps"; Components: main
+;Source: "share/pixmaps/gedit.png"; DestDir: "{app}/share/pixmaps"; Components: main
 
 ; Other shared gedit files
 Source: "share/gedit-2/ui/*"; DestDir: "{app}/share/gedit-2/ui"; Components: main
 Source: "share/gedit-2/icons/gedit-plugin.png"; DestDir: "{app}/share/gedit-2/icons"; Components: main
 Source: "share/gedit-2/taglist/*"; DestDir: "{app}/share/gedit-2/taglist"; Components: main; Flags: recursesubdirs
 Source: "share/gedit-2/plugins/*"; DestDir: "{app}/share/gedit-2/plugins"; Components: main; Flags: recursesubdirs
-;Source: "share/glom/doc/*"; Destdir: "{app}/share/glom/doc/"; Components: main; Flags: recursesubdirs
 Source: "share/gedit-2/logo/gedit-logo.png"; Destdir: "{app}/share/gedit-2/logo/"; Components: main; Flags: recursesubdirs
 
-;Source: "share/themes/MS-Windows/*"; DestDir: "{app}/share/themes/MS-Windows"; Flags: recursesubdirs; Components: gtk
-
 ; Locales
-Source: "lib\locale\*"; DestDir: "{app}\lib\locale\"; Flags: recursesubdirs; Components: locale
+;Source: "lib\locale\*"; DestDir: "{app}\lib\locale\"; Flags: recursesubdirs; Components: locale
 Source: "share\locale\*"; DestDir: "{app}\share\locale\"; Flags: recursesubdirs; Components: locale
 
 ; Register .glom file type if we install for all users. Is there a possibility