From f834ff6ec54a139cd90a230eb7733638b67f63db Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Fri, 18 Sep 2015 16:54:07 +0100 Subject: [PATCH] [Packaging] Updates to osx scripts * bundle_contents now appends 'Contents' without adding it twice. * Remove reference to non-existent gdk-pixbuf.loaders * Separate libtorrent in new module. * Update lib versions for bundle file. --- osx/libtorrent.modules | 45 ++++++++++++++++++++++++++++++ packaging/osx/deluge | 7 ++--- packaging/osx/deluge-console | 4 +-- packaging/osx/deluge-web | 4 +-- packaging/osx/deluge.bundle | 11 ++++---- packaging/osx/deluge.modules | 51 ---------------------------------- packaging/osx/deluged | 4 +-- packaging/osx/jhbuildrc-custom | 30 ++++++++++++-------- packaging/osx/make-app | 0 setup.py | 2 +- 10 files changed, 80 insertions(+), 78 deletions(-) create mode 100644 osx/libtorrent.modules mode change 100755 => 100644 packaging/osx/deluge mode change 100755 => 100644 packaging/osx/make-app diff --git a/osx/libtorrent.modules b/osx/libtorrent.modules new file mode 100644 index 000000000..66d63f0a5 --- /dev/null +++ b/osx/libtorrent.modules @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/osx/deluge b/packaging/osx/deluge old mode 100755 new mode 100644 index adac78f75..d0041994c --- a/packaging/osx/deluge +++ b/packaging/osx/deluge @@ -11,7 +11,7 @@ fi tmp=`dirname "$full_path"` tmp=`dirname "$tmp"` bundle=`dirname "$tmp"` -bundle_contents="$bundle"/Contents +bundle_contents=${bundle%"/Contents"}"/Contents" bundle_macos="$bundle_contents"/MacOS bundle_res="$bundle_contents"/Resources bundle_lib="$bundle_res"/lib @@ -24,16 +24,15 @@ export XDG_DATA_DIRS="$bundle_data" export GTK_DATA_PREFIX="$bundle_res" export GTK_EXE_PREFIX="$bundle_res" export GTK_PATH="$bundle_res" - export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders" +export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" export PANGO_RC_FILE="$bundle_etc/pango/pangorc" export PANGO_LIBDIR="$bundle_lib" export PANGO_SYSCONFDIR="$bundle_etc" #Set $PYTHON to point inside the bundle -export PYTHON="$bundle_macos/Deluge-python" +export PYTHON="$bundle_macos/python" export PYTHONHOME="$bundle_res" #Add the bundle's python modules PYTHONPATH="$bundle_lib:$PYTHONPATH" diff --git a/packaging/osx/deluge-console b/packaging/osx/deluge-console index 05d020f09..cd413a90d 100755 --- a/packaging/osx/deluge-console +++ b/packaging/osx/deluge-console @@ -11,7 +11,7 @@ fi tmp=`dirname "$full_path"` tmp=`dirname "$tmp"` bundle=`dirname "$tmp"` -bundle_contents="$bundle"/Contents +bundle_contents=${bundle%"/Contents"}"/Contents" bundle_macos="$bundle_contents"/MacOS bundle_res="$bundle_contents"/Resources bundle_lib="$bundle_res"/lib @@ -23,7 +23,7 @@ export XDG_CONFIG_DIRS="$bundle_etc"/xdg export XDG_DATA_DIRS="$bundle_data" #Set $PYTHON to point inside the bundle -export PYTHON="$bundle_macos/Deluge-python" +export PYTHON="$bundle_macos/python" export PYTHONHOME="$bundle_res" #Add the bundle's python modules PYTHONPATH="$bundle_lib:$PYTHONPATH" diff --git a/packaging/osx/deluge-web b/packaging/osx/deluge-web index 510069ca2..7d2a44a21 100755 --- a/packaging/osx/deluge-web +++ b/packaging/osx/deluge-web @@ -11,7 +11,7 @@ fi tmp=`dirname "$full_path"` tmp=`dirname "$tmp"` bundle=`dirname "$tmp"` -bundle_contents="$bundle"/Contents +bundle_contents=${bundle%"/Contents"}"/Contents" bundle_macos="$bundle_contents"/MacOS bundle_res="$bundle_contents"/Resources bundle_lib="$bundle_res"/lib @@ -23,7 +23,7 @@ export XDG_CONFIG_DIRS="$bundle_etc"/xdg export XDG_DATA_DIRS="$bundle_data" #Set $PYTHON to point inside the bundle -export PYTHON="$bundle_macos/Deluge-python" +export PYTHON="$bundle_macos/python" export PYTHONHOME="$bundle_res" #Add the bundle's python modules PYTHONPATH="$bundle_lib:$PYTHONPATH" diff --git a/packaging/osx/deluge.bundle b/packaging/osx/deluge.bundle index e13d8c8b0..414d7b032 100644 --- a/packaging/osx/deluge.bundle +++ b/packaging/osx/deluge.bundle @@ -11,20 +11,21 @@ ${prefix}/bin/deluged ${prefix}/bin/deluge-web ${prefix}/bin/deluge-console - ${prefix}/bin/python + ${prefix}/bin/python ${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so ${prefix}/lib/libpyglib-2.0-python.0.dylib ${prefix}/lib/libgtk-quartz-2.0.0.dylib - ${prefix}/lib/libglade-2.0.0.0.7.dylib - ${prefix}/lib/libgtkmacintegration.2.dylib + ${prefix}/lib/libglade-2.0.0.dylib + ${prefix}/lib/libgtkmacintegration-gtk2.2.dylib ${prefix}/lib/librsvg-2.2.dylib ${prefix}/lib/pango/1.8.0/modules/pango*.so ${prefix}/lib/libboost_system.dylib ${prefix}/lib/libboost_python.dylib - ${prefix}/lib/libtorrent-rasterbar.7.dylib - ${prefix}/lib/libssl.1.0.1.dylib + ${prefix}/lib/libtorrent-rasterbar.8.dylib + ${prefix}/lib/libssl.1.0.0.dylib + ${project}/../dist/deluge.app/Contents/Resources/ diff --git a/packaging/osx/deluge.modules b/packaging/osx/deluge.modules index 937f02433..4090c55c7 100644 --- a/packaging/osx/deluge.modules +++ b/packaging/osx/deluge.modules @@ -2,16 +2,10 @@ - - - @@ -21,51 +15,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packaging/osx/deluged b/packaging/osx/deluged index 011dbb745..6fc404ac9 100755 --- a/packaging/osx/deluged +++ b/packaging/osx/deluged @@ -11,7 +11,7 @@ fi tmp=`dirname "$full_path"` tmp=`dirname "$tmp"` bundle=`dirname "$tmp"` -bundle_contents="$bundle"/Contents +bundle_contents=${bundle%"/Contents"}"/Contents" bundle_macos="$bundle_contents"/MacOS bundle_res="$bundle_contents"/Resources bundle_lib="$bundle_res"/lib @@ -23,7 +23,7 @@ export XDG_CONFIG_DIRS="$bundle_etc"/xdg export XDG_DATA_DIRS="$bundle_data" #Set $PYTHON to point inside the bundle -export PYTHON="$bundle_macos/Deluge-python" +export PYTHON="$bundle_macos/python" export PYTHONHOME="$bundle_res" #Add the bundle's python modules PYTHONPATH="$bundle_lib:$PYTHONPATH" diff --git a/packaging/osx/jhbuildrc-custom b/packaging/osx/jhbuildrc-custom index 2c9bcc9db..6899bc564 100644 --- a/packaging/osx/jhbuildrc-custom +++ b/packaging/osx/jhbuildrc-custom @@ -1,24 +1,32 @@ # -*- mode: python -*- -prefix = "/opt/gtk" -checkoutroot = os.path.expanduser("~/Source/gtk") - -#setup_sdk(target="10.6", sdk_version="10.6", architectures=["x86_64"]) -setup_sdk(target="10.6", sdk_version="10.6", architectures=["i386"]) - _gtk_osx_use_jhbuild_python = True -skip.append("libiconv") # Lion issues +#skip.append("libiconv") # Lion issues +branches["python"] = "http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz" + modules = [ "python", "meta-gtk-osx-bootstrap", - "meta-gtk-osx-core", - "librsvg", "libglade", + "libglade", "meta-gtk-osx-python", "meta-gtk-osx-themes", "gtk-quartz-engine", ] -# Can be usefull when tweaking modulesets to avoid jhbuild overwriting: -#nonetwork=True +build_policy = "updated-deps" +# For default operation, set architecture and SDK for the native machine: +_target = None; +if _osx_version >= 7.0: + _target = "10.7" +elif _osx_version >= 6.0: + _target = "10.6" +elif _osx_version >= 5.0: + _target = "10.5" +elif _osx_version >= 4.0: + _target = "10.4" + +setup_sdk(target=_target, sdk_version="native", architectures=[_default_arch]) +#setup_sdk(target="10.6", sdk_version="10.6", architectures=["x86_64"]) +#setup_sdk(target="10.6", sdk_version="10.6", architectures=["i386"]) diff --git a/packaging/osx/make-app b/packaging/osx/make-app old mode 100755 new mode 100644 diff --git a/setup.py b/setup.py index 399477d4a..729b1ba16 100755 --- a/setup.py +++ b/setup.py @@ -268,7 +268,7 @@ cmdclass = { # Data files to be installed to the system. _data_files = [] -if not windows_check(): +if not windows_check() or not osx_check(): _data_files = [ ('share/icons/hicolor/scalable/apps', ['deluge/ui/data/icons/scalable/apps/deluge.svg']), ('share/icons/hicolor/128x128/apps', ['deluge/ui/data/icons/hicolor/128x128/apps/deluge.png']),