remove unneeded codes (#436)

Author: minggo

bin/cocos_project.py

@@ -389,32 +389,19 @@ def _is_available(self):
         return ret
 
 class AndroidConfig(PlatformConfig):
-    KEY_STUDIO_PATH = "studio_proj_path"
 
     def _use_default(self):
         if self._is_script:
             self.proj_path = os.path.join(self._proj_root_path, "frameworks", "runtime-src", "proj.android")
-            self.studio_path = os.path.join(self._proj_root_path, "frameworks", "runtime-src", "proj.android-studio")
         else:
             self.proj_path = os.path.join(self._proj_root_path, "proj.android")
-            self.studio_path = os.path.join(self._proj_root_path, "proj.android-studio")
 
     def _parse_info(self, cfg_info):
         super(AndroidConfig, self)._parse_info(cfg_info)
 
-        if cfg_info.has_key(AndroidConfig.KEY_STUDIO_PATH):
-            self.studio_path = os.path.join(self._proj_root_path, cfg_info[AndroidConfig.KEY_STUDIO_PATH])
-        else:
-            self.studio_path = None
-
     def _is_available(self):
         proj_android_existed = super(AndroidConfig, self)._is_available()
-        proj_studio_existed = False
-        if (self.studio_path is not None) and os.path.isdir(self.studio_path):
-            proj_studio_existed = True
-
-        ret = (proj_android_existed or proj_studio_existed)
-        return ret
+        return proj_android_existed
 
 class iOSConfig(PlatformConfig):
     KEY_PROJ_FILE = "project_file"

plugins/plugin_compile/project_compile.py

@@ -115,14 +115,6 @@ def _add_custom_options(self, parser):
         group.add_argument("--lua-encrypt-sign", dest="lua_encrypt_sign",
                            help=MultiLanguage.get_string('COMPILE_ARG_LUA_ENCRYPT_SIGN'))
 
-        group = parser.add_argument_group(MultiLanguage.get_string('COMPILE_ARG_GROUP_TIZEN'))
-        group.add_argument("--tizen-arch", dest="tizen_arch", default="x86", choices=[ "x86", "arm" ], help=MultiLanguage.get_string('COMPILE_ARG_TIZEN_ARCH'))
-        # group.add_argument("--tizen-compiler", dest="tizen_compiler", choices=[ "llvm", "gcc" ], help=MultiLanguage.get_string('COMPILE_ARG_TIZEN_COMPILER'))
-        # group.add_argument("--tizen-pkgtype", dest="tizen_pkgtype", default="tpk", choices=[ "tpk", "wgt" ], help=MultiLanguage.get_string('COMPILE_ARG_TIZEN_PKGTYPE'))
-        group.add_argument("--tizen-profile", dest="tizen_profile", help=MultiLanguage.get_string('COMPILE_ARG_TIZEN_PROFILE'))
-        group.add_argument("--tizen-sign", dest="tizen_sign", help=MultiLanguage.get_string('COMPILE_ARG_TIZEN_SIGN'))
-        group.add_argument("--tizen-strip", dest="tizen_strip", action="store_true", help=MultiLanguage.get_string('COMPILE_ARG_TIZEN_STRIP'))
-
         category = self.plugin_category()
         name = self.plugin_name()
         usage = "\n\t%%prog %s %s -p <platform> [-s src_dir][-m <debug|release>]" \
@@ -165,15 +157,6 @@ def _check_custom_options(self, args):
         if args.target_name is not None:
             self.xcode_target_name = args.target_name
 
-        # Tizen arguments
-        self.tizen_arch = args.tizen_arch
-        # self.tizen_compiler = args.tizen_compiler
-        # self.tizen_pkgtype = args.tizen_pkgtype
-        self.tizen_pkgtype = 'tpk'
-        self.tizen_sign = args.tizen_sign
-        self.tizen_strip = args.tizen_strip
-        self.tizen_profile = args.tizen_profile
-
         if args.compile_script is not None:
             self._compile_script = bool(args.compile_script)
         else:
@@ -1492,90 +1475,6 @@ def build_metro(self):
         build_mode = 'Debug' if self._is_debug_mode() else 'Release'
         self.build_vs_project(projectPath, self.project_name, build_mode, self.vs_version)
 
-    def _build_tizen_proj(self, tizen_cmd_path, build_mode, proj_path):
-        build_native_cmd = "%s build-native -- \"%s\"" % (tizen_cmd_path, proj_path)
-        build_native_cmd += " -C %s" % build_mode
-        build_native_cmd += " -a %s" % self.tizen_arch
-
-        # if self.tizen_compiler is not None:
-        #     build_native_cmd += " -c %s" % self.tizen_compiler
-        # TODO now only support gcc
-        build_native_cmd += " -c gcc"
-
-        self._run_cmd(build_native_cmd)
-
-    def build_tizen(self):
-        if not self._platforms.is_tizen_active():
-            return
-
-        tizen_studio_path = cocos.check_environment_variable("TIZEN_STUDIO_HOME")
-        tizen_proj_path = self._platforms.project_path()
-        tizen_cmd_path = cocos.CMDRunner.convert_path_to_cmd(os.path.join(tizen_studio_path, "tools", "ide", "bin", "tizen"))
-        build_mode = 'Debug' if self._is_debug_mode() else 'Release'
-
-        # build library projects
-        build_cfg_data = self._get_build_cfg()
-        if build_cfg_data.has_key('depend_projs'):
-            lib_projs = build_cfg_data['depend_projs']
-            for proj in lib_projs:
-                proj_path = os.path.normpath(os.path.join(self._build_cfg_path(), proj))
-                self._build_tizen_proj(tizen_cmd_path, build_mode, proj_path)
-
-        # build the game project
-        self._build_tizen_proj(tizen_cmd_path, build_mode, tizen_proj_path)
-
-        # copy resources files
-        res_path = os.path.join(tizen_proj_path, 'res')
-        self._copy_resources(res_path)
-
-        # check the project config & compile the script files
-        if self._project._is_js_project():
-            self.compile_js_scripts(res_path, res_path)
-
-        if self._project._is_lua_project():
-            self.compile_lua_scripts(res_path, res_path, False)
-
-        # config the profile path
-        if self.tizen_profile is not None:
-            config_cmd = "%s cli-config -g \"default.profiles.path=%s\"" % (tizen_cmd_path, self.tizen_profile)
-            self._run_cmd(config_cmd)
-
-        # invoke tizen package
-        build_cfg_path = os.path.join(tizen_proj_path, build_mode)
-        if not os.path.isdir(build_cfg_path):
-            raise cocos.CCPluginError(MultiLanguage.get_string('COMPILE_ERROR_TIZEN_NO_FILE_FMT', build_cfg_path))
-
-        package_cmd = "%s package -- \"%s\" -t %s" % (tizen_cmd_path, build_cfg_path, self.tizen_pkgtype)
-        if self.tizen_sign is not None:
-            package_cmd += " -s \"%s\"" % self.tizen_sign
-
-        if self.tizen_strip:
-            package_cmd += " -S on"
-
-        self._run_cmd(package_cmd)
-
-        # get the package path
-        from xml.dom import minidom
-        doc = minidom.parse(os.path.join(tizen_proj_path, "tizen-manifest.xml"))
-        pkgid = doc.getElementsByTagName("manifest")[0].getAttribute("package")
-        version = doc.getElementsByTagName("manifest")[0].getAttribute("version")
-
-        if self.tizen_arch == "arm":
-            arch_str = "arm"
-        else:
-            arch_str = "i386"
-
-        pkg_file_name = "%s-%s-%s.%s" % (pkgid, version, arch_str, self.tizen_pkgtype)
-        tizen_pkg_path = os.path.join(tizen_proj_path, build_mode, pkg_file_name)
-        if not os.path.isfile(tizen_pkg_path):
-            raise cocos.CCPluginError(MultiLanguage.get_string('COMPILE_ERROR_TIZEN_BUILD_FAILED'))
-
-        # copy the package into output dir
-        if not os.path.exists(self._output_dir):
-            os.makedirs(self._output_dir)
-        shutil.copy(tizen_pkg_path, self._output_dir)
-        self.tizen_pkg_path = os.path.join(self._output_dir, pkg_file_name)
-
     def _get_build_cfg(self):
         build_cfg_dir = self._build_cfg_path()
         build_cfg = os.path.join(build_cfg_dir, CCPluginCompile.BUILD_CONFIG_FILE)
@@ -1630,7 +1529,6 @@ def run(self, argv, dependencies):
         self.build_web()
         self.build_linux()
         self.build_metro()
-        self.build_tizen()
 
         # invoke the custom step: post-build
         self._project.invoke_custom_step_script(cocos_project.Project.CUSTOM_STEP_POST_BUILD, target_platform, args_build_copy)