[gimp/osx-build: 17/31] OS X build: update build instructions in README

[Sven Claussner <sclaussner src gnome org>]

commit 3049c73abf0b06311c5fc7879bd1ee9076f4148a
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sat May 10 07:06:23 2014 +0200

    OS X build: update build instructions in README
    
    Update gtk-mac-bundler preparations. Add line to run gtk-mac-bundler in
    a JHBuild shell. Add gtk-mac-bundler instructions for building
    gimp-master.

 build/osx/README |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index 7b9adb0..a534aff 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -107,29 +107,52 @@ instances have been killed.
 III. Create a GIMP installer
 -------------------------------------
 1. To create a bundle, we need some more files:
-$ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp-2.8-python.bundle?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/launcher-2.8-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-2.8-python.sh?h=gimp-2-8 &&
-  chmod +x $HOME/gimp/directory/launcher-2.8-python.sh &&
-  curl -o $HOME/gimp/directory/info-2.8-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-2.8-python.plist?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/gimp.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/xcf.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=gimp-2-8 &&
-  curl --create-dirs -o $HOME/gimp/directory/custom/fonts.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/gimp.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/gimprc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/gtkrc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=gimp-2-8
-
 
+for GIMP 2.8:
+$ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp-2.8-python.bundle?h=osx-build &&
+  curl -o $HOME/gimp/directory/launcher-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-python.sh?h=osx-build &&
+  chmod +x $HOME/gimp/directory/launcher-python.sh &&
+  curl -o $HOME/gimp/directory/info-2.8-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-2.8-python.plist?h=osx-build &&
+  curl -o $HOME/gimp/directory/gimp.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=osx-build &&
+  curl -o $HOME/gimp/directory/xcf.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=osx-build &&
+  curl --create-dirs -o $HOME/gimp/directory/custom/fonts.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/gimp.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/gimprc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/gtkrc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=osx-build
+
+for GIMP master:
+$ curl -o $HOME/gimp/directory/gimp-master-python.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp-master-python.bundle?h=osx-build &&
+  curl -o $HOME/gimp/directory/launcher-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-python.sh?h=osx-build &&
+  chmod +x $HOME/gimp/directory/launcher-python.sh &&
+  curl -o $HOME/gimp/directory/info-master-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-master-python.plist?h=osx-build &&
+  curl -o $HOME/gimp/directory/gimp.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=osx-build &&
+  curl -o $HOME/gimp/directory/xcf.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=osx-build &&
+  curl --create-dirs -o $HOME/gimp/directory/custom/fonts.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/gimp.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/gimprc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/gtkrc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=osx-build &&
+  curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=osx-build
+  
 2. We also need to fix a few outstanding issues:
 $ cp $HOME/gimp/10.6/source/gettext-0.18.1.1/gettext-tools/intl/charset.alias ~/gimp/10.6/inst/lib
 $ chmod +w $PREFIX/lib/libpython2.7.dylib
 
 3. Run the bundler:
+JHB=gimp GIMP_SDK=10.6 jhbuild shell
+
 $ cd $HOME/gimp/directory
+
+for GIMP 2.8:
 $ gtk-mac-bundler gimp-2.8-python.bundle
 
+for GIMP master:
+$ gtk-mac-bundler gimp-master-python.bundle
+
 IV. Files
 ----------
 The following files and subdirectories are in this folder: