Merge pull request #1697 from dumganhar/gles20

issue #1583: Updated the project configurations of TestJavascript for all supported platforms. Updated the submodule reference of cocos2d-js-tests.

samples/TestJavascript/Classes/AppDelegate.cpp

@@ -40,7 +40,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     
     CCScriptEngineProtocol *pEngine = ScriptingCore::getInstance();
     CCScriptEngineManager::sharedManager()->setScriptEngine(pEngine);
-    ScriptingCore::getInstance()->runScript("tests/tests-boot-jsb.js");
+    ScriptingCore::getInstance()->runScript("tests-boot-jsb.js");
        
     return true;
 }

samples/TestJavascript/cocos2d-js-tests

@@ -1 +1 @@
-Subproject commit 4d85fcd3a54085b2ea798c66a790825e3a1afaf0
+Subproject commit c61a76668dcff7296df2ba3ecb80619bf008d26d

samples/TestJavascript/proj.android/build_native.sh

@@ -69,14 +69,9 @@ fi
 mkdir "$APP_ANDROID_ROOT"/assets
 mkdir "$APP_ANDROID_ROOT"/assets/res
 
-# copy "cocos2d-js-tests/res" into "assets/res"
-cp -rf "$APP_ROOT"/cocos2d-js-tests/tests/res "$APP_ANDROID_ROOT"/assets
-
 # copy src/**/*.js from cocos2d-js-tests into assets' root
-cp -rf "$APP_ROOT"/cocos2d-js-tests/tests "$APP_ANDROID_ROOT"/assets
+cp -rf "$APP_ROOT"/cocos2d-js-tests/tests/* "$APP_ANDROID_ROOT"/assets
 
-# copy root js
-cp -rf "$APP_ROOT"/cocos2d-js-tests/tests/*.js "$APP_ANDROID_ROOT"/assets
 
 # copy bindings/*.js into assets' root
 cp -f "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets

samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -0,0 +1 @@
+a9d5159141c92d549c9d9e8c9fed53517792589d

samples/TestJavascript/proj.win32/TestJavascript.vcxproj

@@ -96,7 +96,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\lib\*
 if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes"
 mkdir "$(OutDir)\TestJavascriptRes"
 xcopy "$(ProjectDir)..\..\..\scripting\javascript\bindings\js\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y
-xcopy "$(ProjectDir)..\cocos2d-js-tests\tests" "$(OutDir)\TestJavascriptRes\tests\" /e /Y</Command>
+xcopy "$(ProjectDir)..\cocos2d-js-tests\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copy js and resource files.</Message>
@@ -149,7 +149,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\lib\*
 if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes"
 mkdir "$(OutDir)\TestJavascriptRes"
 xcopy "$(ProjectDir)..\..\..\scripting\javascript\bindings\js\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y
-xcopy "$(ProjectDir)..\cocos2d-js-tests\tests" "$(OutDir)\TestJavascriptRes\tests\" /e /Y</Command>
+xcopy "$(ProjectDir)..\cocos2d-js-tests\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Command>
       <Message>Copy js and resource files.</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>