From 9cd2b16ad0ca77084cf289de11f3a6c0c72ad1d9 Mon Sep 17 00:00:00 2001 From: jianglong0156 Date: Wed, 27 May 2015 09:52:44 +0800 Subject: [PATCH 1/2] modify js resource name --- tests/js-tests/project/proj.android/build-cfg.json | 2 +- tests/js-tests/project/proj.win32/js-tests.vcxproj | 4 ++-- .../{res => resjs}/Shaders/example_Blur.fsh | 0 .../{res => resjs}/Shaders/example_ColorBars.fsh | 0 .../{res => resjs}/Shaders/example_ColorBars.vsh | 0 .../{res => resjs}/Shaders/example_Flower.fsh | 0 .../{res => resjs}/Shaders/example_Flower.vsh | 0 .../{res => resjs}/Shaders/example_Heart.fsh | 0 .../{res => resjs}/Shaders/example_Heart.vsh | 0 .../{res => resjs}/Shaders/example_Julia.fsh | 0 .../{res => resjs}/Shaders/example_Julia.vsh | 0 .../{res => resjs}/Shaders/example_Mandelbrot.fsh | 0 .../{res => resjs}/Shaders/example_Mandelbrot.vsh | 0 .../{res => resjs}/Shaders/example_Monjori.fsh | 0 .../{res => resjs}/Shaders/example_Monjori.vsh | 0 .../{res => resjs}/Shaders/example_Outline.fsh | 0 .../{res => resjs}/Shaders/example_Outline.vsh | 0 .../Shaders/example_Outline_noMVP.vsh | 0 .../{res => resjs}/Shaders/example_Plasma.fsh | 0 .../{res => resjs}/Shaders/example_Plasma.vsh | 0 .../{res => resjs}/Shaders/example_Twist.fsh | 0 .../{res => resjs}/Shaders/example_Twist.vsh | 0 .../{res => resjs}/ccb/HelloCocosBuilder.ccb | 0 .../{res => resjs}/ccb/HelloCocosBuilder.ccbi | Bin .../{res => resjs}/ccb/animated-grossini.plist | 0 .../{res => resjs}/ccb/animated-grossini.png | Bin tests/js-tests/{res => resjs}/ccb/btn-a-0.png | Bin tests/js-tests/{res => resjs}/ccb/btn-a-1.png | Bin tests/js-tests/{res => resjs}/ccb/btn-a-2.png | Bin tests/js-tests/{res => resjs}/ccb/btn-b-0.png | Bin tests/js-tests/{res => resjs}/ccb/btn-b-1.png | Bin tests/js-tests/{res => resjs}/ccb/btn-b-2.png | Bin tests/js-tests/{res => resjs}/ccb/btn-back-0.png | Bin tests/js-tests/{res => resjs}/ccb/btn-back-1.png | Bin tests/js-tests/{res => resjs}/ccb/btn-test-0.png | Bin tests/js-tests/{res => resjs}/ccb/btn-test-1.png | Bin tests/js-tests/{res => resjs}/ccb/btn-test-2.png | Bin tests/js-tests/{res => resjs}/ccb/burst.png | Bin .../{res => resjs}/ccb/ccb/TestAnimations.ccb | 0 .../{res => resjs}/ccb/ccb/TestAnimations.ccbi | Bin .../{res => resjs}/ccb/ccb/TestAnimationsSub.ccb | 0 .../{res => resjs}/ccb/ccb/TestAnimationsSub.ccbi | Bin .../js-tests/{res => resjs}/ccb/ccb/TestButtons.ccb | 0 .../{res => resjs}/ccb/ccb/TestButtons.ccbi | Bin .../js-tests/{res => resjs}/ccb/ccb/TestHeader.ccb | 0 .../js-tests/{res => resjs}/ccb/ccb/TestHeader.ccbi | Bin .../js-tests/{res => resjs}/ccb/ccb/TestLabels.ccb | 0 .../js-tests/{res => resjs}/ccb/ccb/TestLabels.ccbi | Bin tests/js-tests/{res => resjs}/ccb/ccb/TestMenus.ccb | 0 .../js-tests/{res => resjs}/ccb/ccb/TestMenus.ccbi | Bin .../{res => resjs}/ccb/ccb/TestParticleSystems.ccb | 0 .../{res => resjs}/ccb/ccb/TestParticleSystems.ccbi | Bin .../{res => resjs}/ccb/ccb/TestScrollViews.ccb | 0 .../{res => resjs}/ccb/ccb/TestScrollViews.ccbi | Bin .../ccb/ccb/TestScrollViewsContentA.ccb | 0 .../ccb/ccb/TestScrollViewsContentA.ccbi | Bin .../js-tests/{res => resjs}/ccb/ccb/TestSprites.ccb | 0 .../{res => resjs}/ccb/ccb/TestSprites.ccbi | Bin .../{res => resjs}/ccb/ccb/TestTimelineCallback.ccb | 0 .../ccb/ccb/TestTimelineCallback.ccbi | Bin .../{res => resjs}/ccb/ccbParticleStars.png | Bin tests/js-tests/{res => resjs}/ccb/comic andy.ttf | Bin tests/js-tests/{res => resjs}/ccb/fileLookup.plist | 0 tests/js-tests/{res => resjs}/ccb/flower.jpg | Bin tests/js-tests/{res => resjs}/ccb/gem-0.wav | Bin tests/js-tests/{res => resjs}/ccb/gem-1.wav | Bin .../{res => resjs}/ccb/grossini-generic.plist | 0 .../{res => resjs}/ccb/grossini-generic.png | Bin tests/js-tests/{res => resjs}/ccb/jungle-left.png | Bin tests/js-tests/{res => resjs}/ccb/jungle-right.png | Bin tests/js-tests/{res => resjs}/ccb/jungle.png | Bin tests/js-tests/{res => resjs}/ccb/logo-icon.png | Bin tests/js-tests/{res => resjs}/ccb/logo.png | Bin .../{res => resjs}/ccb/markerfelt24shadow.fnt | 0 .../{res => resjs}/ccb/markerfelt24shadow.png | Bin tests/js-tests/{res => resjs}/ccb/particle-fire.png | Bin .../js-tests/{res => resjs}/ccb/particle-smoke.png | Bin tests/js-tests/{res => resjs}/ccb/particle-snow.png | Bin .../js-tests/{res => resjs}/ccb/particle-stars.png | Bin tests/js-tests/{res => resjs}/ccb/scale-9-demo.png | Bin tests/js-tests/src/tests_resources.js | 2 +- 81 files changed, 4 insertions(+), 4 deletions(-) rename tests/js-tests/{res => resjs}/Shaders/example_Blur.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_ColorBars.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_ColorBars.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Flower.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Flower.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Heart.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Heart.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Julia.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Julia.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Mandelbrot.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Mandelbrot.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Monjori.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Monjori.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Outline.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Outline.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Outline_noMVP.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Plasma.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Plasma.vsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Twist.fsh (100%) rename tests/js-tests/{res => resjs}/Shaders/example_Twist.vsh (100%) rename tests/js-tests/{res => resjs}/ccb/HelloCocosBuilder.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/HelloCocosBuilder.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/animated-grossini.plist (100%) rename tests/js-tests/{res => resjs}/ccb/animated-grossini.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-a-0.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-a-1.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-a-2.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-b-0.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-b-1.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-b-2.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-back-0.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-back-1.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-test-0.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-test-1.png (100%) rename tests/js-tests/{res => resjs}/ccb/btn-test-2.png (100%) rename tests/js-tests/{res => resjs}/ccb/burst.png (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestAnimations.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestAnimations.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestAnimationsSub.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestAnimationsSub.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestButtons.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestButtons.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestHeader.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestHeader.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestLabels.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestLabels.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestMenus.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestMenus.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestParticleSystems.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestParticleSystems.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestScrollViews.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestScrollViews.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestScrollViewsContentA.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestScrollViewsContentA.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestSprites.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestSprites.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestTimelineCallback.ccb (100%) rename tests/js-tests/{res => resjs}/ccb/ccb/TestTimelineCallback.ccbi (100%) rename tests/js-tests/{res => resjs}/ccb/ccbParticleStars.png (100%) rename tests/js-tests/{res => resjs}/ccb/comic andy.ttf (100%) rename tests/js-tests/{res => resjs}/ccb/fileLookup.plist (100%) rename tests/js-tests/{res => resjs}/ccb/flower.jpg (100%) rename tests/js-tests/{res => resjs}/ccb/gem-0.wav (100%) rename tests/js-tests/{res => resjs}/ccb/gem-1.wav (100%) rename tests/js-tests/{res => resjs}/ccb/grossini-generic.plist (100%) rename tests/js-tests/{res => resjs}/ccb/grossini-generic.png (100%) rename tests/js-tests/{res => resjs}/ccb/jungle-left.png (100%) rename tests/js-tests/{res => resjs}/ccb/jungle-right.png (100%) rename tests/js-tests/{res => resjs}/ccb/jungle.png (100%) rename tests/js-tests/{res => resjs}/ccb/logo-icon.png (100%) rename tests/js-tests/{res => resjs}/ccb/logo.png (100%) rename tests/js-tests/{res => resjs}/ccb/markerfelt24shadow.fnt (100%) rename tests/js-tests/{res => resjs}/ccb/markerfelt24shadow.png (100%) rename tests/js-tests/{res => resjs}/ccb/particle-fire.png (100%) rename tests/js-tests/{res => resjs}/ccb/particle-smoke.png (100%) rename tests/js-tests/{res => resjs}/ccb/particle-snow.png (100%) rename tests/js-tests/{res => resjs}/ccb/particle-stars.png (100%) rename tests/js-tests/{res => resjs}/ccb/scale-9-demo.png (100%) diff --git a/tests/js-tests/project/proj.android/build-cfg.json b/tests/js-tests/project/proj.android/build-cfg.json index de084cfc76..19598e33d5 100644 --- a/tests/js-tests/project/proj.android/build-cfg.json +++ b/tests/js-tests/project/proj.android/build-cfg.json @@ -24,7 +24,7 @@ "to": "script" }, { - "from": "../../res", + "from": "../../resjs", "to": "res/" } ], diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj index c1d7bd40fe..e6ffa52dba 100644 --- 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)..\..\res" "$(OutDir)\res\" /e /Y +xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y Copy js and resource files. @@ -184,7 +184,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)..\..\res" "$(OutDir)\res\" /e /Y +xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y Copy js and resource files. diff --git a/tests/js-tests/res/Shaders/example_Blur.fsh b/tests/js-tests/resjs/Shaders/example_Blur.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Blur.fsh rename to tests/js-tests/resjs/Shaders/example_Blur.fsh diff --git a/tests/js-tests/res/Shaders/example_ColorBars.fsh b/tests/js-tests/resjs/Shaders/example_ColorBars.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_ColorBars.fsh rename to tests/js-tests/resjs/Shaders/example_ColorBars.fsh diff --git a/tests/js-tests/res/Shaders/example_ColorBars.vsh b/tests/js-tests/resjs/Shaders/example_ColorBars.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_ColorBars.vsh rename to tests/js-tests/resjs/Shaders/example_ColorBars.vsh diff --git a/tests/js-tests/res/Shaders/example_Flower.fsh b/tests/js-tests/resjs/Shaders/example_Flower.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Flower.fsh rename to tests/js-tests/resjs/Shaders/example_Flower.fsh diff --git a/tests/js-tests/res/Shaders/example_Flower.vsh b/tests/js-tests/resjs/Shaders/example_Flower.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Flower.vsh rename to tests/js-tests/resjs/Shaders/example_Flower.vsh diff --git a/tests/js-tests/res/Shaders/example_Heart.fsh b/tests/js-tests/resjs/Shaders/example_Heart.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Heart.fsh rename to tests/js-tests/resjs/Shaders/example_Heart.fsh diff --git a/tests/js-tests/res/Shaders/example_Heart.vsh b/tests/js-tests/resjs/Shaders/example_Heart.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Heart.vsh rename to tests/js-tests/resjs/Shaders/example_Heart.vsh diff --git a/tests/js-tests/res/Shaders/example_Julia.fsh b/tests/js-tests/resjs/Shaders/example_Julia.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Julia.fsh rename to tests/js-tests/resjs/Shaders/example_Julia.fsh diff --git a/tests/js-tests/res/Shaders/example_Julia.vsh b/tests/js-tests/resjs/Shaders/example_Julia.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Julia.vsh rename to tests/js-tests/resjs/Shaders/example_Julia.vsh diff --git a/tests/js-tests/res/Shaders/example_Mandelbrot.fsh b/tests/js-tests/resjs/Shaders/example_Mandelbrot.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Mandelbrot.fsh rename to tests/js-tests/resjs/Shaders/example_Mandelbrot.fsh diff --git a/tests/js-tests/res/Shaders/example_Mandelbrot.vsh b/tests/js-tests/resjs/Shaders/example_Mandelbrot.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Mandelbrot.vsh rename to tests/js-tests/resjs/Shaders/example_Mandelbrot.vsh diff --git a/tests/js-tests/res/Shaders/example_Monjori.fsh b/tests/js-tests/resjs/Shaders/example_Monjori.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Monjori.fsh rename to tests/js-tests/resjs/Shaders/example_Monjori.fsh diff --git a/tests/js-tests/res/Shaders/example_Monjori.vsh b/tests/js-tests/resjs/Shaders/example_Monjori.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Monjori.vsh rename to tests/js-tests/resjs/Shaders/example_Monjori.vsh diff --git a/tests/js-tests/res/Shaders/example_Outline.fsh b/tests/js-tests/resjs/Shaders/example_Outline.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Outline.fsh rename to tests/js-tests/resjs/Shaders/example_Outline.fsh diff --git a/tests/js-tests/res/Shaders/example_Outline.vsh b/tests/js-tests/resjs/Shaders/example_Outline.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Outline.vsh rename to tests/js-tests/resjs/Shaders/example_Outline.vsh diff --git a/tests/js-tests/res/Shaders/example_Outline_noMVP.vsh b/tests/js-tests/resjs/Shaders/example_Outline_noMVP.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Outline_noMVP.vsh rename to tests/js-tests/resjs/Shaders/example_Outline_noMVP.vsh diff --git a/tests/js-tests/res/Shaders/example_Plasma.fsh b/tests/js-tests/resjs/Shaders/example_Plasma.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Plasma.fsh rename to tests/js-tests/resjs/Shaders/example_Plasma.fsh diff --git a/tests/js-tests/res/Shaders/example_Plasma.vsh b/tests/js-tests/resjs/Shaders/example_Plasma.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Plasma.vsh rename to tests/js-tests/resjs/Shaders/example_Plasma.vsh diff --git a/tests/js-tests/res/Shaders/example_Twist.fsh b/tests/js-tests/resjs/Shaders/example_Twist.fsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Twist.fsh rename to tests/js-tests/resjs/Shaders/example_Twist.fsh diff --git a/tests/js-tests/res/Shaders/example_Twist.vsh b/tests/js-tests/resjs/Shaders/example_Twist.vsh similarity index 100% rename from tests/js-tests/res/Shaders/example_Twist.vsh rename to tests/js-tests/resjs/Shaders/example_Twist.vsh diff --git a/tests/js-tests/res/ccb/HelloCocosBuilder.ccb b/tests/js-tests/resjs/ccb/HelloCocosBuilder.ccb similarity index 100% rename from tests/js-tests/res/ccb/HelloCocosBuilder.ccb rename to tests/js-tests/resjs/ccb/HelloCocosBuilder.ccb diff --git a/tests/js-tests/res/ccb/HelloCocosBuilder.ccbi b/tests/js-tests/resjs/ccb/HelloCocosBuilder.ccbi similarity index 100% rename from tests/js-tests/res/ccb/HelloCocosBuilder.ccbi rename to tests/js-tests/resjs/ccb/HelloCocosBuilder.ccbi diff --git a/tests/js-tests/res/ccb/animated-grossini.plist b/tests/js-tests/resjs/ccb/animated-grossini.plist similarity index 100% rename from tests/js-tests/res/ccb/animated-grossini.plist rename to tests/js-tests/resjs/ccb/animated-grossini.plist diff --git a/tests/js-tests/res/ccb/animated-grossini.png b/tests/js-tests/resjs/ccb/animated-grossini.png similarity index 100% rename from tests/js-tests/res/ccb/animated-grossini.png rename to tests/js-tests/resjs/ccb/animated-grossini.png diff --git a/tests/js-tests/res/ccb/btn-a-0.png b/tests/js-tests/resjs/ccb/btn-a-0.png similarity index 100% rename from tests/js-tests/res/ccb/btn-a-0.png rename to tests/js-tests/resjs/ccb/btn-a-0.png diff --git a/tests/js-tests/res/ccb/btn-a-1.png b/tests/js-tests/resjs/ccb/btn-a-1.png similarity index 100% rename from tests/js-tests/res/ccb/btn-a-1.png rename to tests/js-tests/resjs/ccb/btn-a-1.png diff --git a/tests/js-tests/res/ccb/btn-a-2.png b/tests/js-tests/resjs/ccb/btn-a-2.png similarity index 100% rename from tests/js-tests/res/ccb/btn-a-2.png rename to tests/js-tests/resjs/ccb/btn-a-2.png diff --git a/tests/js-tests/res/ccb/btn-b-0.png b/tests/js-tests/resjs/ccb/btn-b-0.png similarity index 100% rename from tests/js-tests/res/ccb/btn-b-0.png rename to tests/js-tests/resjs/ccb/btn-b-0.png diff --git a/tests/js-tests/res/ccb/btn-b-1.png b/tests/js-tests/resjs/ccb/btn-b-1.png similarity index 100% rename from tests/js-tests/res/ccb/btn-b-1.png rename to tests/js-tests/resjs/ccb/btn-b-1.png diff --git a/tests/js-tests/res/ccb/btn-b-2.png b/tests/js-tests/resjs/ccb/btn-b-2.png similarity index 100% rename from tests/js-tests/res/ccb/btn-b-2.png rename to tests/js-tests/resjs/ccb/btn-b-2.png diff --git a/tests/js-tests/res/ccb/btn-back-0.png b/tests/js-tests/resjs/ccb/btn-back-0.png similarity index 100% rename from tests/js-tests/res/ccb/btn-back-0.png rename to tests/js-tests/resjs/ccb/btn-back-0.png diff --git a/tests/js-tests/res/ccb/btn-back-1.png b/tests/js-tests/resjs/ccb/btn-back-1.png similarity index 100% rename from tests/js-tests/res/ccb/btn-back-1.png rename to tests/js-tests/resjs/ccb/btn-back-1.png diff --git a/tests/js-tests/res/ccb/btn-test-0.png b/tests/js-tests/resjs/ccb/btn-test-0.png similarity index 100% rename from tests/js-tests/res/ccb/btn-test-0.png rename to tests/js-tests/resjs/ccb/btn-test-0.png diff --git a/tests/js-tests/res/ccb/btn-test-1.png b/tests/js-tests/resjs/ccb/btn-test-1.png similarity index 100% rename from tests/js-tests/res/ccb/btn-test-1.png rename to tests/js-tests/resjs/ccb/btn-test-1.png diff --git a/tests/js-tests/res/ccb/btn-test-2.png b/tests/js-tests/resjs/ccb/btn-test-2.png similarity index 100% rename from tests/js-tests/res/ccb/btn-test-2.png rename to tests/js-tests/resjs/ccb/btn-test-2.png diff --git a/tests/js-tests/res/ccb/burst.png b/tests/js-tests/resjs/ccb/burst.png similarity index 100% rename from tests/js-tests/res/ccb/burst.png rename to tests/js-tests/resjs/ccb/burst.png diff --git a/tests/js-tests/res/ccb/ccb/TestAnimations.ccb b/tests/js-tests/resjs/ccb/ccb/TestAnimations.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestAnimations.ccb rename to tests/js-tests/resjs/ccb/ccb/TestAnimations.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestAnimations.ccbi b/tests/js-tests/resjs/ccb/ccb/TestAnimations.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestAnimations.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestAnimations.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestAnimationsSub.ccb b/tests/js-tests/resjs/ccb/ccb/TestAnimationsSub.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestAnimationsSub.ccb rename to tests/js-tests/resjs/ccb/ccb/TestAnimationsSub.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestAnimationsSub.ccbi b/tests/js-tests/resjs/ccb/ccb/TestAnimationsSub.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestAnimationsSub.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestAnimationsSub.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestButtons.ccb b/tests/js-tests/resjs/ccb/ccb/TestButtons.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestButtons.ccb rename to tests/js-tests/resjs/ccb/ccb/TestButtons.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestButtons.ccbi b/tests/js-tests/resjs/ccb/ccb/TestButtons.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestButtons.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestButtons.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestHeader.ccb b/tests/js-tests/resjs/ccb/ccb/TestHeader.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestHeader.ccb rename to tests/js-tests/resjs/ccb/ccb/TestHeader.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestHeader.ccbi b/tests/js-tests/resjs/ccb/ccb/TestHeader.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestHeader.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestHeader.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestLabels.ccb b/tests/js-tests/resjs/ccb/ccb/TestLabels.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestLabels.ccb rename to tests/js-tests/resjs/ccb/ccb/TestLabels.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestLabels.ccbi b/tests/js-tests/resjs/ccb/ccb/TestLabels.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestLabels.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestLabels.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestMenus.ccb b/tests/js-tests/resjs/ccb/ccb/TestMenus.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestMenus.ccb rename to tests/js-tests/resjs/ccb/ccb/TestMenus.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestMenus.ccbi b/tests/js-tests/resjs/ccb/ccb/TestMenus.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestMenus.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestMenus.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestParticleSystems.ccb b/tests/js-tests/resjs/ccb/ccb/TestParticleSystems.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestParticleSystems.ccb rename to tests/js-tests/resjs/ccb/ccb/TestParticleSystems.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestParticleSystems.ccbi b/tests/js-tests/resjs/ccb/ccb/TestParticleSystems.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestParticleSystems.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestParticleSystems.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestScrollViews.ccb b/tests/js-tests/resjs/ccb/ccb/TestScrollViews.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestScrollViews.ccb rename to tests/js-tests/resjs/ccb/ccb/TestScrollViews.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestScrollViews.ccbi b/tests/js-tests/resjs/ccb/ccb/TestScrollViews.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestScrollViews.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestScrollViews.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestScrollViewsContentA.ccb b/tests/js-tests/resjs/ccb/ccb/TestScrollViewsContentA.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestScrollViewsContentA.ccb rename to tests/js-tests/resjs/ccb/ccb/TestScrollViewsContentA.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestScrollViewsContentA.ccbi b/tests/js-tests/resjs/ccb/ccb/TestScrollViewsContentA.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestScrollViewsContentA.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestScrollViewsContentA.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestSprites.ccb b/tests/js-tests/resjs/ccb/ccb/TestSprites.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestSprites.ccb rename to tests/js-tests/resjs/ccb/ccb/TestSprites.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestSprites.ccbi b/tests/js-tests/resjs/ccb/ccb/TestSprites.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestSprites.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestSprites.ccbi diff --git a/tests/js-tests/res/ccb/ccb/TestTimelineCallback.ccb b/tests/js-tests/resjs/ccb/ccb/TestTimelineCallback.ccb similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestTimelineCallback.ccb rename to tests/js-tests/resjs/ccb/ccb/TestTimelineCallback.ccb diff --git a/tests/js-tests/res/ccb/ccb/TestTimelineCallback.ccbi b/tests/js-tests/resjs/ccb/ccb/TestTimelineCallback.ccbi similarity index 100% rename from tests/js-tests/res/ccb/ccb/TestTimelineCallback.ccbi rename to tests/js-tests/resjs/ccb/ccb/TestTimelineCallback.ccbi diff --git a/tests/js-tests/res/ccb/ccbParticleStars.png b/tests/js-tests/resjs/ccb/ccbParticleStars.png similarity index 100% rename from tests/js-tests/res/ccb/ccbParticleStars.png rename to tests/js-tests/resjs/ccb/ccbParticleStars.png diff --git a/tests/js-tests/res/ccb/comic andy.ttf b/tests/js-tests/resjs/ccb/comic andy.ttf similarity index 100% rename from tests/js-tests/res/ccb/comic andy.ttf rename to tests/js-tests/resjs/ccb/comic andy.ttf diff --git a/tests/js-tests/res/ccb/fileLookup.plist b/tests/js-tests/resjs/ccb/fileLookup.plist similarity index 100% rename from tests/js-tests/res/ccb/fileLookup.plist rename to tests/js-tests/resjs/ccb/fileLookup.plist diff --git a/tests/js-tests/res/ccb/flower.jpg b/tests/js-tests/resjs/ccb/flower.jpg similarity index 100% rename from tests/js-tests/res/ccb/flower.jpg rename to tests/js-tests/resjs/ccb/flower.jpg diff --git a/tests/js-tests/res/ccb/gem-0.wav b/tests/js-tests/resjs/ccb/gem-0.wav similarity index 100% rename from tests/js-tests/res/ccb/gem-0.wav rename to tests/js-tests/resjs/ccb/gem-0.wav diff --git a/tests/js-tests/res/ccb/gem-1.wav b/tests/js-tests/resjs/ccb/gem-1.wav similarity index 100% rename from tests/js-tests/res/ccb/gem-1.wav rename to tests/js-tests/resjs/ccb/gem-1.wav diff --git a/tests/js-tests/res/ccb/grossini-generic.plist b/tests/js-tests/resjs/ccb/grossini-generic.plist similarity index 100% rename from tests/js-tests/res/ccb/grossini-generic.plist rename to tests/js-tests/resjs/ccb/grossini-generic.plist diff --git a/tests/js-tests/res/ccb/grossini-generic.png b/tests/js-tests/resjs/ccb/grossini-generic.png similarity index 100% rename from tests/js-tests/res/ccb/grossini-generic.png rename to tests/js-tests/resjs/ccb/grossini-generic.png diff --git a/tests/js-tests/res/ccb/jungle-left.png b/tests/js-tests/resjs/ccb/jungle-left.png similarity index 100% rename from tests/js-tests/res/ccb/jungle-left.png rename to tests/js-tests/resjs/ccb/jungle-left.png diff --git a/tests/js-tests/res/ccb/jungle-right.png b/tests/js-tests/resjs/ccb/jungle-right.png similarity index 100% rename from tests/js-tests/res/ccb/jungle-right.png rename to tests/js-tests/resjs/ccb/jungle-right.png diff --git a/tests/js-tests/res/ccb/jungle.png b/tests/js-tests/resjs/ccb/jungle.png similarity index 100% rename from tests/js-tests/res/ccb/jungle.png rename to tests/js-tests/resjs/ccb/jungle.png diff --git a/tests/js-tests/res/ccb/logo-icon.png b/tests/js-tests/resjs/ccb/logo-icon.png similarity index 100% rename from tests/js-tests/res/ccb/logo-icon.png rename to tests/js-tests/resjs/ccb/logo-icon.png diff --git a/tests/js-tests/res/ccb/logo.png b/tests/js-tests/resjs/ccb/logo.png similarity index 100% rename from tests/js-tests/res/ccb/logo.png rename to tests/js-tests/resjs/ccb/logo.png diff --git a/tests/js-tests/res/ccb/markerfelt24shadow.fnt b/tests/js-tests/resjs/ccb/markerfelt24shadow.fnt similarity index 100% rename from tests/js-tests/res/ccb/markerfelt24shadow.fnt rename to tests/js-tests/resjs/ccb/markerfelt24shadow.fnt diff --git a/tests/js-tests/res/ccb/markerfelt24shadow.png b/tests/js-tests/resjs/ccb/markerfelt24shadow.png similarity index 100% rename from tests/js-tests/res/ccb/markerfelt24shadow.png rename to tests/js-tests/resjs/ccb/markerfelt24shadow.png diff --git a/tests/js-tests/res/ccb/particle-fire.png b/tests/js-tests/resjs/ccb/particle-fire.png similarity index 100% rename from tests/js-tests/res/ccb/particle-fire.png rename to tests/js-tests/resjs/ccb/particle-fire.png diff --git a/tests/js-tests/res/ccb/particle-smoke.png b/tests/js-tests/resjs/ccb/particle-smoke.png similarity index 100% rename from tests/js-tests/res/ccb/particle-smoke.png rename to tests/js-tests/resjs/ccb/particle-smoke.png diff --git a/tests/js-tests/res/ccb/particle-snow.png b/tests/js-tests/resjs/ccb/particle-snow.png similarity index 100% rename from tests/js-tests/res/ccb/particle-snow.png rename to tests/js-tests/resjs/ccb/particle-snow.png diff --git a/tests/js-tests/res/ccb/particle-stars.png b/tests/js-tests/resjs/ccb/particle-stars.png similarity index 100% rename from tests/js-tests/res/ccb/particle-stars.png rename to tests/js-tests/resjs/ccb/particle-stars.png diff --git a/tests/js-tests/res/ccb/scale-9-demo.png b/tests/js-tests/resjs/ccb/scale-9-demo.png similarity index 100% rename from tests/js-tests/res/ccb/scale-9-demo.png rename to tests/js-tests/resjs/ccb/scale-9-demo.png diff --git a/tests/js-tests/src/tests_resources.js b/tests/js-tests/src/tests_resources.js index 74b97e7c2d..943d7e3d89 100644 --- a/tests/js-tests/src/tests_resources.js +++ b/tests/js-tests/src/tests_resources.js @@ -4,7 +4,7 @@ var s_resprefix = ""; var ccbjs = ""; if (!cc.sys.isNative) { - ccbjs = "../../js-tests/res/"; + ccbjs = "../../js-tests/resjs/"; } var s_pathGrossini = "Images/grossini.png"; From c3aae69fc0eac89afca534abfc318d887593855d Mon Sep 17 00:00:00 2001 From: jianglong0156 Date: Wed, 27 May 2015 10:08:03 +0800 Subject: [PATCH 2/2] modify proj.android-studio copy resource path --- tests/js-tests/project/proj.android-studio/build-cfg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/js-tests/project/proj.android-studio/build-cfg.json b/tests/js-tests/project/proj.android-studio/build-cfg.json index de084cfc76..19598e33d5 100644 --- a/tests/js-tests/project/proj.android-studio/build-cfg.json +++ b/tests/js-tests/project/proj.android-studio/build-cfg.json @@ -24,7 +24,7 @@ "to": "script" }, { - "from": "../../res", + "from": "../../resjs", "to": "res/" } ],