Merge pull request cocos2d#176 from natural-law/support-wp8

Support build wp8-xaml & win8.1-universal projects

Author: minggo

bin/cocos.py

@@ -406,6 +406,14 @@ def convert_rules(rules):
 def os_is_win32():
     return sys.platform == 'win32'
 
+def os_is_32bit_windows():
+    if not os_is_win32():
+        return False
+
+    arch = os.environ['PROCESSOR_ARCHITECTURE'].lower()
+    archw = os.environ.has_key("PROCESSOR_ARCHITEW6432")
+    return (arch == "x86" and not archw)
+
 def os_is_mac():
     return sys.platform == 'darwin'
 

bin/cocos_project.py

@@ -184,14 +184,20 @@ class Platforms(object):
     WEB = 'web'
     WIN32 = 'win32'
     LINUX = 'linux'
+    WP8 = "wp8"
+    WP8_1 = "wp8_1"
+    METRO = "metro"
 
     CFG_CLASS_MAP = {
         ANDROID : "cocos_project.AndroidConfig",
         IOS : "cocos_project.iOSConfig",
         MAC : "cocos_project.MacConfig",
         WEB : "cocos_project.WebConfig",
         WIN32 : "cocos_project.Win32Config",
-        LINUX : "cocos_project.LinuxConfig"
+        LINUX : "cocos_project.LinuxConfig",
+        WP8 : "cocos_project.Wp8Config",
+        WP8_1 : "cocos_project.Wp8_1Config",
+        METRO : "cocos_project.MetroConfig"
     }
 
     @staticmethod
@@ -200,7 +206,7 @@ def list_for_display():
 
     @staticmethod
     def list():
-        return (Platforms.ANDROID, Platforms.IOS, Platforms.MAC, Platforms.WEB, Platforms.WIN32, Platforms.LINUX)
+        return Platforms.CFG_CLASS_MAP.keys()
 
     def __init__(self, project, current):
         self._project = project
@@ -218,15 +224,21 @@ def __init__(self, project, current):
 
     def _filter_platforms(self, platforms):
         ret = []
+        platforms_for_os = {
+            "linux" : [ Platforms.WEB, Platforms.LINUX, Platforms.ANDROID ],
+            "mac" : [ Platforms.WEB, Platforms.IOS, Platforms.MAC, Platforms.ANDROID ],
+            "win32" : [ Platforms.WEB, Platforms.WIN32, Platforms.ANDROID, Platforms.WP8,
+                        Platforms.WP8_1, Platforms.METRO]
+        }
         for p in platforms:
             if cocos.os_is_linux():
-                if p == Platforms.WEB or p == Platforms.LINUX or p == Platforms.ANDROID:
+                if p in platforms_for_os["linux"]:
                     ret.append(p)
             if cocos.os_is_mac():
-                if p == Platforms.WEB or p == Platforms.IOS or p == Platforms.MAC or p == Platforms.ANDROID:
+                if p in platforms_for_os["mac"]:
                     ret.append(p)
             if cocos.os_is_win32():
-                if p == Platforms.WEB or p == Platforms.WIN32 or p == Platforms.ANDROID:
+                if p in platforms_for_os["win32"]:
                     ret.append(p)
 
         return ret
@@ -250,7 +262,7 @@ def _gen_available_platforms(self, proj_info):
                 else:
                     platform_list = [ Platforms.WEB ]
         elif self._project._is_cpp_project():
-            platform_list = [ Platforms.ANDROID, Platforms.WIN32, Platforms.IOS, Platforms.MAC, Platforms.LINUX ]
+            platform_list = [ Platforms.ANDROID, Platforms.WIN32, Platforms.IOS, Platforms.MAC, Platforms.LINUX, Platforms.WP8, Platforms.WP8_1, Platforms.METRO ]
 
         # filter the available platform list
         platform_list = self._filter_platforms(platform_list)
@@ -303,6 +315,15 @@ def is_win32_active(self):
     def is_linux_active(self):
         return self._current == Platforms.LINUX
 
+    def is_wp8_active(self):
+        return self._current == Platforms.WP8
+
+    def is_wp8_1_active(self):
+        return self._current == Platforms.WP8_1
+
+    def is_metro_active(self):
+        return self._current == Platforms.METRO
+
     def get_current_config(self):
         if self.none_active():
             return None
@@ -534,3 +555,99 @@ def _is_available(self):
         ret = super(WebConfig, self)._is_available()
 
         return ret
+
+class Wp8Config(PlatformConfig):
+    KEY_BUILD_FOLDER_PATH = "build_folder_path"
+    KEY_MANIFEST_PATH = "manifest_path"
+
+    def _use_default(self):
+        if self._is_script:
+            self.proj_path = os.path.join(self._proj_root_path, "frameworks", "runtime-src", "proj.wp8-xaml")
+        else:
+            self.proj_path = os.path.join(self._proj_root_path, "proj.wp8-xaml")
+
+        self.sln_file = None
+        self.project_name =None
+        self.build_folder_path = "App/Bin/x86"
+        self.manifest_path = "App/Properties/WMAppManifest.xml"
+
+    def _parse_info(self, cfg_info):
+        super(Wp8Config, self)._parse_info(cfg_info)
+        if cfg_info.has_key(Win32Config.KEY_SLN_FILE):
+            self.sln_file = cfg_info[Win32Config.KEY_SLN_FILE]
+        else:
+            self.sln_file = None
+
+        if cfg_info.has_key(Win32Config.KEY_PROJECT_NAME):
+            self.project_name = cfg_info[Win32Config.KEY_PROJECT_NAME]
+        else:
+            self.project_name = None
+
+        if cfg_info.has_key(Wp8Config.KEY_BUILD_FOLDER_PATH):
+            self.build_folder_path = cfg_info[Wp8Config.KEY_BUILD_FOLDER_PATH]
+        else:
+            self.build_folder_path = "App/Bin/x86"
+
+        if cfg_info.has_key(Wp8Config.KEY_MANIFEST_PATH):
+            self.manifest_path = cfg_info[Wp8Config.KEY_MANIFEST_PATH]
+        else:
+            self.manifest_path = "App/Properties/WMAppManifest.xml"
+
+    def _is_available(self):
+        ret = super(Wp8Config, self)._is_available()
+
+        return ret
+
+class Wp8_1Config(PlatformConfig):
+    def _use_default(self):
+        if self._is_script:
+            self.proj_path = os.path.join(self._proj_root_path, "frameworks", "runtime-src", "proj.win8.1-universal")
+        else:
+            self.proj_path = os.path.join(self._proj_root_path, "proj.win8.1-universal")
+
+        self.sln_file = None
+        self.project_name =None
+
+    def _parse_info(self, cfg_info):
+        super(Wp8_1Config, self)._parse_info(cfg_info)
+        if cfg_info.has_key(Win32Config.KEY_SLN_FILE):
+            self.sln_file = cfg_info[Win32Config.KEY_SLN_FILE]
+        else:
+            self.sln_file = None
+
+        if cfg_info.has_key(Win32Config.KEY_PROJECT_NAME):
+            self.project_name = cfg_info[Win32Config.KEY_PROJECT_NAME]
+        else:
+            self.project_name = None
+
+    def _is_available(self):
+        ret = super(Wp8_1Config, self)._is_available()
+
+        return ret
+
+class MetroConfig(PlatformConfig):
+    def _use_default(self):
+        if self._is_script:
+            self.proj_path = os.path.join(self._proj_root_path, "frameworks", "runtime-src", "proj.win8.1-universal")
+        else:
+            self.proj_path = os.path.join(self._proj_root_path, "proj.win8.1-universal")
+
+        self.sln_file = None
+        self.project_name =None
+
+    def _parse_info(self, cfg_info):
+        super(MetroConfig, self)._parse_info(cfg_info)
+        if cfg_info.has_key(Win32Config.KEY_SLN_FILE):
+            self.sln_file = cfg_info[Win32Config.KEY_SLN_FILE]
+        else:
+            self.sln_file = None
+
+        if cfg_info.has_key(Win32Config.KEY_PROJECT_NAME):
+            self.project_name = cfg_info[Win32Config.KEY_PROJECT_NAME]
+        else:
+            self.project_name = None
+
+    def _is_available(self):
+        ret = super(MetroConfig, self)._is_available()
+
+        return ret