improve xcode.framework rule

5 files changed, 50 insertions, 25 deletions

diff --git a/tests/projects/objc/application/src/main.m b/tests/projects/objc/application/src/main.m
new file mode 100644
index 000000000..47ac6bdc2
--- /dev/null
+++ b/tests/projects/objc/application/src/main.m
@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+
+int main(int argc, char** argv)
+{
+    @autoreleasepool
+    {
+        NSLog(@"hello xmake!");
+    }
+    return 0;
+}
diff --git a/tests/projects/objc/application/xmake.lua b/tests/projects/objc/application/xmake.lua
new file mode 100644
index 000000000..83522c669
--- /dev/null
+++ b/tests/projects/objc/application/xmake.lua
@@ -0,0 +1,5 @@
+add_rules("mode.debug", "mode.release")
+
+target("demo")
+    add_rules("xcode.application")
+    add_files("src/main.m")
diff --git a/tests/projects/objc/bundle/xmake.lua b/tests/projects/objc/bundle/xmake.lua
index 5073b3b0f..e8d0738ce 100644
--- a/tests/projects/objc/bundle/xmake.lua
+++ b/tests/projects/objc/bundle/xmake.lua
@@ -1,22 +1,10 @@
--- add rules
 add_rules("mode.debug", "mode.release")
 
--- add frameworks
-add_frameworks("Foundation", "CoreFoundation")
+target("test")
+    add_rules("xcode.bundle")
+    add_files("src/test.m")
 
--- for macosx or ios
-if is_os("macosx", "ios") then
-
-    -- enable arc?
-    add_mxflags("-fobjc-arc")
-end
-
--- add target
-target("console_objc")
-
-    -- set kind
+target("demo")
     set_kind("binary")
-
-    -- add files
-    add_files("src/*.m")
-
+    add_deps("test")
+    add_files("src/main.m")
diff --git a/tests/projects/objc/framework/src/Info.plist b/tests/projects/objc/framework/src/Info.plist
new file mode 100644
index 000000000..20608314e
--- /dev/null
+++ b/tests/projects/objc/framework/src/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020 tboox. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/tests/projects/objc/framework/xmake.lua b/tests/projects/objc/framework/xmake.lua
index 2e1de864c..683b2ea7d 100644
--- a/tests/projects/objc/framework/xmake.lua
+++ b/tests/projects/objc/framework/xmake.lua
@@ -1,15 +1,13 @@
 add_rules("mode.debug", "mode.release")
-add_frameworks("Foundation", "CoreFoundation")
-
-if is_os("macosx", "ios") then
-    add_mxflags("-fobjc-arc")
-end
 
 target("test")
-    set_kind("shared")
+    add_rules("xcode.framework")
     add_files("src/test.m")
+    add_headerfiles("src/*.h")
+    add_installfiles("src/Info.plist")
 
+    --[[
 target("demo")
     set_kind("binary")
     add_deps("test")
-    add_files("src/main.m")
+    add_files("src/main.m")]]