diff --git a/build/cocos2d_jsb_samples.xcodeproj/project.pbxproj b/build/cocos2d_jsb_samples.xcodeproj/project.pbxproj index 3583e04970..c122cfe643 100644 --- a/build/cocos2d_jsb_samples.xcodeproj/project.pbxproj +++ b/build/cocos2d_jsb_samples.xcodeproj/project.pbxproj @@ -220,8 +220,6 @@ BAC50CBD1924AEFF00C57B6B /* jsb_ext_create_apis.js in Resources */ = {isa = PBXBuildFile; fileRef = BAC50CBB1924AEFF00C57B6B /* jsb_ext_create_apis.js */; }; BAC50CBE1924AEFF00C57B6B /* jsb_ext_create_apis.js in Resources */ = {isa = PBXBuildFile; fileRef = BAC50CBB1924AEFF00C57B6B /* jsb_ext_create_apis.js */; }; BAC50CBF1924AEFF00C57B6B /* jsb_ext_create_apis.js in Resources */ = {isa = PBXBuildFile; fileRef = BAC50CBB1924AEFF00C57B6B /* jsb_ext_create_apis.js */; }; - BAD138DF191F1BB0007733DD /* project.manifest in Resources */ = {isa = PBXBuildFile; fileRef = BAD138DE191F1BB0007733DD /* project.manifest */; }; - BAD138E0191F1BB0007733DD /* project.manifest in Resources */ = {isa = PBXBuildFile; fileRef = BAD138DE191F1BB0007733DD /* project.manifest */; }; D60AE43817F9143D00757E4B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; }; ED743D1717D099F10004076B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; }; /* End PBXBuildFile section */ @@ -610,7 +608,6 @@ BAA7DEE218C84F5000D9A10E /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.js; path = "../samples/js-tests/main.js"; sourceTree = ""; }; BAA7DEE318C84F5000D9A10E /* project.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = project.json; path = "../samples/js-tests/project.json"; sourceTree = ""; }; BAC50CBB1924AEFF00C57B6B /* jsb_ext_create_apis.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_ext_create_apis.js; path = "../frameworks/js-bindings/bindings/script/jsb_ext_create_apis.js"; sourceTree = ""; }; - BAD138DE191F1BB0007733DD /* project.manifest */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = project.manifest; path = "../samples/js-tests/project.manifest"; sourceTree = ""; }; D60AE43317F7FFE100757E4B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; EDCC747E17C455FD007B692C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -863,7 +860,6 @@ 1A604F2E18BF1D3300CC9A93 /* js-tests */ = { isa = PBXGroup; children = ( - BAD138DE191F1BB0007733DD /* project.manifest */, BAA7DEE218C84F5000D9A10E /* main.js */, 1A2B72DA18D294AE00ED9E74 /* project */, BAA7DEE318C84F5000D9A10E /* project.json */, @@ -1443,7 +1439,6 @@ A63D2EC818C856BE00B29B8F /* jsb_boot.js in Resources */, A63D2ECF18C8B36600B29B8F /* jsb_loaders.js in Resources */, BAA7DEE518C84F5000D9A10E /* main.js in Resources */, - BAD138E0191F1BB0007733DD /* project.manifest in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1459,7 +1454,6 @@ BAA7DEE618C84F5000D9A10E /* project.json in Resources */, 1A487B6C18BF3EDF007EEB98 /* jsb.js in Resources */, 1A487B6D18BF3EDF007EEB98 /* jsb_chipmunk.js in Resources */, - BAD138DF191F1BB0007733DD /* project.manifest in Resources */, 1A487B6E18BF3EDF007EEB98 /* jsb_chipmunk_constants.js in Resources */, 1A487B6F18BF3EDF007EEB98 /* jsb_cocos2d.js in Resources */, 1A487B7018BF3EDF007EEB98 /* jsb_cocos2d_constants.js in Resources */, diff --git a/frameworks/js-bindings/cocos2d-x b/frameworks/js-bindings/cocos2d-x index eee2cee8e8..f2fc5e8642 160000 --- a/frameworks/js-bindings/cocos2d-x +++ b/frameworks/js-bindings/cocos2d-x @@ -1 +1 @@ -Subproject commit eee2cee8e82dd080bf77530e3e76a732d29f9a28 +Subproject commit f2fc5e8642ceed7adad1318bf87a1ccba2fe0269 diff --git a/samples/js-tests/project.manifest b/samples/js-tests/project.manifest deleted file mode 100644 index f37ade21d3..0000000000 --- a/samples/js-tests/project.manifest +++ /dev/null @@ -1,47 +0,0 @@ -{ - "remoteManifestUrl" : "http://tools.itharbors.com/assets_manager/project.manifest", - "remoteVersionUrl" : "http://tools.itharbors.com/assets_manager/version.manifest", - "version" : "1.1.0", - "groupVersions" : { - "1" : "1.1.0", - "2" : "1.0.0" - }, - "engineVersion" : "3.0 alpha2", - - "assets" : { - "main_js" : { - "path" : "main.js", - "md5" : "...", - "group" : "1" - }, - - "close_png" : { - "path" : "res/CloseNormal.png", - "md5" : "...", - "group" : "2" - }, - - "app_js" : { - "compressed" : true, - "compressedFile" : "jsfiles", - "path" : "src/test-main.js", - "md5" : "...", - "group" : "1" - }, - - "enemy_js" : { - "compressed" : true, - "compressedFile" : "jsfiles", - "path" : "src/tests_resources.js", - "md5" : "...", - "group" : "1" - } - }, - - "compressedFiles" : { - "jsfiles" : { - "compression" : "zip", - "path" : "src/jsfiles.zip" - } - } -} \ No newline at end of file diff --git a/samples/js-tests/res/Images/background1.jpg b/samples/js-tests/res/Images/background1.jpg new file mode 100755 index 0000000000..4dc6f5683e Binary files /dev/null and b/samples/js-tests/res/Images/background1.jpg differ diff --git a/samples/js-tests/res/Images/background2.jpg b/samples/js-tests/res/Images/background2.jpg new file mode 100755 index 0000000000..d04c7f9966 Binary files /dev/null and b/samples/js-tests/res/Images/background2.jpg differ diff --git a/samples/js-tests/res/Images/background3.jpg b/samples/js-tests/res/Images/background3.jpg new file mode 100755 index 0000000000..5cd54279f3 Binary files /dev/null and b/samples/js-tests/res/Images/background3.jpg differ diff --git a/samples/js-tests/res/Manifests/AMTestScene1/project.manifest b/samples/js-tests/res/Manifests/AMTestScene1/project.manifest index eb1a76fff2..a22ca68660 100644 --- a/samples/js-tests/res/Manifests/AMTestScene1/project.manifest +++ b/samples/js-tests/res/Manifests/AMTestScene1/project.manifest @@ -12,6 +12,6 @@ }, "searchPaths" : [ - "res/" + "../../../res/" ] } \ No newline at end of file diff --git a/samples/js-tests/res/Manifests/AMTestScene2/project.manifest b/samples/js-tests/res/Manifests/AMTestScene2/project.manifest index 81c98fff2b..2c14382e60 100644 --- a/samples/js-tests/res/Manifests/AMTestScene2/project.manifest +++ b/samples/js-tests/res/Manifests/AMTestScene2/project.manifest @@ -11,6 +11,6 @@ }, "searchPaths" : [ - "res/" + "../../../res/" ] } \ No newline at end of file diff --git a/samples/js-tests/res/Manifests/AMTestScene3/project.manifest b/samples/js-tests/res/Manifests/AMTestScene3/project.manifest index b8b2a025fc..1edf40dd51 100644 --- a/samples/js-tests/res/Manifests/AMTestScene3/project.manifest +++ b/samples/js-tests/res/Manifests/AMTestScene3/project.manifest @@ -12,6 +12,6 @@ }, "searchPaths" : [ - "res/" + "../../../res/" ] } \ No newline at end of file diff --git a/samples/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js b/samples/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js index 3767210d6f..99c768c021 100644 --- a/samples/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js +++ b/samples/js-tests/src/ExtensionsTest/AssetsManagerTest/AssetsManagerTest.js @@ -95,6 +95,8 @@ var AssetsManagerTestScene = TestScene.extend({ var AssetsManagerLoaderScene = TestScene.extend({ _am : null, + _progress : null, + _percent : 0, runThisTest : function () { var manifestPath = sceneManifests[currentScene]; @@ -108,10 +110,10 @@ var AssetsManagerLoaderScene = TestScene.extend({ icon.y = cc.winSize.height/2; layer.addChild(icon); - var progress = new cc.LabelTTF("0%", "Arial", 30); - progress.x = cc.winSize.width/2; - progress.y = cc.winSize.height/2 + 50; - layer.addChild(progress); + this._progress = new cc.LabelTTF("0%", "Arial", 30); + this._progress.x = cc.winSize.width/2; + this._progress.y = cc.winSize.height/2 + 50; + layer.addChild(this._progress); this._am = new cc.AssetsManager(manifestPath, storagePath); this._am.retain(); @@ -124,6 +126,7 @@ var AssetsManagerLoaderScene = TestScene.extend({ } else { + var that = this; var listener = new cc.EventListenerAssetsManager(this._am, function(event) { var scene; switch (event.getEventCode()) @@ -135,8 +138,7 @@ var AssetsManagerLoaderScene = TestScene.extend({ scene.release(); break; case cc.EventAssetsManager.UPDATE_PROGRESSION: - var percent = event.getPercent(); - progress.string = ""+percent; + that._percent = event.getPercent(); break; case cc.EventAssetsManager.ERROR_DOWNLOAD_MANIFEST: case cc.EventAssetsManager.ERROR_PARSE_MANIFEST: @@ -166,6 +168,12 @@ var AssetsManagerLoaderScene = TestScene.extend({ cc.director.runScene(this); } + + this.schedule(this.updateProgress, 0.5); + }, + + updateProgress : function(dt){ + this._progress.string = "" + this._percent; }, onExit : function () { diff --git a/samples/js-tests/src/GUITest/UIListViewTest/UIListViewTest.js b/samples/js-tests/src/GUITest/UIListViewTest/UIListViewTest.js index fcde9542d3..b1d414459a 100644 --- a/samples/js-tests/src/GUITest/UIListViewTest/UIListViewTest.js +++ b/samples/js-tests/src/GUITest/UIListViewTest/UIListViewTest.js @@ -58,6 +58,7 @@ var UIListViewTest_Vertical = UIScene.extend({ var default_item = ccui.Layout.create(); default_item.setTouchEnabled(true); default_item.setSize(default_button.getSize()); + default_item.width = listView.width; default_button.x = default_item.width / 2; default_button.y = default_item.height / 2; default_item.addChild(default_button); @@ -86,6 +87,7 @@ var UIListViewTest_Vertical = UIScene.extend({ var custom_item = ccui.Layout.create(); custom_item.setSize(custom_button.getSize()); + custom_item.width = listView.width; custom_button.x = custom_item.width / 2; custom_button.y = custom_item.height / 2; custom_item.addChild(custom_button); @@ -105,6 +107,7 @@ var UIListViewTest_Vertical = UIScene.extend({ var custom_item = ccui.Layout.create(); custom_item.setSize(custom_button.getSize()); + custom_item.width = listView.width; custom_button.x = custom_item.width / 2; custom_button.y = custom_item.height / 2; custom_item.addChild(custom_button); diff --git a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index a53e7ae7a5..78672e1901 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -67,6 +67,8 @@ A922754C1517C094001B78AA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754B1517C094001B78AA /* UIKit.framework */; }; A922754E1517C094001B78AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754D1517C094001B78AA /* Foundation.framework */; }; A92275501517C094001B78AA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754F1517C094001B78AA /* CoreGraphics.framework */; }; + BA6FEC4C19335FF300F5D174 /* jsb_ext_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */; }; + BA6FEC4D19335FF300F5D174 /* jsb_ext_create_apis.js in Resources */ = {isa = PBXBuildFile; fileRef = BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */; }; C03780EB18BEE0E400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03780EA18BEE0E400FE4F13 /* src */; }; C03780EC18BEE0E400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03780EA18BEE0E400FE4F13 /* src */; }; C037820C18BF77C500FE4F13 /* libjsbindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C037820918BF76AF00FE4F13 /* libjsbindings iOS.a */; }; @@ -317,6 +319,7 @@ A922754B1517C094001B78AA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; A922754D1517C094001B78AA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; A922754F1517C094001B78AA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_ext_create_apis.js; path = "../../js-bindings/bindings/script/jsb_ext_create_apis.js"; sourceTree = ""; }; C03780EA18BEE0E400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; C037820118BF76AF00FE4F13 /* cocos2d_js_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_js_bindings.xcodeproj; path = "../../js-bindings/bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj"; sourceTree = ""; }; C06E23CB18CEFE680093C81A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; @@ -524,6 +527,7 @@ C0F9A1A218C6D1FC00C75ABD /* jsb_cocos2d_studio.js */, C0F9A1A418C6D1FC00C75ABD /* jsb_cocosbuilder.js */, 1AC34A0E18C99CA5007834C9 /* jsb_create_apis.js */, + BA6FEC4B19335FF300F5D174 /* jsb_ext_create_apis.js */, C0F9A1A518C6D1FC00C75ABD /* jsb_debugger.js */, C0F9A1A618C6D1FC00C75ABD /* jsb_deprecated.js */, 1AC34A0F18C99CA5007834C9 /* jsb_loaders.js */, @@ -747,6 +751,7 @@ 1AD7E0A918C9DBE3004817A6 /* main.js in Resources */, 1AD7E0A118C9DB84004817A6 /* jsb_boot.js in Resources */, 1AD7E0A218C9DB84004817A6 /* jsb_create_apis.js in Resources */, + BA6FEC4D19335FF300F5D174 /* jsb_ext_create_apis.js in Resources */, 1AD7E0A318C9DB84004817A6 /* jsb_loaders.js in Resources */, C0F9A1BC18C6D1FC00C75ABD /* jsb_cocos2d.js in Resources */, C0F9A1C418C6D1FC00C75ABD /* jsb_opengl_constants.js in Resources */, @@ -836,6 +841,7 @@ D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */, 509D4AC817EBB2AB00697056 /* main.m in Sources */, 509D4ABC17EBB2AB00697056 /* AppController.mm in Sources */, + BA6FEC4C19335FF300F5D174 /* jsb_ext_create_apis.js in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -913,7 +919,7 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; }; name = Debug; }; @@ -934,7 +940,7 @@ LIBRARY_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/mac $(SRCROOT)/../../js-bindings/cocos2d-x/external/glfw3/include/mac $(SRCROOT)/../../js-bindings/external/spidermonkey/include/mac"; }; name = Release; }; @@ -1006,7 +1012,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; }; name = Debug; }; @@ -1029,7 +1035,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/2d/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../js-bindings/cocos2d-x/cocos/platform/ios $(SRCROOT)/../../js-bindings/external/spidermonkey/include/ios"; }; name = Release; }; diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index 1bb76f0d17..1f59e57642 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -82,43 +82,24 @@ C0B29017192EEBB300D5DE97 /* rtres in Resources */ = {isa = PBXBuildFile; fileRef = C0B29016192EEBB300D5DE97 /* rtres */; }; C0B29018192EEBB300D5DE97 /* rtres in Resources */ = {isa = PBXBuildFile; fileRef = C0B29016192EEBB300D5DE97 /* rtres */; }; C0C2F37418AA0C66003976DA /* SimulatorApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C2F37318AA0C66003976DA /* SimulatorApp.mm */; }; - C0E05756192B5EDB00D818D0 /* jsb_boot.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05743192B5EDB00D818D0 /* jsb_boot.js */; }; C0E05757192B5EDB00D818D0 /* jsb_boot.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05743192B5EDB00D818D0 /* jsb_boot.js */; }; - C0E05758192B5EDB00D818D0 /* jsb_chipmunk_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05744192B5EDB00D818D0 /* jsb_chipmunk_constants.js */; }; C0E05759192B5EDB00D818D0 /* jsb_chipmunk_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05744192B5EDB00D818D0 /* jsb_chipmunk_constants.js */; }; - C0E0575A192B5EDB00D818D0 /* jsb_chipmunk.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05745192B5EDB00D818D0 /* jsb_chipmunk.js */; }; C0E0575B192B5EDB00D818D0 /* jsb_chipmunk.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05745192B5EDB00D818D0 /* jsb_chipmunk.js */; }; - C0E0575C192B5EDB00D818D0 /* jsb_cocos2d_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05746192B5EDB00D818D0 /* jsb_cocos2d_constants.js */; }; C0E0575D192B5EDB00D818D0 /* jsb_cocos2d_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05746192B5EDB00D818D0 /* jsb_cocos2d_constants.js */; }; - C0E0575E192B5EDB00D818D0 /* jsb_cocos2d_extension.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05747192B5EDB00D818D0 /* jsb_cocos2d_extension.js */; }; C0E0575F192B5EDB00D818D0 /* jsb_cocos2d_extension.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05747192B5EDB00D818D0 /* jsb_cocos2d_extension.js */; }; - C0E05760192B5EDB00D818D0 /* jsb_cocos2d_studio.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05748192B5EDB00D818D0 /* jsb_cocos2d_studio.js */; }; C0E05761192B5EDB00D818D0 /* jsb_cocos2d_studio.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05748192B5EDB00D818D0 /* jsb_cocos2d_studio.js */; }; - C0E05762192B5EDB00D818D0 /* jsb_cocos2d_ui.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05749192B5EDB00D818D0 /* jsb_cocos2d_ui.js */; }; C0E05763192B5EDB00D818D0 /* jsb_cocos2d_ui.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05749192B5EDB00D818D0 /* jsb_cocos2d_ui.js */; }; - C0E05764192B5EDB00D818D0 /* jsb_cocos2d.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574A192B5EDB00D818D0 /* jsb_cocos2d.js */; }; C0E05765192B5EDB00D818D0 /* jsb_cocos2d.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574A192B5EDB00D818D0 /* jsb_cocos2d.js */; }; - C0E05766192B5EDB00D818D0 /* jsb_cocosbuilder.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574B192B5EDB00D818D0 /* jsb_cocosbuilder.js */; }; C0E05767192B5EDB00D818D0 /* jsb_cocosbuilder.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574B192B5EDB00D818D0 /* jsb_cocosbuilder.js */; }; - C0E05768192B5EDB00D818D0 /* jsb_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574C192B5EDB00D818D0 /* jsb_create_apis.js */; }; C0E05769192B5EDB00D818D0 /* jsb_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574C192B5EDB00D818D0 /* jsb_create_apis.js */; }; - C0E0576A192B5EDB00D818D0 /* jsb_debugger.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574D192B5EDB00D818D0 /* jsb_debugger.js */; }; C0E0576B192B5EDB00D818D0 /* jsb_debugger.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574D192B5EDB00D818D0 /* jsb_debugger.js */; }; - C0E0576C192B5EDB00D818D0 /* jsb_deprecated.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574E192B5EDB00D818D0 /* jsb_deprecated.js */; }; C0E0576D192B5EDB00D818D0 /* jsb_deprecated.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574E192B5EDB00D818D0 /* jsb_deprecated.js */; }; - C0E0576E192B5EDB00D818D0 /* jsb_ext_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574F192B5EDB00D818D0 /* jsb_ext_create_apis.js */; }; C0E0576F192B5EDB00D818D0 /* jsb_ext_create_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E0574F192B5EDB00D818D0 /* jsb_ext_create_apis.js */; }; - C0E05770192B5EDB00D818D0 /* jsb_loaders.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05750192B5EDB00D818D0 /* jsb_loaders.js */; }; C0E05771192B5EDB00D818D0 /* jsb_loaders.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05750192B5EDB00D818D0 /* jsb_loaders.js */; }; - C0E05772192B5EDB00D818D0 /* jsb_opengl_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05751192B5EDB00D818D0 /* jsb_opengl_constants.js */; }; C0E05773192B5EDB00D818D0 /* jsb_opengl_constants.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05751192B5EDB00D818D0 /* jsb_opengl_constants.js */; }; - C0E05774192B5EDB00D818D0 /* jsb_opengl.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05752192B5EDB00D818D0 /* jsb_opengl.js */; }; C0E05775192B5EDB00D818D0 /* jsb_opengl.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05752192B5EDB00D818D0 /* jsb_opengl.js */; }; - C0E05776192B5EDB00D818D0 /* jsb_property_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05753192B5EDB00D818D0 /* jsb_property_apis.js */; }; C0E05777192B5EDB00D818D0 /* jsb_property_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05753192B5EDB00D818D0 /* jsb_property_apis.js */; }; - C0E05778192B5EDB00D818D0 /* jsb_property_impls.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05754192B5EDB00D818D0 /* jsb_property_impls.js */; }; C0E05779192B5EDB00D818D0 /* jsb_property_impls.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05754192B5EDB00D818D0 /* jsb_property_impls.js */; }; - C0E0577A192B5EDB00D818D0 /* jsb.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05755192B5EDB00D818D0 /* jsb.js */; }; C0E0577B192B5EDB00D818D0 /* jsb.js in Sources */ = {isa = PBXBuildFile; fileRef = C0E05755192B5EDB00D818D0 /* jsb.js */; }; C0E0577C192B5EF200D818D0 /* jsb_boot.js in Resources */ = {isa = PBXBuildFile; fileRef = C0E05743192B5EDB00D818D0 /* jsb_boot.js */; }; C0E0577D192B5EF200D818D0 /* jsb_chipmunk_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = C0E05744192B5EDB00D818D0 /* jsb_chipmunk_constants.js */; }; @@ -943,32 +924,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C0E05766192B5EDB00D818D0 /* jsb_cocosbuilder.js in Sources */, 509D4AC917EBB2AB00697056 /* RootViewController.mm in Sources */, - C0E05758192B5EDB00D818D0 /* jsb_chipmunk_constants.js in Sources */, D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */, - C0E0577A192B5EDB00D818D0 /* jsb.js in Sources */, C06C37881918E81100617BED /* ConfigParser.cpp in Sources */, - C0E05778192B5EDB00D818D0 /* jsb_property_impls.js in Sources */, - C0E05764192B5EDB00D818D0 /* jsb_cocos2d.js in Sources */, 509D4AC817EBB2AB00697056 /* main.m in Sources */, - C0E05756192B5EDB00D818D0 /* jsb_boot.js in Sources */, - C0E05762192B5EDB00D818D0 /* jsb_cocos2d_ui.js in Sources */, - C0E0575A192B5EDB00D818D0 /* jsb_chipmunk.js in Sources */, C033B524191B36AE00D06937 /* VisibleRect.cpp in Sources */, - C0E05774192B5EDB00D818D0 /* jsb_opengl.js in Sources */, - C0E05770192B5EDB00D818D0 /* jsb_loaders.js in Sources */, - C0E05776192B5EDB00D818D0 /* jsb_property_apis.js in Sources */, - C0E0576C192B5EDB00D818D0 /* jsb_deprecated.js in Sources */, - C0E05768192B5EDB00D818D0 /* jsb_create_apis.js in Sources */, 509D4ABC17EBB2AB00697056 /* AppController.mm in Sources */, C026DCC918928A2400B3EDE8 /* Runtime_ios-mac.mm in Sources */, - C0E0576A192B5EDB00D818D0 /* jsb_debugger.js in Sources */, - C0E0576E192B5EDB00D818D0 /* jsb_ext_create_apis.js in Sources */, - C0E05772192B5EDB00D818D0 /* jsb_opengl_constants.js in Sources */, - C0E05760192B5EDB00D818D0 /* jsb_cocos2d_studio.js in Sources */, - C0E0575E192B5EDB00D818D0 /* jsb_cocos2d_extension.js in Sources */, - C0E0575C192B5EDB00D818D0 /* jsb_cocos2d_constants.js in Sources */, C026DCC618928A1A00B3EDE8 /* Runtime.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 29cfa00a4b..b564b873b9 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 29cfa00a4b85f934eefe0b2fae460bd9a55ee345 +Subproject commit b564b873b90e73b3ef6c98c31d5943b359e103ec diff --git a/tools/tojs/genbindings.py b/tools/tojs/genbindings.py index db351eec1b..2b647611c9 100755 --- a/tools/tojs/genbindings.py +++ b/tools/tojs/genbindings.py @@ -142,6 +142,15 @@ def main(): command = '%s %s %s -s %s -t %s -o %s -n %s' % (python_bin, generator_py, cfg, args[0], target, output_dir, args[1]) _run_cmd(command) + output_dir = '%s/frameworks/custom/auto' % project_root + custom_cmd_args = {} + for key in custom_cmd_args.keys(): + args = custom_cmd_args[key] + cfg = '%s/%s' % (tojs_root, key) + print 'Generating bindings for %s...' % (key[:-4]) + command = '%s %s %s -s %s -t %s -o %s -n %s' % (python_bin, generator_py, cfg, args[0], target, output_dir, args[1]) + _run_cmd(command) + if platform == 'win32': with _pushd(output_dir): _run_cmd('dos2unix *')