Enable using jom in place of nmake in the wxMSW build

[wxWidgets.git] / build / bakefiles / mac_bundles.bkl

diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index b5c69912d77ff0bfb0107fde70e9984249590b2e..470cd19a8948bacb5f79d3628b7fa1878707de52 100644 (file)
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -15,12 +15,13 @@
         `echo $(DOLLAR)(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`
     </set>
     
-    <set var="BUNDLE_PLIST">
-        $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
+    <set var="BUNDLE_PLIST" overwrite="0">
+        $(TOP_SRCDIR)src/osx/carbon/Info.plist.in
     </set>
-    <set var="BUNDLE_ICONS">
-        $(TOP_SRCDIR)src/mac/carbon/wxmac.icns
+    <set var="BUNDLE_ICON" overwrite="0">
+        $(TOP_SRCDIR)src/osx/carbon/wxmac.icns
     </set>
+    <set var="BUNDLE_RESOURCES" overwrite="0"></set>
 
     <define-tag name="wx-mac-app-bundle" rules="exe">
 
@@ -28,16 +29,22 @@
         <set var="BUNDLE">$(id).app/Contents</set>
         <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
         <set var="BUNDLE_TGT_REF">
+            <!-- TODO Remove Mac -->
             <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='OSX_CARBON'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='OSX_COCOA'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='OSX_IPHONE'">$(BUNDLE)/PkgInfo</if>
             <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
         </set>
-        
-        <add-target target="$(BUNDLE_TGT)" type="action"/>
+
+        <add-target target="$(BUNDLE_TGT)" type="action"
+                    cond="target and PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
             <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
-            <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
+            <depends-on-file>$(BUNDLE_ICON)</depends-on-file>
+            <depends-on-file>$(BUNDLE_RESOURCES)</depends-on-file>
 
             <command>
                 <!-- create the directories: -->
@@ -52,19 +59,26 @@
                     $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
 
                 <!-- PkgInfo: -->
-                echo -n "APPL????" >$(BUNDLE)/PkgInfo
+                /bin/echo "APPL????" >$(BUNDLE)/PkgInfo
 
-                <!-- make a hardlink to the binary: -->
+                <!-- move the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- ditto wxWidgets resources and icons: -->
-                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
-            </command>            
+                <!-- copy the application icon: -->
+                cp -f $(BUNDLE_ICON) $(BUNDLE)/Resources/wxmac.icns
+               </command>            
+            <if cond="BUNDLE_RESOURCES!=''">
+                <command>
+                    <!-- copy all other bundle resources: -->
+                    cp -f $(BUNDLE_RESOURCES) $(BUNDLE)/Resources
+                </command>
+            </if>
+ 
         </modify-target>
         
         <!-- add pseudo target id_bundle: -->
         <add-target target="$(id)_bundle" type="phony"
-                    cond="PLATFORM_MACOSX=='1'"/>
+                    cond="target and PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>
             <depends>$(BUNDLE_TGT_REF)</depends>