mail[Wesnoth-commits] r25292 - in /trunk: Makefile.am SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 29, 2008 - 16:28:
Author: esr
Date: Sat Mar 29 16:28:01 2008
New Revision: 25292

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25292&view=rev
Log:
Implement making of Mac tarballs in the scons recipe (untested).

Modified:
    trunk/Makefile.am
    trunk/SConstruct

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/Makefile.am?rev=25292&r1=25291&r2=25292&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Sat Mar 29 16:28:01 2008
@@ -35,7 +35,6 @@
            *) f=$$p;; \
          esac;
 
-# *** Not yet covered by scons recipe
 # Create Macintosh app bundle from the game 
 bundle_contents=@PACKAGE_NAME@.app/Contents
 @PACKAGE@_bundle: src/@PACKAGE@
@@ -44,7 +43,6 @@
        echo "APPL????" > "$(bundle_contents)/PkgInfo"
        $(INSTALL_PROGRAM) $< "$(bundle_contents)/MacOS/@PACKAGE_NAME@"
 
-# *** Not yet covered by scons recipe
 # Create Macintosh app bundle from the editor
 bundle_editor_contents=@PACKAGE_NAME@ Editor.app/Contents
 @PACKAGE@_editor_bundle: src/@PACKAGE@_editor

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25292&r1=25291&r2=25292&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sat Mar 29 16:28:01 2008
@@ -12,8 +12,7 @@
 # 2. Manual page formatting and installation
 # 3. Dummy locales
 # 4. Translations handling other than installation (pot-update).
-# 5. Construction of Apple application bundles.
-# 6. Making binary and data-only distribution tarballs
+# 5. Making binary and data-only distribution tarballs
 
 import os, sys, commands, shutil, sets
 from SCons.Script import *
@@ -1005,7 +1004,7 @@
        'xsltproc --nonet /etc/asciidoc/docbook-xsl/xhtml.xsl "${SOURCE}" 
"${TARGET}"')
 
 #
-# Making a distribution.
+# Making a distribution tarball.
 #
 def manifest():
     "Get an argument list suitable for passing to a distribution archiver."
@@ -1027,6 +1026,26 @@
 env.Alias('dist', tarball)
 
 #
+# Making Mac OS X application bundles
+#
+env.Command("Wesnoth.app", "wesnoth", [
+     Mkdir("${TARGET}/Contents"),
+     Mkdir("${TARGET}/Contents/MacOS"),
+     Mkdir("${TARGET}/Contents/Resources"),
+     Action('echo "APPL????" > "${TARGET}/Contents/PkgInfo"'),
+     Copy("${TARGET}/Contents/MacOS", "wesnoth"),
+     ])
+env.Clean(all, "Wesnoth.app")    
+env.Command("Wesnoth Editor.app", "wesnoth_editor", [
+     Mkdir("${TARGET}/Contents"),
+     Mkdir("${TARGET}/Contents/MacOS"),
+     Mkdir("${TARGET}/Contents/Resources"),
+     Action('echo "APPL????" > "${TARGET}/Contents/PkgInfo"'),
+     Copy("${TARGET}/Contents/MacOS", "wesnoth_editor"),
+     ])
+env.Clean(all, "Wesnoth Editor.app")
+
+#
 # Sanity checking
 #
 sanity_check = env.Command('sanity-check', '', [




Related Messages


Powered by MHonArc, Updated Sat Mar 29 17:02:36 2008