From dda07bebf55646d012d50f748ee07c4062f6f7b2 Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Wed, 8 Jul 2015 07:36:26 +0800
Subject: [PATCH] fix ios/mac/win32/win8.1 compile error

---
 .../slave-scripts/templates/ios-build.sh           | 13 +++++++++----
 .../slave-scripts/templates/mac-build.sh           | 14 ++++++++++----
 .../slave-scripts/templates/win32-build.bat        |  2 +-
 .../slave-scripts/templates/windows-universal.bat  |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh b/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh
index 3dd3f90e9c..c55cfb227c 100755
--- a/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh
+++ b/tools/jenkins-scripts/slave-scripts/templates/ios-build.sh
@@ -5,16 +5,21 @@ $mycocos new -l $1
 if [ $1 = "cpp" ];then
     schemename="MyCppGame-mobile"
     projectpath="MyCppGame/proj.ios_mac/MyCppGame.xcodeproj"
+    cocos_project_path="MyCppGame"
 elif [ $1 = "lua" ];then
     schemename="MyLuaGame-mobile"
     projectpath="MyLuaGame/frameworks/runtime-src/proj.ios_mac/MyLuaGame.xcodeproj"
+    cocos_project_path="MyLuaGame"
 elif [ $1 = "js" ];then
     schemename="MyJSGame-mobile"
     projectpath="MyJSGame/frameworks/runtime-src/proj.ios_mac/MyJSGame.xcodeproj"
+    cocos_project_path="MyJSGame"
 fi
 
 echo "start building..."
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-#the following commands must not be removed
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
+cocos compile -p ios -s $cocos_project_path | xcpretty
+cocos compile -p ios -s $cocos_project_path
+# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
+# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
+# #the following commands must not be removed
+# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh b/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh
index bf66dbe939..177d67d5b3 100755
--- a/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh
+++ b/tools/jenkins-scripts/slave-scripts/templates/mac-build.sh
@@ -5,15 +5,21 @@ $mycocos new -l $1
 if [ $1 = "cpp" ];then
     schemename="MyCppGame-desktop"
     projectpath="MyCppGame/proj.ios_mac/MyCppGame.xcodeproj"
+    cocos_project_path="MyCppGame"
 elif [ $1 = "lua" ];then
     schemename="MyLuaGame-desktop"
     projectpath="MyLuaGame/frameworks/runtime-src/proj.ios_mac/MyLuaGame.xcodeproj"
+    cocos_project_path="MyLuaGame"
 elif [ $1 = "js" ];then
     schemename="MyJSGame-desktop"
     projectpath="MyJSGame/frameworks/runtime-src/proj.ios_mac/MyJSGame.xcodeproj"
+    cocos_project_path="MyJSGame"
 fi
 
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-#the following commands must not be removed
-xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
+cocos compile -p mac -s $cocos_project_path | xcpretty
+cocos compile -p mac -s $cocos_project_path
+
+# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
+# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
+# #the following commands must not be removed
+# xcodebuild -project $projectpath -target "${schemename}"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/templates/win32-build.bat b/tools/jenkins-scripts/slave-scripts/templates/win32-build.bat
index 17a863cf84..4184cc54d5 100644
--- a/tools/jenkins-scripts/slave-scripts/templates/win32-build.bat
+++ b/tools/jenkins-scripts/slave-scripts/templates/win32-build.bat
@@ -11,4 +11,4 @@ if "%language%"=="js" set projectname=MyJSGame/frameworks/runtime-src/proj.win32
 
 echo %projectname%
 call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild %projectname% /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
+msbuild %projectname% /t:Build
diff --git a/tools/jenkins-scripts/slave-scripts/templates/windows-universal.bat b/tools/jenkins-scripts/slave-scripts/templates/windows-universal.bat
index 4def9c437e..e1f23c44f5 100755
--- a/tools/jenkins-scripts/slave-scripts/templates/windows-universal.bat
+++ b/tools/jenkins-scripts/slave-scripts/templates/windows-universal.bat
@@ -11,4 +11,4 @@ if "%language%"=="js" set projectname=MyJSGame/frameworks/runtime-src/proj.win8.
 
 echo %projectname%
 call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild %projectname% /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
+msbuild %projectname% /t:Build