Merge pull request cocos2d#12336 from jianglong0156/addResjs

modify js special resource path
fumingxing2015 · Jun 15, 2015 · 0c1347a · 0c1347a
2 parents d0db40c + 10ed5e0
commit 0c1347a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/build/cocos2d_js_tests.xcodeproj/project.pbxproj b/build/cocos2d_js_tests.xcodeproj/project.pbxproj
@@ -596,7 +596,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/js-tests/res\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../tests/cpp-tests/Resources/\" \"${cocos_dir}\"\ncp -r \"${SRCROOT}/../tests/js-tests/resjs/\" \"${cocos_dir}\"";
+			shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/js-tests/res\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../tests/cpp-tests/Resources/\" \"${cocos_dir}\"\ncp -r \"${SRCROOT}/../tests/js-tests/resjs/\" \"${cocos_dir}/resjs\"";
 		};
 		EDCA13EE1AEA4E7B00F445CA /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -609,7 +609,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/js-tests/res\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../tests/cpp-tests/Resources/\" \"${cocos_dir}\"\ncp -r \"${SRCROOT}/../tests/js-tests/resjs/\" \"${cocos_dir}\"";
+			shellScript = "#!/bin/bash\ncocos_dir=${SRCROOT}/../tests/js-tests/res\nif [ -d \"${cocos_dir}\" ]; then\nrm -rv \"${cocos_dir}\"\nmkdir \"${cocos_dir}\"\nelse\nmkdir \"${cocos_dir}\"\nfi\n\ncp -r \"${SRCROOT}/../tests/cpp-tests/Resources/\" \"${cocos_dir}\"\ncp -r \"${SRCROOT}/../tests/js-tests/resjs/\" \"${cocos_dir}/resjs\"";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/tests/js-tests/main.js b/tests/js-tests/main.js
@@ -96,6 +96,7 @@ cc.game.onStart = function(){
         searchPaths.push('script');
         searchPaths.push('src');
         var paths = [
+            'res/resjs',
             'res',
             'res/scenetest',
             'res/scenetest/ArmatureComponentTest',

diff --git a/tests/js-tests/project/proj.android-studio/build-cfg.json b/tests/js-tests/project/proj.android-studio/build-cfg.json
@@ -25,7 +25,7 @@
         },
         {
             "from": "../../resjs", 
-            "to": "res/"
+            "to": "res/resjs/"
         }
     ], 
     "ndk_module_path": [

diff --git a/tests/js-tests/project/proj.android/build-cfg.json b/tests/js-tests/project/proj.android/build-cfg.json
@@ -25,7 +25,7 @@
         },
         {
             "from": "../../resjs", 
-            "to": "res/"
+            "to": "res/resjs/"
         }
     ], 
     "ndk_module_path": [

diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj
@@ -122,7 +122,7 @@ xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y
 xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
 copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
 copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
-xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y</Command>
+xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copy js and resource files.</Message>

diff --git a/tests/js-tests/project/proj.win8.1-universal/resources.props b/tests/js-tests/project/proj.win8.1-universal/resources.props
@@ -52,7 +52,13 @@
       <DeploymentContent>true</DeploymentContent>
     </_CustomResource>
   </ItemGroup>
-
+  <ItemGroup>
+    <_CustomResource Include="..\..\..\resjs\**\*">
+      <Link>Assets\Resources\res\resjs\%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <DeploymentContent>true</DeploymentContent>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </_CustomResource>
+  </ItemGroup>
   <Target Name="_CollectCustomResources" BeforeTargets="AssignTargetPaths">
     <Message Text="Adding resource: %(_CustomResource.Identity) -&gt; %(_CustomResource.Link)" />
     <ItemGroup>

diff --git a/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js b/tests/js-tests/src/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.js
@@ -28,7 +28,7 @@ var CocosBuilderTestScene = TestScene.extend({
      runThisTest:function(){
          if (cc.sys.isNative)
          {
-            cc.BuilderReader.setResourcePath("res/");
+            cc.BuilderReader.setResourcePath("res/resjs/");
          }
          else
          {

diff --git a/.../js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js b/.../js-tests/src/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.js
@@ -28,7 +28,7 @@ cc.BuilderReader.registerController("HelloCocosBuilderLayer", {
     _openTest : function(ccbFileName) {
         if (cc.sys.isNative)
         {
-            cc.BuilderReader.setResourcePath("res/");
+            cc.BuilderReader.setResourcePath("res/resjs/");
         }
         else
         {