diff --git a/templates/js-template-default/cocos-project-template.json b/templates/js-template-default/cocos-project-template.json index a19eb38efc37..11f9116ab01d 100644 --- a/templates/js-template-default/cocos-project-template.json +++ b/templates/js-template-default/cocos-project-template.json @@ -2,6 +2,12 @@ "do_default":{ "exclude_from_template":[ "frameworks/runtime-src" + ], + "append_dir": [ + { + "from": "web", + "to": "frameworks/cocos2d-html5" + } ] }, "do_add_native_support":{ diff --git a/templates/js-template-default/project.json b/templates/js-template-default/project.json index 6a7f37a61e9c..e54f8706601e 100644 --- a/templates/js-template-default/project.json +++ b/templates/js-template-default/project.json @@ -6,7 +6,7 @@ "frameRate" : 60, "id" : "gameCanvas", "renderMode" : 0, - "engineDir":"frameworks/cocos2d-x/web", + "engineDir":"frameworks/cocos2d-html5", "modules" : ["cocos2d"], diff --git a/templates/js-template-runtime/cocos-project-template.json b/templates/js-template-runtime/cocos-project-template.json index bd0493afb633..133594b49ceb 100644 --- a/templates/js-template-runtime/cocos-project-template.json +++ b/templates/js-template-runtime/cocos-project-template.json @@ -12,132 +12,8 @@ }, "append_dir":[ { - "from":"plugin/plugins/facebook/proj.android/DependProject/src", - "to":"frameworks/cocos2d-x/plugin/plugins/facebook/proj.android/DependProject/src" - }, - { - "from":"cocos/scripting/js-bindings/script", - "to":"runtime/mac/PrebuiltRuntimeJs.app/Contents/Resources/script", - "exclude":[] - }, - { - "from":"cocos/scripting/js-bindings/script", - "to":"runtime/ios/PrebuiltRuntimeJs.app/script", - "exclude":[] - }, - { - "from":"cocos/scripting/js-bindings/script", - "to":"runtime/win32/script", - "exclude":[] - }, - { - "from":"templates/js-template-runtime/src", - "to":"runtime/win32/src", - "exclude":[] - }, - { - "from":"templates/js-template-runtime/res", - "to":"runtime/win32/res", - "exclude":[] - }, - { - "from":"external/win32-specific/gles/prebuilt", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/win32-specific/icon/prebuilt", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/win32-specific/MP3Decoder/prebuilt", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/win32-specific/OggDecoder/prebuilt", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/win32-specific/OpenalSoft/prebuilt", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/win32-specific/zlib/prebuilt", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/curl/prebuilt/win32", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/sqlite3/libraries/win32", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/websockets/prebuilt/win32", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/tiff/prebuilt/win32", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - }, - { - "from":"external/spidermonkey/prebuilt/win32", - "to":"runtime/win32", - "include": [ - "*.dll" - ] - } - ], - "append_file":[ - { - "from":"tools/simulator/frameworks/runtime-src/Classes/ide-support/lang", - "to":"runtime/win32/lang" - }, - { - "from":"templates/js-template-runtime/project.json", - "to":"runtime/ios/PrebuiltRuntimeJs.app/project.json" - }, - { - "from":"templates/js-template-runtime/project.json", - "to":"runtime/win32/project.json" - }, - { - "from":"templates/js-template-runtime/config.json", - "to":"runtime/win32/config.json" - }, - { - "from":"templates/js-template-runtime/main.js", - "to":"runtime/win32/main.js" + "from": "web", + "to": "frameworks/cocos2d-html5" } ] }, diff --git a/templates/js-template-runtime/index.html b/templates/js-template-runtime/index.html new file mode 100644 index 000000000000..42074ad179da --- /dev/null +++ b/templates/js-template-runtime/index.html @@ -0,0 +1,28 @@ + + + + + Cocos2d-html5 Hello World test + + + + + + + + + + + + + + + diff --git a/templates/js-template-runtime/runtime/config.json b/templates/js-template-runtime/runtime/config.json deleted file mode 100644 index 1449e545c172..000000000000 --- a/templates/js-template-runtime/runtime/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version":"v4-js-runtime-1.0", - "zip_file_size":"43441816", - "repo_name":"cocos-runtime-bin", - "repo_parent":"https://github.com/natural-law/" -} diff --git a/tools/travis-scripts/config.gitingore b/tools/travis-scripts/config.gitingore index 353a34f319af..0bdd37991aa4 100644 --- a/tools/travis-scripts/config.gitingore +++ b/tools/travis-scripts/config.gitingore @@ -109,6 +109,9 @@ Device-Release/ # CTags tags +# Ignore web dir +/web + #include !/tools/cocos2d-console/console/bin/ !/plugin-x/plugin-x_ios.xcworkspace/ diff --git a/tools/travis-scripts/generate-template-files.py b/tools/travis-scripts/generate-template-files.py index 43df0dfc8775..29aea90a174e 100755 --- a/tools/travis-scripts/generate-template-files.py +++ b/tools/travis-scripts/generate-template-files.py @@ -45,7 +45,7 @@ def __init__(self): self.fileList_js=[] self.luaPath = ["cocos/scripting/lua-bindings", "external/lua", "tools/bindings-generator", "tools/tolua"] - self.jsPath = ["cocos/scripting/js-bindings", "external/spidermonkey", "tools/bindings-generator", "tools/tojs", "web"] + self.jsPath = ["cocos/scripting/js-bindings", "external/spidermonkey", "tools/bindings-generator", "tools/tojs" ] def readIngoreFile(self, fileName): """