From a6451c6c5e687de5d2461ff979ddc9c6e7be01e9 Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Tue, 30 Jun 2015 16:24:03 +0800
Subject: [PATCH] update daily build and pr build

---
 tools/jenkins-scripts/daily-build.py          |  7 ------
 .../do-pull-request-builder.py                |  7 ------
 .../slave-scripts/ios-js-build.sh             |  7 ------
 .../slave-scripts/mac-js-build.sh             | 22 -------------------
 .../slave-scripts/win32-js-build.bat          |  2 --
 .../slave-scripts/windows-js-universal.bat    |  2 --
 6 files changed, 47 deletions(-)
 delete mode 100755 tools/jenkins-scripts/slave-scripts/ios-js-build.sh
 delete mode 100755 tools/jenkins-scripts/slave-scripts/mac-js-build.sh
 delete mode 100644 tools/jenkins-scripts/slave-scripts/win32-js-build.bat
 delete mode 100755 tools/jenkins-scripts/slave-scripts/windows-js-universal.bat

diff --git a/tools/jenkins-scripts/daily-build.py b/tools/jenkins-scripts/daily-build.py
index 83f74443dc..bdbe5dcf8d 100644
--- a/tools/jenkins-scripts/daily-build.py
+++ b/tools/jenkins-scripts/daily-build.py
@@ -57,7 +57,6 @@ def gen_scripting_bindings():
 
 def do_build_slaves():
     jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep
-    js_tests_build_scripts = ""
 
     if(branch == 'v3' or branch == 'v4-develop'):
         slave_build_scripts = ""
@@ -65,16 +64,12 @@ def do_build_slaves():
             slave_build_scripts = jenkins_script_path + "android-build.sh"
         elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
             slave_build_scripts = jenkins_script_path + "win32-build.bat"
-            js_tests_build_scripts = jenkins_script_path + "win32-js-build.bat"
         elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
             slave_build_scripts = jenkins_script_path + "windows-universal.bat"
-            js_tests_build_scripts = jenkins_script_path + "windows-js-universal.bat"
         elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
             slave_build_scripts = jenkins_script_path + "ios-build.sh"
-            js_tests_build_scripts = jenkins_script_path + "ios-js-build.sh"
         elif(node_name == 'mac' or node_name == 'mac_bak'):
             slave_build_scripts = jenkins_script_path + "mac-build.sh"
-            js_tests_build_scripts = jenkins_script_path + "mac-js-build.sh"
         elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'):
             slave_build_scripts = jenkins_script_path + "linux-build.sh"
         elif(node_name == 'wp8'):
@@ -82,8 +77,6 @@ def do_build_slaves():
                 slave_build_scripts = jenkins_script_path + "wp8-v3.bat"
 
         ret = os.system(slave_build_scripts)
-        js_test_ret = os.system(js_tests_build_scripts)
-        ret = ret + js_test_ret
 
     #get build result
     print "build finished and return " + str(ret)
diff --git a/tools/jenkins-scripts/do-pull-request-builder.py b/tools/jenkins-scripts/do-pull-request-builder.py
index 06a8c56a9b..d7cb10b318 100755
--- a/tools/jenkins-scripts/do-pull-request-builder.py
+++ b/tools/jenkins-scripts/do-pull-request-builder.py
@@ -37,7 +37,6 @@ def do_build_slaves():
     global node_name
 
     jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep
-    js_tests_build_scripts = ""
 
     if(branch != 'v1' and branch != 'v2'):
         slave_build_scripts = ""
@@ -45,16 +44,12 @@ def do_build_slaves():
             slave_build_scripts = jenkins_script_path + "android-build.sh"
         elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
             slave_build_scripts = jenkins_script_path + "win32-build.bat"
-            js_tests_build_scripts = jenkins_script_path + "win32-js-build.bat"
         elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
             slave_build_scripts = jenkins_script_path + "windows-universal.bat"
-            js_tests_build_scripts = jenkins_script_path + "windows-js-universal.bat"
         elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
             slave_build_scripts = jenkins_script_path + "ios-build.sh"
-            js_tests_build_scripts = jenkins_script_path + "ios-js-build.sh"
         elif(node_name == 'mac' or node_name == 'mac_bak'):
             slave_build_scripts = jenkins_script_path + "mac-build.sh"
-            js_tests_build_scripts = jenkins_script_path + "mac-js-build.sh"
         elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'):
             slave_build_scripts = jenkins_script_path + "linux-build.sh"
         elif(node_name == 'wp8'):
@@ -62,8 +57,6 @@ def do_build_slaves():
                 slave_build_scripts = jenkins_script_path + "wp8-v3.bat"
 
         ret = os.system(slave_build_scripts)
-        js_test_ret = os.system(js_tests_build_scripts)
-        ret = ret + js_test_ret
 
     #get build result
     print "build finished and return " + str(ret)
diff --git a/tools/jenkins-scripts/slave-scripts/ios-js-build.sh b/tools/jenkins-scripts/slave-scripts/ios-js-build.sh
deleted file mode 100755
index 1c3ca79613..0000000000
--- a/tools/jenkins-scripts/slave-scripts/ios-js-build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#put xctool.sh into your PATH
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-COCOS2DX_ROOT="$DIR"/../../..
-xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests iOS"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
-xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests iOS"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
-#the following commands must not be removed
-xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests iOS"  -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build
diff --git a/tools/jenkins-scripts/slave-scripts/mac-js-build.sh b/tools/jenkins-scripts/slave-scripts/mac-js-build.sh
deleted file mode 100755
index 5a686724d0..0000000000
--- a/tools/jenkins-scripts/slave-scripts/mac-js-build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#put xctool.sh into your PATH
-
-#######
-# Cmake build
-####### 
-# DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# COCOS2DX_ROOT="$DIR"/../../..
-# cd ${COCOS2DX_ROOT}
-# mkdir mac-build
-# cd mac-build
-# cmake ..
-# make -j4
-
-#######
-# xcode build
-####### 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-COCOS2DX_ROOT="$DIR"/../../..
-xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests Mac" clean | xcpretty
-xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests Mac" build | xcpretty
-#xcpretty has a bug, some xcodebuid fails return value would be treated as 0.
-xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests Mac" build
diff --git a/tools/jenkins-scripts/slave-scripts/win32-js-build.bat b/tools/jenkins-scripts/slave-scripts/win32-js-build.bat
deleted file mode 100644
index 4325164a05..0000000000
--- a/tools/jenkins-scripts/slave-scripts/win32-js-build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild build\cocos2d-js-win32.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m
diff --git a/tools/jenkins-scripts/slave-scripts/windows-js-universal.bat b/tools/jenkins-scripts/slave-scripts/windows-js-universal.bat
deleted file mode 100755
index efb44a152f..0000000000
--- a/tools/jenkins-scripts/slave-scripts/windows-js-universal.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call "%VS120COMNTOOLS%vsvars32.bat"
-msbuild build\cocos2d-js-win8.1-universal.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m