fix the problem with parsing HTML comments (closes bug 1116708; based on patch 1168583)

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

diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index 91567f48ed085310fc926c0064695b3d3dc7ad2a..b5c69912d77ff0bfb0107fde70e9984249590b2e 100644 (file)
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -4,7 +4,7 @@
 <makefile>
 
     <!--
 <makefile>
 
     <!--

-    Support for application bundles, for wxWindows samples.
+    Support for application bundles, for wxWidgets samples.

     -->
     
     <!-- 
     -->
     
     <!-- 


@@ -18,9 +18,6 @@
     <set var="BUNDLE_PLIST">
         $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
     </set>
     <set var="BUNDLE_PLIST">
         $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
     </set>

-    <set var="BUNDLE_RESOURCE">
-        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc
-    </set>

     <set var="BUNDLE_ICONS">
         $(TOP_SRCDIR)src/mac/carbon/wxmac.icns
     </set>
     <set var="BUNDLE_ICONS">
         $(TOP_SRCDIR)src/mac/carbon/wxmac.icns
     </set>


@@ -30,13 +27,16 @@
         <!-- bundle directory: -->
         <set var="BUNDLE">$(id).app/Contents</set>
         <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
         <!-- bundle directory: -->
         <set var="BUNDLE">$(id).app/Contents</set>
         <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>

+        <set var="BUNDLE_TGT_REF">
+            <if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
+            <if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
+        </set>

         
         <add-target target="$(BUNDLE_TGT)" type="action"/>
         <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
             <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
         
         <add-target target="$(BUNDLE_TGT)" type="action"/>
         <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
             <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>

-            <depends-on-file>$(BUNDLE_RESOURCE)</depends-on-file>

             <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
 
             <command>
             <depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
 
             <command>


@@ -57,9 +57,8 @@
                 <!-- make a hardlink to the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 
                 <!-- make a hardlink to the binary: -->
                 ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
 

-                <!-- ditto wxWindows resources and icons: -->
-                ln -sf $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
-                ln -sf $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
+                <!-- ditto wxWidgets resources and icons: -->
+                cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns

             </command>            
         </modify-target>
         
             </command>            
         </modify-target>
         


@@ -68,7 +67,7 @@
                     cond="PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>
                     cond="PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>

-            <depends>$(BUNDLE_TGT)</depends>
+            <depends>$(BUNDLE_TGT_REF)</depends>

         </modify-target>
 
         <!-- "make clean" should delete the bundle: -->
         </modify-target>
 
         <!-- "make clean" should delete the bundle: -->