Changeset 155 for trunk/m2

Timestamp:

05/18/06 21:22:14 (3 years ago)

Author:

krobillard

Message:

m2 - Implemented 'bundle word for Mac OS.

Location:

trunk/m2

Files:

• m2 (modified) (2 diffs)
• m2_macx.r (modified) (9 diffs)

trunk/m2/m2

@@ -1 @@
-#!/usr/bin/rebol -qs
+#!/usr/local/bin/rebol -qs
 
 REBOL [
@@ -116 +116 @@
                 rule_makeobj: func [cc flags obj src /local uc] [
                         ; Default to GNU
-                        uc: uppercase name
+                        uc: uppercase copy name
                         rejoin [ "^(tab)$(" cc ") -c $(" uc flags ") -o " obj 
                                          " $(" uc "_INCPATH) " src ]

trunk/m2/m2_macx.r

@@ -95 +95 @@
     built_obj_rule: none
 
+    uc_name: none
+
     cfg_bundle: none
     cfg_universal: none
@@ -102 +104 @@
     config:
     [
-        obj_macro: rejoin [ "$(" uppercase name "_OBJECTS)" ]
+        uc_name: uppercase copy name
+
+        obj_macro: rejoin [ "$(" uc_name "_OBJECTS)" ]
 
         cflags {-pipe}
@@ -150 +154 @@
 
     configure: does [
-        output_file: rejoin [ output_dir name ]
+        output_file: rejoin either cfg_bundle
+                        [[name %.app/Contents/MacOs/ name]]
+                        [[output_dir name]]
         do config
         if cfg/qt [
@@ -165 +171 @@
     ]
 
-    macro_text: function [] [uc]
-    [
-        uc: uppercase name
-
+    macro_text: func []
+    [
         emit [
-            uc "_CFLAGS   = " menv_cflags " " gnu_string "-D" defines eol
-            uc "_CXXFLAGS = $(" uc "_CFLAGS) " menv_cxxflags eol
-            uc "_INCPATH  = " gnu_string "-I" include_paths eol
-            uc "_LFLAGS   = " menv_lflags eol
-            uc "_LIBS     = " gnu_string "-L" link_paths " "
+            uc_name "_CFLAGS   = " menv_cflags " " gnu_string "-D" defines eol
+            uc_name "_CXXFLAGS = $(" uc_name "_CFLAGS) " menv_cxxflags eol
+            uc_name "_INCPATH  = " gnu_string "-I" include_paths eol
+            uc_name "_LFLAGS   = " menv_lflags eol
+            uc_name "_LIBS     = " gnu_string "-L" link_paths " "
                               gnu_string "-l" link_libs eol
         ]
@@ -180 +184 @@
         ;if cfg/qt [
         ;    emit [
-        ;        uc "_SRCMOC  = " expand_list_gnu srcmoc_files eol
-        ;        uc "_OBJMOC  = " expand_list_gnu objmoc_files eol
+        ;        uc_name "_SRCMOC  = " expand_list_gnu srcmoc_files eol
+        ;        uc_name "_OBJMOC  = " expand_list_gnu objmoc_files eol
         ;    ]
         ;]
 
         emit [
-            ;uc "_HEADERS  = " expand_list_gnu header_files eol
-            uc "_SOURCES  = " expand_list_gnu source_files eol
-            uc "_OBJECTS  = " expand_list_gnu object_files eol
+            ;uc_name "_HEADERS  = " expand_list_gnu header_files eol
+            uc_name "_SOURCES  = " expand_list_gnu source_files eol
+            uc_name "_OBJECTS  = " expand_list_gnu object_files eol
         ]
     ]
@@ -195 +199 @@
     ; TODO: if cfg/qt [ "rm -f $(_SRCMOC)" ]
 
-    dist: function [] [uc] [
-        uc: uppercase name
-        rejoin [" $(" uc "_SOURCES)" ]
-    ]
-
-    rule_text: function [] [uc]
-    [
-        uc: uppercase name
+    dist: func [] [
+        rejoin [" $(" uc_name "_SOURCES)" ]
+    ]
+
+    rule_text: function [] [bdir]
+    [
         emit [ eol output_file ": " obj_macro m2/local_libs link_libs
             {^/^(tab)$(}
                 either link_cxx ["LINK_CXX"]["LINK"]
-                {) -o $@ $(} uc {_LFLAGS) } obj_macro
-            { $(} uc {_LIBS)} eol
-        ]
-
-        ;if cfg_bundle [ emit {^/# bundle} ]
+                {) -o $@ $(} uc_name {_LFLAGS) } obj_macro
+            { $(} uc_name {_LIBS)} eol
+        ]
+
+        if cfg_bundle [
+            bdir: to-file join name %.app/Contents/
+            if not exists? bdir [
+                make-dir/deep join bdir %MacOs
+                write join bdir %PkgInfo #{4150504c 3f3f3f3f 0a}
+                write join bdir %Info.plist rejoin bind info.plist 'name
+
+                ;emit {^/# bundle}
+            ]
+        ]
     ]
 ]
@@ -221 +232 @@
     ]
 
-    rule_text: function [] []
+    rule_text: func []
     [
         emit [ eol output_file ": " obj_macro
-            "^/^(tab)ar rc $@ " obj_macro  ; " $(" uppercase name "_LFLAGS)"
+            "^/^(tab)ar rc $@ " obj_macro  ; " $(" uc_name "_LFLAGS)"
             "^/^(tab)ranlib $@^/"
         ]
@@ -239 +250 @@
     ]
 
-    rule_text: function [] [uc]
-    [
-        uc: uppercase name
+    rule_text: func []
+    [
         emit [ eol output_file ": " obj_macro
-            {^/^(tab)libtool -o $@ } obj_macro { $(} uc {_LFLAGS) }
-            { $(} uc {_LIBS)} eol
+            {^/^(tab)libtool -o $@ } obj_macro { $(} uc_name {_LFLAGS) }
+            { $(} uc_name {_LIBS)} eol
         ]
     ]
@@ -293 +303 @@
 
 
+info.plist: [
+{<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD
+PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleExecutable</key>
+    <string>} name {</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.mycompany.} name {</string>
+    <key>CFBundleDisplayName</key>
+    <string>} uc_name {</string>
+    <key>CFBundleName</key>
+    <string>} uc_name {</string>
+    <key>CFBundleIconFile</key>
+    <string>} name {</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+</dict>
+</plist>
+}
+]
+
+
 ;EOF