Changeset 885

Timestamp:

07/11/07 09:14:47 (1 year ago)

Author:

ok_computer

Message:

OS X: Adding more flexibility to app creation script.

Location:

trunk/installer/osx

Files:

• create_app (modified) (7 diffs)
• create_dmg (modified) (1 diff)
• fixup_install_names (modified) (2 diffs)

trunk/installer/osx/create_app

@@ -18 +18 @@
 #
 # dylibs="space separated list of dylibs"
+# frameworks="space separated list of frameworks"
 # theme_dylibs="space separated list of theme dylibs"
+# olib_names="space separated list of olib directories to copy e.g. openpluginlib etc
+# open*lib_plugins="space separated list of openimagelib, etc plugins"
+# python_modules="space separated list of python modules to copy"
+#
+# For all above an empty string means use the default list. Or "_NONE_" means copy none.
 
 if [ $# -lt 2 ] ; then
-   echo "Usage: create_app --prefer-ppc --gpl --py_ver=<python_ver> --jahwidgets_dir=<jahwidgets> --olib_prefix=<olib_prefix> --olib_ver=<olib_ver> --lib_prefix=<lib_prefix> --qt_prefix=<qt_prefix> script --theme=<theme.dylib> --bundle_version=bundle_ver"
+   echo "Usage: create_app --prefer-ppc --gpl --py_ver=<python_ver> --jahwidgets_dir=<jahwidgets> --olib_prefix=<olib_prefix> --olib_ver=<olib_ver> --olib_names=<openlibnamelist> --lib_prefix=<lib_prefix> --qt_prefix=<qt_prefix> script --theme=<theme.dylib> --bundle_version=bundle_ver"
    echo
    echo "By default create_app will read from a config file, either ca_config in pwd or .ca_config in ~"
@@ -32 +38 @@
 script_root=${0%/*}
 
+# defaults - all can be overridden in ca_config
 enable_gpl=0
+
+dylibs=""
+frameworks=""
+theme_dylibs=""
+
+# olib lib names to copy e.g. openpluginlib etc
+# default is all
+olib_names=""
+python_modules=""
+
+# plugins to copy. Default is all
+openassetlib_plugins=""
+openeffectslib_plugins=""
+openimagelib_plugins=""
+openmedialib_plugins=""
+openobjectlib_plugins=""
 
 # Get config
@@ -60 +83 @@
         ;;
 
+    --olib_names*)
+        olib_names=${1##*=}
+        ;;
+
     --lib_prefix*)
         lib_prefix=${1##*=}
@@ -158 +185 @@
 
 # We have to exclude all our own python modules because py2app can't handle them
-python setup.py py2app $prefer_ppc --excludes openpluginlib,openmedialib,openassetlib,openimagelib,jahwidgets
+python setup.py py2app $prefer_ppc --excludes openpluginlib,openmedialib,openassetlib,openimagelib,jahwidgets,$excludes
 
 bundle="$py_script_root/dist/$app_name.app"
@@ -214 +241 @@
 
 for dylib in $dylibs ; do
-    echo "cp $dylib"
-    # Don't use cp -R here because we want to copy the target, not the symlink
-    cp "$dylib" "$bundle/Contents/Frameworks"
+    if [ -e $dylib ] ; then
+        echo "cp $dylib"
+        # Don't use cp -R here because we want to copy the target, not the symlink
+        cp "$dylib" "$bundle/Contents/Frameworks"
+    else
+        echo "Unable to find dylib: $dylib"
+        exit 1
+    fi
 done
+
+# Frameworks
+if [ "$frameworks" == "" ] ; then
+    # default set
+    frameworks="Cg"
+fi
+
+if [ "$frameworks" != "_NONE_" ] ; then
+    for name in $frameworks ; do
+        framework="/Library/Frameworks/${name}.framework"
+        if [ -d $framework ] ; then
+            cp -R $framework "$bundle/Contents/Frameworks/"
+            dep_dylibs="$dep_dylibs "`$fixup_install_names_cmd "$bundle/Contents/Frameworks/${name}.framework/$name"`
+        else
+            echo "Unable to find framework: $name"
+            exit 1
+        fi
+    done
+fi
 
 # Olibs - drop the 'openlibraries-X.X.X' prefix in the destination so scripts don't need to worry about it
 echo "cp $olib_src_path"
-cp -R "$olib_src_path"/open* "$bundle/Contents/Frameworks/"
+if [ "$olib_names" != "" ] ; then
+    # Custom list
+    for olib in $olib_names ; do
+        cp -R $olib_src_path/$olib "$bundle/Contents/Frameworks/"
+    done
+else
+    # Copy it all
+    cp -R "$olib_src_path"/open* "$bundle/Contents/Frameworks/"
+fi
 
 # Remove python dylibs, these are copied later into the correct python location
@@ -227 +286 @@
 find "$bundle/Contents/Frameworks" -name "*_py.*" -print0 | xargs -0 rm > /dev/null
 
+# If any olib plugins have been specified remove existing and re-copy
+copy_custom_olib_plugins() 
+{
+    base=$1
+    plugins=$2
+
+    if [ "$plugins" == "" ] ; then
+        return
+    fi
+
+    dest_plugin_dir="$bundle/Contents/Frameworks/$base/plugins"
+
+    if [ -d $dest_plugin_dir ] ; then
+        rm -f $dest_plugin_dir/*
+    fi
+
+    if [ "$plugins" == "_NONE_" ] ; then
+        return
+    fi
+    
+    echo "Copying $base plugins..."
+
+    # Else copy new ones
+    src_plugin_dir="$olib_src_path/$base/plugins"
+    for name in $plugins ; do
+        # -R presevers symlinks
+        cp -R $src_plugin_dir/lib${base}_${name}*.dylib "$dest_plugin_dir"
+        cp $src_plugin_dir/${name}_plugin.opl "$dest_plugin_dir"
+    done
+}
+
+copy_custom_olib_plugins "openassetlib" "$openassetlib_plugins"
+copy_custom_olib_plugins "openeffectslib" "$openeffectslib_plugins"
+copy_custom_olib_plugins "openimagelib" "$openimagelib_plugins"
+copy_custom_olib_plugins "openmedialib" "$openmedialib_plugins"
+copy_custom_olib_plugins "openobjectlib" "$openobjectlib_plugins"
+
 # Fixup install names
 bundle_dylibs=`find "$bundle/Contents/Frameworks" -name "*.dylib"`
 dep_dylibs=`$fixup_install_names_cmd $bundle_dylibs`
-
-# Cg Framework
-if [ -e /Library/Frameworks/Cg.framework ] ; then
-    cp -R /Library/Frameworks/Cg.framework "$bundle/Contents/Frameworks"
-    dep_dylibs="$dep_dylibs "`$fixup_install_names_cmd "$bundle/Contents/Frameworks/Cg.framework/Cg"`
-else
-    echo "Error: Unable to find Cg.framework"
-    exit -1
-fi
 
 # libthemes must go in Contents/PlugIns/style
@@ -283 +370 @@
 fi
 
-modules="$jahwidgets_dir/src/qt3/python/jahwidgets.so \
+if [ "$python_modules" == "" ] ; then
+    python_modules="$jahwidgets_dir/src/qt3/python/jahwidgets.so \
 $olib_sitepackages/openassetlib.so \
 $olib_sitepackages/openimagelib.so \
 $olib_sitepackages/openmedialib.so \
 $olib_sitepackages/openpluginlib.so"
-
-for module in $modules ; do
-    cp "$module" "$module_dest"
+fi
+
+for module in $python_modules ; do
+    if [ -e $module ] ; then
+        cp $module "$module_dest"
+    else
+        echo "Unable to copy module: $module"
+        exit 1
+    fi
 done
 

trunk/installer/osx/create_dmg

@@ -23 +23 @@
 fi
 
-hdiutil convert tmp.dmg -format UDZO -imagekey zlib_level=9 -o "$dmg"
+# Bzip2 compression only works on 10.4 or later
+hdiutil convert tmp.dmg -format UDBZ -o "$dmg"
+# Use Gzip compression otherwise
+#hdiutil convert tmp.dmg -format UDZO -imagekey zlib_level=9 -o "$dmg"
+
 rm tmp.dmg
 

trunk/installer/osx/fixup_install_names

@@ -2 +2 @@
 
 if [ $# -eq 0 ] ; then
-   echo "Usage: fixup_install_names --check --custom_prefix <prefix1> --custom_prefix <prefix2> <dylib-files>"
+   echo "Usage: fixup_install_names --check --custom-prefix <prefix1> --custom-prefix <prefix2> <dylib-files>"
    echo "--check just outputs warning if any old prefix is found"
    exit
@@ -11 +11 @@
 /usr/local/lib/ \
 /usr/local/qt/lib/ \
+/opt/local/qt/lib/ \
 /Library/Frameworks/ \
 /opt/local/Library/Frameworks/ \