[Wxlua-commit] wxLua/build/bakefiles mac_bundles.bkl,1.1,1.2

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/build/bakefiles

Modified Files:
	mac_bundles.bkl 
Log Message:
other mac bundle fixes as noted by Anders

Index: mac_bundles.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/mac_bundles.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mac_bundles.bkl	22 Dec 2006 20:45:07 -0000	1.1
--- mac_bundles.bkl	23 Dec 2006 11:10:52 -0000	1.2
***************
*** 4,7 ****
--- 4,19 ----
  <makefile>
  
+ 
+     <!--
+         NOTE: this file is mostly a copy&paste of the mac_bundles.bkl file
+               from wxWidgets bakefiles.
+               The following modifications were done:
+                -> added BUNDLE_DIR, BUNDLE_VERSION and BUNDLE_ICONS_FILENAME
+                -> make <wx-mac-app-bundle> tag do nothing when FORMAT!=autoconf
+                -> use $(value) inside <wx-mac-app-bundle> to define the
+                   directory .app to create
+     -->
+ 
+ 
      <if cond="FORMAT=='autoconf'">
  
***************
*** 13,16 ****
--- 25,32 ----
              $(top_srcdir)/distrib/macbundle
          </set>
+ 
+         <set var="BUNDLE_VERSION">
+             $(WXLUA_VERSION)
+         </set>
      
          <set var="BUNDLE_ICONS_FILENAME">
***************
*** 22,26 ****
          </set>
          <set var="BUNDLE_ICONS">
!             $(BUNDLE_PLIST)/$(BUNDLE_ICONS_FILENAME)
          </set>
      
--- 38,42 ----
          </set>
          <set var="BUNDLE_ICONS">
!             $(BUNDLE_DIR)/$(BUNDLE_ICONS_FILENAME)
          </set>
      
***************
*** 46,50 ****
      
              <!-- bundle directory: -->
!             <set var="BUNDLE">$(id).app/Contents</set>
              <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
              <set var="BUNDLE_TGT_REF">
--- 62,66 ----
      
              <!-- bundle directory: -->
!             <set var="BUNDLE">$(value).app/Contents</set>
              <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
              <set var="BUNDLE_TGT_REF">
***************
*** 68,72 ****
                      sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \
                          -e "s/EXECUTABLE/$(id)/" \
!                         -e "s/VERSION/$(WX_VERSION)/" \
                          $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
      
--- 84,88 ----
                      sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \
                          -e "s/EXECUTABLE/$(id)/" \
!                         -e "s/VERSION/$(BUNDLE_VERSION)/" \
                          $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
      
***************
*** 92,96 ****
              <!-- "make clean" should delete the bundle: -->
              <modify-target target="clean">
!                 <command>rm -rf $(id).app</command>
              </modify-target>
      
--- 108,112 ----
              <!-- "make clean" should delete the bundle: -->
              <modify-target target="clean">
!                 <command>rm -rf $(value).app</command>
              </modify-target>
      
***************
*** 100,106 ****
  
      <if cond="FORMAT!='autoconf'">
!         
          <define-tag name="wx-mac-app-bundle" rules="exe"/>
!         
      </if>
  
--- 116,123 ----
  
      <if cond="FORMAT!='autoconf'">
! 
!         <!-- just do nothing -->
          <define-tag name="wx-mac-app-bundle" rules="exe"/>
! 
      </if>