adding generic BUNDLE_RESOURCES for copying any special resources into the bundle...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index bf52f7634be8c2be0b52852b5b79df5d3b03488c..647035546c8ebb99bc5dbc2a02534e8f784b14fe 100644 (file)
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -18,9 +18,10 @@
     <set var="BUNDLE_PLIST" overwrite="0">
         $(TOP_SRCDIR)src/osx/carbon/Info.plist.in
     </set>
-    <set var="BUNDLE_ICONS" overwrite="0">
+    <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">
 
@@ -38,7 +39,8 @@
             <!-- 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: -->
@@ -58,9 +60,16 @@
                 <!-- make a hardlink to the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
-                <!-- ditto wxWidgets resources and icons: -->
-                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources
-            </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: -->

diff --git a/samples/docview/Info.plist.in b/samples/docview/Info.plist.in
index 95180eada65d7f25ac313b55043535538ee8e407..1a8f2e4a6e512e13a4c6f97c6e9bac5b99c808fa 100644 (file)
--- a/samples/docview/Info.plist.in
+++ b/samples/docview/Info.plist.in
@@ -62,7 +62,7 @@
        <key>CFBundleExecutable</key>
        <string>EXECUTABLE</string>
        <key>CFBundleIconFile</key>
-       <string>doc.icns</string>
+       <string>wxmac.icns</string>
        <key>CFBundleName</key>
        <string>EXECUTABLE</string>
        <key>CFBundlePackageType</key>

diff --git a/samples/docview/docview.bkl b/samples/docview/docview.bkl
index 1edbffd24f3eabf13348bbee7a52c7324b7d138b..fc54024b4accab0bca8ef39d13adb772d939e934 100644 (file)
--- a/samples/docview/docview.bkl
+++ b/samples/docview/docview.bkl
@@ -2,7 +2,8 @@
 <makefile>
 
     <set var="BUNDLE_PLIST">$(SRCDIR)/Info.plist.in</set>
-    <set var="BUNDLE_ICONS">$(SRCDIR)/chart.icns $(SRCDIR)/doc.icns $(SRCDIR)/notepad.icns</set>
+    <set var="BUNDLE_ICON">$(SRCDIR)/doc.icns</set>
+    <set var="BUNDLE_RESOURCES">$(SRCDIR)/chart.icns $(SRCDIR)/notepad.icns</set>
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
@@ -11,7 +12,6 @@
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>docview.rc</win32-res>
-        <mac-res>chart.r doc.r docview.r mondrian.r</mac-res>
     </exe>
 
 </makefile>