X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk-zip.sh.in;h=63fec3fd21aca7d3f728a7bc2a7bf9751b9a7c4d;hb=d72d19d247965fb5561c1d1ce35533102461a67d;hp=8cd89a90f233ebfb471ce42b426e496f288aa3f4;hpb=10825b14b8964337f84769f10d799a281666e4c1;p=~andy%2Fgtk

diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
index 8cd89a90f..63fec3fd2 100755
--- a/gtk-zip.sh.in
+++ b/gtk-zip.sh.in
@@ -4,6 +4,10 @@
 
 ZIP=/tmp/gtk+-@GTK_VERSION@.zip
 DEVZIP=/tmp/gtk+-dev-@GTK_VERSION@.zip
+
+SHORTAPIVERSION=`echo @GTK_API_VERSION@ | tr -d '.'`
+APIVERSIONMAJOR=`echo @GTK_API_VERSION@ | sed -e 's/\..*//'`
+
 cd @prefix@
 
 mkdir -p share/doc/gtk+-@GTK_VERSION@
@@ -14,64 +18,47 @@ cp -p @abs_srcdir@/COPYING share/doc/gtk+-dev-@GTK_VERSION@
 
 rm $ZIP
 zip $ZIP -@ <<EOF
-etc/gtk-2.0/gdk-pixbuf.loaders
-etc/gtk-2.0/gtkrc
-etc/gtk-2.0/gtk.immodules
-bin/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+etc/gtk-@GTK_API_VERSION@/gtkrc
+etc/gtk-@GTK_API_VERSION@/im-multipress.conf
 bin/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-bin/gdk-pixbuf-query-loaders.exe
-bin/gtk-query-immodules-2.0.exe
+bin/libgailutil-@GTK_API_VERSION@-@GAIL_LT_CURRENT_MINUS_AGE@.dll
+bin/gtk-query-immodules-@GTK_API_VERSION@.exe
+lib/gtk-@GTK_API_VERSION@/3.0.0/loaders.cache
+lib/gtk-@GTK_API_VERSION@/3.0.0/immodules.cache
 EOF
 
-zip $ZIP lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/engines/*.dll
+zip $ZIP lib/gtk-@GTK_API_VERSION@/modules/libgail.dll lib/gtk-@GTK_API_VERSION@/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-@GTK_API_VERSION@/@GTK_BINARY_VERSION@/immodules/*.dll lib/gtk-@GTK_API_VERSION@/@GTK_BINARY_VERSION@/engines/*.dll
 
-zip $ZIP share/themes/Raleigh/gtk-2.0/gtkrc
-zip $ZIP share/themes/Default/gtk-2.0-key/gtkrc
-zip $ZIP share/themes/Emacs/gtk-2.0-key/gtkrc
-zip $ZIP share/themes/MS-Windows/gtk-2.0/gtkrc
+zip $ZIP share/themes/Raleigh/gtk-@GTK_API_VERSION@/gtkrc
+zip $ZIP share/themes/Default/gtk-@GTK_API_VERSION@-key/gtkrc
+zip $ZIP share/themes/Emacs/gtk-@GTK_API_VERSION@-key/gtkrc
+zip $ZIP share/themes/MS-Windows/gtk-@GTK_API_VERSION@/gtkrc
 
-if [ -f lib/locale/de/LC_MESSAGES/gtk20.mo -a -f share/locale/de/LC_MESSAGES/gtk20.mo ]; then
-  if [ lib/locale/de/LC_MESSAGES/gtk20.mo -nt share/locale/de/LC_MESSAGES/gtk20.mo ]; then
-    zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
-    zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo
-  else
-    zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20.mo
-    zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20-properties.mo
-  fi
-elif [ -f lib/locale/de/LC_MESSAGES/gtk20.mo ]; then
-  zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo
-  zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20-properties.mo
-else
-  zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20.mo
-  zip -r $ZIP share/locale/*/LC_MESSAGES/gtk20-properties.mo
-fi
+zip $ZIP share/locale/*/LC_MESSAGES/gtk${SHORTAPIVERSION}.mo
+zip $ZIP share/locale/*/LC_MESSAGES/gtk${SHORTAPIVERSION}-properties.mo
 
-zip -r $ZIP share/doc/gtk+-@GTK_VERSION@
+zip -r -D $ZIP share/doc/gtk+-@GTK_VERSION@
 
 rm $DEVZIP
-zip -r $DEVZIP -@ <<EOF
-include/gtk-2.0
-bin/gdk-pixbuf-csource.exe
-bin/gtk-demo.exe
-man/man1/gdk-pixbuf-csource.1
-lib/libgdk_pixbuf-@GTK_API_VERSION@.dll.a
-lib/gdk_pixbuf-@GTK_API_VERSION@.lib
+zip -r -D $DEVZIP -@ <<EOF
+include/gtk-@GTK_API_VERSION@
+include/gail-1.0
+bin/gtk-builder-convert
+bin/gtk${APIVERSIONMAJOR}-demo.exe
+bin/gtk-update-icon-cache.exe
+share/man
 lib/libgdk-win32-@GTK_API_VERSION@.dll.a
 lib/gdk-win32-@GTK_API_VERSION@.lib
 lib/libgtk-win32-@GTK_API_VERSION@.dll.a
 lib/gtk-win32-@GTK_API_VERSION@.lib
-lib/gtk-2.0/include
-lib/pkgconfig/gdk-pixbuf-2.0.pc
-lib/pkgconfig/gdk-2.0.pc
-lib/pkgconfig/gdk-win32-2.0.pc
-lib/pkgconfig/gtk+-2.0.pc
-lib/pkgconfig/gtk+-win32-2.0.pc
-share/aclocal/gtk-2.0.m4
-share/gtk-2.0
-share/gtk-doc/html/gdk-pixbuf
-share/gtk-doc/html/gdk
-share/gtk-doc/html/gtk
+lib/libgailutil.dll.a
+lib/gailutil.lib
+lib/gtk-@GTK_API_VERSION@/include
+lib/pkgconfig
+share/aclocal
+share/gtk-@GTK_API_VERSION@
+share/gtk-doc
 EOF
 
 zip -r $DEVZIP share/doc/gtk+-dev-@GTK_VERSION@