X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib-zip.in;h=40d3c6722defa52ac0d0e67c6aa4df1769660e4a;hb=9da85c7262325478e8730ae9f3e76bd0528a9a8c;hp=dd6c6602cf1ac70d00383be708dd91d365eaba24;hpb=553b3b613b783bd2b66cec9ff8896f6730e2ab90;p=platform%2Fupstream%2Fglib.git

diff --git a/glib-zip.in b/glib-zip.in
index dd6c660..40d3c67 100755
--- a/glib-zip.in
+++ b/glib-zip.in
@@ -14,53 +14,44 @@ cp -p @abs_srcdir@/COPYING share/doc/glib-@GLIB_VERSION@
 mkdir -p share/doc/glib-dev-@GLIB_VERSION@
 cp -p @abs_srcdir@/COPYING share/doc/glib-dev-@GLIB_VERSION@
 
+if test @LIB_EXE_MACHINE_FLAG@ = X64; then
+  helperbits=64
+else
+  helperbits=32
+fi
+
 rm $ZIP
 zip $ZIP -@ <<EOF
-bin/gspawn-win32-helper.exe
-bin/gspawn-win32-helper-console.exe
-bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/gspawn-win${helperbits}-helper.exe
+bin/gspawn-win${helperbits}-helper-console.exe
 bin/libgio-2.0-@LT_CURRENT_MINUS_AGE@.dll
+bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
 bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
-if [ -f lib/locale/de/LC_MESSAGES/glib20.mo -a -f share/locale/de/LC_MESSAGES/glib20.mo ]; then
-  if [ lib/locale/de/LC_MESSAGES/glib20.mo -nt share/locale/de/LC_MESSAGES/glib20.mo ]; then
-    zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
-  else
-    zip -r $ZIP share/locale/*/LC_MESSAGES/glib20.mo
-  fi
-elif [ -f lib/locale/de/LC_MESSAGES/glib20.mo ]; then
-  zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo
-else
-  zip -r $ZIP share/locale/*/LC_MESSAGES/glib20.mo
-fi
+zip $ZIP share/locale/*/LC_MESSAGES/glib20.mo
 
-zip -r $ZIP share/doc/glib-@GLIB_VERSION@
+zip -r -D $ZIP share/doc/glib-@GLIB_VERSION@
 
 rm $DEVZIP
-zip -r $DEVZIP -@ <<EOF
+zip -r -D $DEVZIP -@ <<EOF
+bin/gdbus.exe
+bin/gdbus-codegen
+bin/gio-querymodules.exe
+bin/glib-compile-schemas.exe
 bin/glib-genmarshal.exe
 bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query.exe
+bin/gsettings.exe
+etc/bash_completion.d/gdbus-bash-completion.sh
+etc/bash_completion.d/gsettings-bash-completion.sh
+include/gio-win32-2.0
 include/glib-2.0
-lib/libglib-2.0.dll.a
-lib/glib-2.0.lib
-lib/glib-2.0.def
-lib/libgmodule-2.0.dll.a
-lib/gmodule-2.0.lib
-lib/gmodule-2.0.def
-lib/libgobject-2.0.dll.a
-lib/gobject-2.0.lib
-lib/gobject-2.0.def
-lib/libgthread-2.0.dll.a
-lib/gthread-2.0.lib
-lib/gthread-2.0.def
-lib/libgio-2.0.dll.a
-lib/gio-2.0.lib
-lib/gio-2.0.def
+lib/gdbus-2.0
+lib/gio
 lib/glib-2.0
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
@@ -68,13 +59,36 @@ lib/pkgconfig/gmodule-no-export-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
 lib/pkgconfig/gthread-2.0.pc
 lib/pkgconfig/gio-2.0.pc
+lib/pkgconfig/gio-windows-2.0.pc
+lib/gio-2.0.def
+lib/gio-2.0.lib
+lib/glib-2.0.def
+lib/glib-2.0.lib
+lib/gmodule-2.0.def
+lib/gmodule-2.0.lib
+lib/gobject-2.0.def
+lib/gobject-2.0.lib
+lib/gthread-2.0.def
+lib/gthread-2.0.lib
+lib/libgio-2.0.dll.a
+lib/libglib-2.0.dll.a
+lib/libgmodule-2.0.dll.a
+lib/libgobject-2.0.dll.a
+lib/libgthread-2.0.dll.a
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
+share/aclocal/gsettings.m4
 share/glib-2.0
-share/gtk-doc/html/glib
-share/gtk-doc/html/gobject
-man/man1/glib-mkenums.1
-man/man1/glib-genmarshal.1
+share/gtk-doc/html
+share/man/man1/gdbus.1
+share/man/man1/gdbus-codegen.1
+share/man/man1/gio-querymodules.1
+share/man/man1/glib-compile-schemas.1
+share/man/man1/glib-genmarshal.1
+share/man/man1/glib-gettextize.1
+share/man/man1/glib-mkenums.1
+share/man/man1/gobject-query.1
+share/man/man1/gsettings.1
 EOF
 
 zip -r $DEVZIP share/doc/glib-dev-@GLIB_VERSION@