Merge pull request #3914 from Dhilan007/00001

fix copy resource error.
This commit is contained in:
James Chen 2013-10-10 03:09:20 -07:00
commit 590d8d50e0
5 changed files with 24 additions and 14 deletions

View File

@ -56,7 +56,8 @@ exit /b 1
set COCOS2DX_ROOT=%~dp0..\..\..\.. set COCOS2DX_ROOT=%~dp0..\..\..\..
set APP_ROOT=%~dp0.. set APP_ROOT=%~dp0..
set APP_ANDROID_ROOT=%~dp0 set APP_ANDROID_ROOT=%~dp0
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\scripting\javascript\bindings\js set RESROUCE_ROOT="%APP_ROOT%\..\Shared\games\CocosDragonJS\Published files Android"
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\..\scripting\javascript\bindings\js
if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2) if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2)
:MODULE1 :MODULE1
@ -81,7 +82,7 @@ mkdir %APP_ANDROID_ROOT%\assets
mkdir %APP_ANDROID_ROOT%\assets\res mkdir %APP_ANDROID_ROOT%\assets\res
rem copy Resources/* into assets' root rem copy Resources/* into assets' root
xcopy /e /q /r /y %APP_ROOT%\Resources\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %RESROUCE_ROOT%\* %APP_ANDROID_ROOT%\assets
rem copy bindings/*.js into assets' root rem copy bindings/*.js into assets' root
xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets

View File

@ -56,7 +56,8 @@ exit /b 1
set COCOS2DX_ROOT=%~dp0..\..\..\.. set COCOS2DX_ROOT=%~dp0..\..\..\..
set APP_ROOT=%~dp0.. set APP_ROOT=%~dp0..
set APP_ANDROID_ROOT=%~dp0 set APP_ANDROID_ROOT=%~dp0
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\scripting\javascript\bindings\js set RESROUCE_ROOT="%APP_ROOT%\..\Shared\games\CrystalCraze\Published-Android"
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\..\scripting\javascript\bindings\js
if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2) if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2)
:MODULE1 :MODULE1
@ -81,7 +82,7 @@ mkdir %APP_ANDROID_ROOT%\assets
mkdir %APP_ANDROID_ROOT%\assets\res mkdir %APP_ANDROID_ROOT%\assets\res
rem copy Resources/* into assets' root rem copy Resources/* into assets' root
xcopy /e /q /r /y %APP_ROOT%\Resources\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %RESROUCE_ROOT%\* %APP_ANDROID_ROOT%\assets
rem copy bindings/*.js into assets' root rem copy bindings/*.js into assets' root
xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets

View File

@ -56,7 +56,8 @@ exit /b 1
set COCOS2DX_ROOT=%~dp0..\..\..\.. set COCOS2DX_ROOT=%~dp0..\..\..\..
set APP_ROOT=%~dp0.. set APP_ROOT=%~dp0..
set APP_ANDROID_ROOT=%~dp0 set APP_ANDROID_ROOT=%~dp0
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\scripting\javascript\bindings\js set RESROUCE_ROOT="%APP_ROOT%\..\Shared\games\MoonWarriors\res"
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\..\scripting\javascript\bindings\js
if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2) if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2)
:MODULE1 :MODULE1
@ -81,7 +82,13 @@ mkdir %APP_ANDROID_ROOT%\assets
mkdir %APP_ANDROID_ROOT%\assets\res mkdir %APP_ANDROID_ROOT%\assets\res
rem copy Resources/* into assets' root rem copy Resources/* into assets' root
xcopy /e /q /r /y %APP_ROOT%\Resources\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %RESROUCE_ROOT%\* %APP_ANDROID_ROOT%\assets
rem copy MoonWarriors js
xcopy /e /q /r /y %RESROUCE_ROOT%\..\src\* %APP_ANDROID_ROOT%\assets
rem copy MoonWarriors-native.js
xcopy /e /q /r /y %RESROUCE_ROOT%\..\* %APP_ANDROID_ROOT%\assets
rem copy bindings/*.js into assets' root rem copy bindings/*.js into assets' root
xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets

View File

@ -56,7 +56,7 @@ exit /b 1
set COCOS2DX_ROOT=%~dp0..\..\..\.. set COCOS2DX_ROOT=%~dp0..\..\..\..
set APP_ROOT=%~dp0.. set APP_ROOT=%~dp0..
set APP_ANDROID_ROOT=%~dp0 set APP_ANDROID_ROOT=%~dp0
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\scripting\javascript\bindings\js set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\..\scripting\javascript\bindings\js
if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2) if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2)
:MODULE1 :MODULE1
@ -81,7 +81,7 @@ mkdir %APP_ANDROID_ROOT%\assets
mkdir %APP_ANDROID_ROOT%\assets\res mkdir %APP_ANDROID_ROOT%\assets\res
rem copy Resources/* into assets' root rem copy Resources/* into assets' root
xcopy /e /q /r /y %APP_ROOT%\Resources\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %APP_ROOT%\..\Shared\tests\* %APP_ANDROID_ROOT%\assets
rem copy bindings/*.js into assets' root rem copy bindings/*.js into assets' root
xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets

View File

@ -56,7 +56,8 @@ exit /b 1
set COCOS2DX_ROOT=%~dp0..\..\..\.. set COCOS2DX_ROOT=%~dp0..\..\..\..
set APP_ROOT=%~dp0.. set APP_ROOT=%~dp0..
set APP_ANDROID_ROOT=%~dp0 set APP_ANDROID_ROOT=%~dp0
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\scripting\javascript\bindings\js set RESROUCE_ROOT="%APP_ROOT%\..\Shared\games\WatermelonWithMe"
set BINDINGS_JS_ROOT=%APP_ROOT%\..\..\..\scripting\javascript\bindings\js
if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2) if "%buildexternalsfromsource%"=="1" (goto :MODULE1) else (goto :MODULE2)
:MODULE1 :MODULE1
@ -81,7 +82,7 @@ mkdir %APP_ANDROID_ROOT%\assets
mkdir %APP_ANDROID_ROOT%\assets\res mkdir %APP_ANDROID_ROOT%\assets\res
rem copy Resources/* into assets' root rem copy Resources/* into assets' root
xcopy /e /q /r /y %APP_ROOT%\Resources\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %RESROUCE_ROOT%\* %APP_ANDROID_ROOT%\assets
rem copy bindings/*.js into assets' root rem copy bindings/*.js into assets' root
xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets xcopy /e /q /r /y %BINDINGS_JS_ROOT%\* %APP_ANDROID_ROOT%\assets