--- misc/trunk/mac_package_builder/make-tar-file.sh	2019/03/09 21:49:29	3494
+++ misc/trunk/mac_package_builder/make-tar-file.sh	2019/03/10 07:38:26	3495
@@ -1,13 +1,12 @@
 #!/bin/sh -xe
 
 # This script is primarily made for the linuxsampler build server. It
-# copies the files created by the previous Max OS X build steps, and
-# creates universal binaries from the i686, x86_64 and powerpc
-# files. Then it packs all components as a .pkg Mac installer package and
-# finally it wraps everything in a tar.bz2 archive.
+# copies the files created by the previous Max OS X build steps. Then
+# it packs all components as a .pkg Mac installer package and finally
+# it wraps everything in a tar.bz2 archive.
 
 LIPO=x86_64-apple-darwin9-lipo
-P=/home/persson/mac
+P=/home/persson/mac64
 D=linuxsampler_`date +%Y%m%d`
 
 # command line tools shipped with libgig
@@ -15,8 +14,10 @@
 
 createuniv ()
 {
-    $LIPO -create "$P/x86_64/$1" "$P/i686/$1" "$P/powerpc/$1" \
-        -output "$D/${2-$1}"
+    # we no longer support i686 and powerpc
+    #    $LIPO -create "$P/x86_64/$1" "$P/i686/$1" "$P/powerpc/$1" \
+    #        -output "$D/${2-$1}"
+    cp -a "$P/$1" "$D/${2-$1}"
 }
 
 
@@ -32,8 +33,7 @@
 createuniv lib/libogg.0.dylib
 createuniv lib/libvorbis.0.dylib
 createuniv lib/libvorbisenc.2.dylib
-createuniv lib/libFLAC.8.2.0.dylib
-ln -s libFLAC.8.2.0.dylib "$D/lib/libFLAC.8.dylib"
+createuniv lib/libFLAC.8.dylib
 createuniv lib/libsndfile.1.dylib
 createuniv lib/libgig/libgig.8.dylib lib/libgig.8.dylib
 createuniv lib/linuxsampler/liblinuxsampler.5.dylib lib/liblinuxsampler.5.dylib
@@ -44,13 +44,13 @@
 
 # AU plugin
 
-cp -r "$P/i686/Components/LinuxSamplerAU.component" "$D"
+cp -r "$P/Components/LinuxSamplerAU.component" "$D"
 createuniv Components/LinuxSamplerAU.component/Contents/MacOS/LinuxSamplerAU LinuxSamplerAU.component/Contents/MacOS/LinuxSamplerAU
 
 
 # VST plugin
 
-cp -r "$P/i686/VST/LinuxSampler.vst" "$D"
+cp -r "$P/VST/LinuxSampler.vst" "$D"
 createuniv VST/LinuxSampler.vst/Contents/MacOS/LinuxSampler LinuxSampler.vst/Contents/MacOS/LinuxSampler
 
 
@@ -64,7 +64,7 @@
 
 # Fantasia
 
-cp -r "$P/Fantasia.app" "$D/LinuxSampler"
+cp -r "/home/persson/mac/Fantasia.app" "$D/LinuxSampler"
 
 
 # QSampler
@@ -78,13 +78,13 @@
 # no powerpc build of gigedit
 createuniv ()
 {
-    $LIPO -create "$P/x86_64/$1" "$P/i686/$1" \
-        -output "$D/${2-$1}"
+    #$LIPO -create "$P/x86_64/$1" "$P/i686/$1" \
+        #    -output "$D/${2-$1}"
+    cp -a "$P/$1" "$D/${2-$1}"
 }
 
 mkdir -p "$D/LinuxSampler/gigedit.app/Contents/MacOS" \
     "$D/lib/gdk-pixbuf-2.0/2.10.0/loaders" \
-    "$D/lib/pango/1.8.0/modules" \
     "$D/share/locale/sv/LC_MESSAGES" \
     "$D/share/locale/de/LC_MESSAGES" \
     "$D/lib/linuxsampler/plugins"
@@ -94,30 +94,78 @@
 createuniv lib/linuxsampler/plugins/libgigeditlinuxsamplerplugin.so
 
 for x in libatk-1.0.0.dylib libatkmm-1.6.1.dylib libcairo.2.dylib \
-    libcairomm-1.0.1.dylib libffi.6.dylib libfontconfig.1.dylib \
-    libfreetype.6.dylib libgailutil.18.dylib libgdkmm-2.4.1.dylib \
-    libgdk_pixbuf-2.0.0.dylib libgdk-quartz-2.0.0.dylib libgio-2.0.0.dylib \
+    libcairo-gobject.2.dylib \
+    libcairomm-1.0.1.dylib libepoxy.0.dylib libffi.6.dylib libfontconfig.1.dylib \
+    libfreetype.6.dylib libgailutil-3.0.dylib libgdk-3.0.dylib libgdkmm-3.0.1.dylib \
+    libgdk_pixbuf-2.0.0.dylib libgio-2.0.0.dylib \
     libgiomm-2.4.1.dylib libglib-2.0.0.dylib libglibmm-2.4.1.dylib \
     libgmodule-2.0.0.dylib libgobject-2.0.0.dylib libgthread-2.0.0.dylib \
-    libgtkmm-2.4.1.dylib libgtk-quartz-2.0.0.dylib libintl.8.dylib \
-    libjpeg.8.dylib libpango-1.0.0.dylib libpangocairo-1.0.0.dylib \
-    libpangomm-1.4.1.dylib libpixman-1.0.dylib libpng15.15.dylib \
-    libsigc-2.0.0.dylib libtiff.3.dylib \
+    libgtk-3.0.dylib libgtkmm-3.0.1.dylib libintl.9.dylib \
+    libpango-1.0.0.dylib libpangocairo-1.0.0.dylib \
+    libpangomm-1.4.1.dylib libpixman-1.0.dylib libpng16.16.dylib \
+    libsigc-2.0.0.dylib \
     gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so \
-    pango/1.8.0/modules/pango-basic-coretext.so
+    gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so \
+    libharfbuzz.0.dylib libpangoft2-1.0.0.dylib libfribidi.0.dylib
 do
-    $LIPO -create "/home/persson/macgtk64/lib/$x" \
-        "/home/persson/macgtk32/lib/$x" \
-        -output "$D/lib/$x"
+        #$LIPO -create "/home/persson/macgtk64/lib/$x" \
+        #"/home/persson/macgtk32/lib/$x" \
+        #-output "$D/lib/$x"
+    cp -a "$P/lib/$x" "$D/lib/$x"
 done
 
 cp PkgInfo Info.plist "$D/LinuxSampler/gigedit.app/Contents"
-cp pango.modules "$D/lib/pango/pango.modules"
 cp loaders.cache "$D/lib/gdk-pixbuf-2.0/2.10.0"
-cp $P/x86_64/share/locale/de/LC_MESSAGES/gigedit.mo "$D/share/locale/de/LC_MESSAGES"
-cp $P/x86_64/share/locale/sv/LC_MESSAGES/gigedit.mo "$D/share/locale/sv/LC_MESSAGES"
-cp /home/persson/macgtk64/share/locale/de/LC_MESSAGES/gtk20.mo "$D/share/locale/de/LC_MESSAGES"
-cp /home/persson/macgtk64/share/locale/sv/LC_MESSAGES/gtk20.mo "$D/share/locale/sv/LC_MESSAGES"
+cp $P/share/locale/de/LC_MESSAGES/gigedit.mo "$D/share/locale/de/LC_MESSAGES"
+cp $P/share/locale/sv/LC_MESSAGES/gigedit.mo "$D/share/locale/sv/LC_MESSAGES"
+cp $P/share/locale/de/LC_MESSAGES/gtk30.mo "$D/share/locale/de/LC_MESSAGES"
+cp $P/share/locale/sv/LC_MESSAGES/gtk30.mo "$D/share/locale/sv/LC_MESSAGES"
+cd $D
+(cd $P ; \
+ tar cf - \
+     share/glib-2.0/schemas/gschemas.compiled \
+     share/icons/Adwaita/index.theme \
+     share/icons/Adwaita/16x16/actions/application-exit.png \
+     share/icons/Adwaita/16x16/actions/bookmark-new-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/document-new.png \
+     share/icons/Adwaita/16x16/actions/document-open.png \
+     share/icons/Adwaita/16x16/actions/document-open-recent-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/document-properties.png \
+     share/icons/Adwaita/16x16/actions/document-save-as.png \
+     share/icons/Adwaita/16x16/actions/document-save.png \
+     share/icons/Adwaita/16x16/actions/edit-clear-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/edit-copy.png \
+     share/icons/Adwaita/16x16/actions/edit-delete.png \
+     share/icons/Adwaita/16x16/actions/edit-find-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/go-down.png \
+     share/icons/Adwaita/16x16/actions/go-up.png \
+     share/icons/Adwaita/16x16/actions/help-about.png \
+     share/icons/Adwaita/16x16/actions/list-add.png \
+     share/icons/Adwaita/16x16/actions/list-add-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/list-remove.png \
+     share/icons/Adwaita/16x16/actions/list-remove-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/media-eject-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/pan-down-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/pan-end-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/pan-start-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/pan-up-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/actions/window-close.png \
+     share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/mimetypes/inode-directory-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/mimetypes/text-x-generic.png \
+     share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/folder-download-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/folder-music-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/folder-pictures-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/folder-videos-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/user-desktop.png \
+     share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png \
+     share/icons/Adwaita/16x16/status/image-missing.png \
+     share/icons/Adwaita/32x32/devices/drive-harddisk.png \
+     share/icons/hicolor/index.theme) | tar xf -
+cd ..
 
 
 # generate OS X .pkg package / installer ...
@@ -155,7 +203,7 @@
 dlib="components/$component.pkg/share/man/man1"
 mkdir -p $dlib
 for f in $gigtools_bins; do
-    cp $P/i686/share/man/man1/$f.1 $dlib
+    cp $P/share/man/man1/$f.1 $dlib
 done
 
 component="libgigedit"
@@ -178,14 +226,14 @@
 mkdir -p $dlib
 (
     cd $D/lib/
-    for f in `ls -d gdk* gtk* pango libatk* libcairo* libffi* libfont* libfreetype* libgailutil* libgdk* libgio* libglib* libgmodule* libgobject* libgthread* libgtk* libintl* libjpeg* libpango* libpixman* libpng* libsigc* libtiff*`; do
+    for f in `ls -d gdk* libatk* libcairo* libepoxy* libffi* libfont* libfreetype* libfribidi* libgailutil* libgdk* libgio* libglib* libgmodule* libgobject* libgthread* libgtk* libharfbuzz* libintl* libpango* libpixman* libpng* libsigc*`; do
         cp -r --parents $f $dlib
     done
 )
 dlib="$PWD/components/$component.pkg"
 (
     cd $D
-    cp --parents share/locale/*/LC_MESSAGES/gtk20.mo $dlib
+    cp -r --parents share/locale/*/LC_MESSAGES/gtk30.mo share/glib-2.0 share/icons $dlib
 )
 
 component="liblinuxsampler"