[gimp/gimp-2-8] build/osx: drop 2.8 and python from the bundle config filenames



commit e87d685b46177c53eeb0ea069cad6593bc2cdcef
Author: Kristian Rietveld <kris loopnest org>
Date:   Thu Apr 20 22:57:45 2017 +0200

    build/osx: drop 2.8 and python from the bundle config filenames
    
    We use branching in git and should thus not need to store a version
    number within the filename. And Python has been the default build for some
    time now, with no need to revert to the older non-Python build.

 build/osx/README                                  |   18 +++++++++---------
 build/osx/{gimp-2.8-python.bundle => gimp.bundle} |    4 ++--
 build/osx/{info-2.8-python.plist => info.plist}   |    0
 build/osx/{launcher-2.8-python.sh => launcher.sh} |    0
 4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index 3d16469..d9b3128 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -110,10 +110,10 @@ III. Create a GIMP installer
 1. To create a bundle, we need some more files:
 
 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=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.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.bundle?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/launcher.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher.sh?h=gimp-2-8 &&
+  chmod +x $HOME/gimp/directory/launcher.sh &&
+  curl -o $HOME/gimp/directory/info.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info.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 &&
@@ -137,7 +137,7 @@ $ JHB=gimp GIMP_SDK=10.6 jhbuild shell
 $ cd $HOME/gimp/directory
 
 for GIMP 2.8:
-$ gtk-mac-bundler gimp-2.8-python.bundle
+$ gtk-mac-bundler gimp.bundle
 
 4. Create DMG image. Create a directory "bundle/" that contains only the .app
 image. Run the following command in the directory above "bundle/".
@@ -154,9 +154,9 @@ custom                      default application data
 README                      this file
 gimp.icns                   application icon
 gimp.svg                    application icon
-gimp.modules                configuration for jhbuild 
-gimp-2.8-python-bundle      configuration for gtk-mac-bundler (GIMP 2.8)
-info-2.8-python.plist       OS X application metadata (GIMP 2.8)
-launcher-python.sh          GIMP starter in the OS X application package
+gimp.modules                configuration for jhbuild
+gimp.bundle                 configuration for gtk-mac-bundler
+info.plist                  OS X application metadata
+launcher.sh                 GIMP starter in the OS X application package
 patches                     Patches as long as they are not accepted upstream
 xcf.icns                    application icon
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp.bundle
similarity index 98%
rename from build/osx/gimp-2.8-python.bundle
rename to build/osx/gimp.bundle
index 6fb66e5..545be15 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp.bundle
@@ -10,13 +10,13 @@
 
                <run-install-name-tool />
 
-               <launcher-script>${project}/launcher-2.8-python.sh</launcher-script>
+               <launcher-script>${project}/launcher.sh</launcher-script>
 
                <gtk>gtk+-2.0</gtk>
        </meta>
 
        <!-- Copy in .plist file -->
-       <plist>${project}/info-2.8-python.plist</plist>
+       <plist>${project}/info.plist</plist>
 
        <binary>
                ${prefix}/lib/libgtk-quartz-${gtkversion}.0.dylib
diff --git a/build/osx/info-2.8-python.plist b/build/osx/info.plist
similarity index 100%
rename from build/osx/info-2.8-python.plist
rename to build/osx/info.plist
diff --git a/build/osx/launcher-2.8-python.sh b/build/osx/launcher.sh
similarity index 100%
rename from build/osx/launcher-2.8-python.sh
rename to build/osx/launcher.sh


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]