Merge pull request #359 from natural-law/issue16083

Solve the error in command gen-templates & gen-simulator.

Author: minggo

plugins/plugin_generate/bin-templates/cpp-template-default/Classes/HelloWorldScene.cpp

@@ -1,5 +1,5 @@
 #include "HelloWorldScene.h"
-#include "cocostudio/CocoStudio.h"
+#include "editor-support/cocostudio/CocoStudio.h"
 #include "ui/CocosGUI.h"
 
 USING_NS_CC;

plugins/plugin_generate/bin-templates/cpp-template-default/proj.android/project.properties

@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-19
+

plugins/plugin_generate/bin-templates/js-template-runtime/cocos-project-template.json

@@ -20,8 +20,6 @@
          "project_replace_project_name":{
             "src_project_name":"HelloJavascript",
             "files":[
-                  "config.json",
-                  ".project",
                   "PROJECT_NAME.ccs"
                ]
             },
@@ -82,8 +80,6 @@
          "project_replace_project_name":{
             "src_project_name":"HelloJavascript",
             "files":[
-               "config.json",
-               ".project",
                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj",
                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.filters",
                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.user",
@@ -125,11 +121,6 @@
             "to": ""
          },
          "modify_files": [
-            {
-               "file_path": "config.json",
-               "pattern": "\\\"isLandscape\\\"\\s*:.*,",
-               "replace_string": "\"isLandscape\": false,"
-            },
             {
                "file_path": "main.js",
                "pattern": "setDesignResolutionSize\\(\\s*(\\d+),\\s*(\\d+),(.*)\\)",

plugins/plugin_generate/bin-templates/js-template-runtime/frameworks/runtime-src/proj.android/project.properties

@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-19
+

plugins/plugin_generate/bin-templates/lua-template-runtime/cocos-project-template.json

@@ -20,8 +20,6 @@
         "project_replace_project_name": {
             "src_project_name": "HelloLua",
             "files": [
-                "config.json",
-                ".project",
                 "PROJECT_NAME.ccs"
             ]
         },
@@ -60,8 +58,6 @@
         "project_replace_project_name": {
             "src_project_name": "HelloLua",
             "files": [
-                "config.json",
-                ".project",
                 "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj",
                 "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.filters",
                 "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.user",
@@ -103,11 +99,6 @@
             "to": ""
          },
          "modify_files": [
-            {
-               "file_path": "config.json",
-               "pattern": "\\\"isLandscape\\\"\\s*:.*,",
-               "replace_string": "\"isLandscape\": false,"
-            },
             {
                "file_path": "src/config.lua",
                "pattern": "width\\s*=.*,",

plugins/plugin_generate/bin-templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties

@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-19
+

plugins/plugin_generate/configs/gen_templates_config.json

@@ -43,7 +43,7 @@
             ]
         },
         {
-            "from": "templates/js-template-runtime",
+            "from": "templates/js-template-default",
             "to": "js-template-binary",
             "exclude": [
                 "*android-studio",
@@ -56,13 +56,6 @@
                 "runtime/*"
             ]
         },
-        {
-            "from": "tools/simulator/frameworks/runtime-src/Classes/ide-support",
-            "to": "lua-template-binary/frameworks/runtime-src/Classes/ide-support/",
-            "exclude": [
-                "RuntimeJsImpl.*"
-            ]
-        },
         {
             "from": "cocos/scripting/lua-bindings/manual",
             "to": "lua-template-binary/frameworks/runtime-src/Classes",
@@ -107,14 +100,6 @@
                 "js_module_register.h"
             ]
         },
-        {
-            "from": "tools/simulator/frameworks/runtime-src/Classes/ide-support",
-            "to": "js-template-binary/frameworks/runtime-src/Classes/ide-support/",
-            "exclude": [
-                "RuntimeLuaImpl.*",
-                "lua_debugger.*"
-            ]
-        },
         {
             "from": "tools/simulator/frameworks/runtime-src/proj.ios_mac/ios",
             "to": "js-template-binary/frameworks/runtime-src/proj.ios_mac/ios",
@@ -132,19 +117,6 @@
                 "build-cfg.json"
             ]
         },
-        {
-            "from": "tools/simulator/frameworks/runtime-src/proj.win32",
-            "to": "js-template-binary/frameworks/runtime-src/proj.win32/",
-            "include": [
-                "game.rc",
-                "main.cpp",
-                "main.h",
-                "res",
-                "resource.h",
-                "SimulatorWin.cpp",
-                "SimulatorWin.h"
-            ]
-        },
         {
             "from": "cocos/platform/android/java/src",
             "to": "cpp-template-binary/proj.android/src"
@@ -275,16 +247,6 @@
             "pattern": "\\\"modules\\\"[ \\t]*:[ \\t]*\\[(.*)\\]",
             "replace_string": "\"modules\" : [\\1, \"cocostudio\"]"
         },
-        {
-                "file_path": "js-template-binary/frameworks/runtime-src/Classes/ide-support/CodeIDESupport.h",
-                "pattern": "#define CC_CODE_IDE_DEBUG_SUPPORT 1",
-                "replace_string": "#define CC_CODE_IDE_DEBUG_SUPPORT 0"
-        },
-        {
-                "file_path": "lua-template-binary/frameworks/runtime-src/Classes/ide-support/CodeIDESupport.h",
-                "pattern": "#define CC_CODE_IDE_DEBUG_SUPPORT 1",
-                "replace_string": "#define CC_CODE_IDE_DEBUG_SUPPORT 0"
-        },
         {
             "file_path": "cpp-template-binary/proj.win32/cocos2dx.props",
             "pattern": "(libbox2d\\.lib;)|(libSpine\\.lib;)",

plugins/plugin_generate/gen_simulator.py

@@ -269,9 +269,6 @@ def compile_for_win32(self):
         if not os.path.isdir(win32_output_dir):
             os.makedirs(win32_output_dir)
 
-        lang_file_path = os.path.join(self.simulator_abs_path, "frameworks/runtime-src/Classes/ide-support/lang")
-        lang_copy_command = "xcopy /Y %s %s" % (self.convert_path_to_win32(lang_file_path), win32_output_dir)
-
         # get the vs version should be used
         if self.vs_version is None:
             ver_param = ''
@@ -286,14 +283,10 @@ def compile_for_win32(self):
                 " %s compile -p win32 -m debug --no-res --compile-script 0 %s" % (self.cocos_bin, ver_param),
                 " && xcopy /Y %s*.dll %s" % (win32_src_dir, win32_output_dir),
                 " && xcopy /Y %s*.exe %s" % (win32_src_dir, win32_output_dir),
-                " && %s" % (lang_copy_command),
                 " && if exist %s*.dll xcopy /Y %s*.dll %s" % (win32_dll_dir,win32_dll_dir,win32_output_dir)
             ])
         else:
-            command = ' '.join([
-                " %s compile -p win32 -m release --no-res --compile-script 0 -o %s %s" % (self.cocos_bin,win32_output_dir,ver_param),
-                " && %s" % (lang_copy_command),
-                ])
+            command = " %s compile -p win32 -m release --no-res --compile-script 0 -o %s %s" % (self.cocos_bin,win32_output_dir,ver_param)
 
         self._run_cmd(command, self.simulator_abs_path)
         self.build_log += MultiLanguage.get_string('GEN_SIM_BUILD_SUCCESS_FMT', ('Win32', self.mode))

plugins/plugin_generate/gen_templates.py

@@ -116,7 +116,6 @@ def gen_templates(self):
         self.modify_build_cfg()
 
         self.modify_version_json(os.path.join(dst_dir, "lua-template-binary/.settings/version.json"))
-        self.modify_version_json(os.path.join(dst_dir, "js-template-binary/.settings/version.json"))
 
         self.gen_template_config(dst_dir, self.version)
 
@@ -128,7 +127,8 @@ def modify_win32_maincpp(self):
         cpp_files = win32_cfg['main_cpps']
         link_libs_cfg = win32_cfg['link_libs']
 
-        check_pattern = r'^int[\s]+APIENTRY[\s]+_tWinMain'
+        check_pattern1 = r'^int[\s]+APIENTRY[\s]+_tWinMain'
+        check_pattern2 = r'^int[\s]+WINAPI[\s]+_tWinMain'
         for main_cpp in cpp_files:
             cpp_full_path = os.path.join(self.engine_template_dir, main_cpp)
 
@@ -146,7 +146,7 @@ def modify_win32_maincpp(self):
             new_lines = []
             for line in old_lines:
                 strip_line = line.strip()
-                if re.match(check_pattern, strip_line):
+                if re.match(check_pattern1, strip_line) or re.match(check_pattern2, strip_line):
                     new_lines.append('#if _MSC_VER > 1800\n')
                     for lib in link_libs:
                         new_lines.append('%s\n' % self.get_lib_str(lib, 2015))