Browse Source

Use ATOMIC_JENKINS_BUILD to control iOS code signing on build box

Josh Engebretson 10 years ago
parent
commit
292011d99c
1 changed files with 12 additions and 5 deletions
  1. 12 5
      Jakefile

+ 12 - 5
Jakefile

@@ -8,6 +8,7 @@ var os = require('os');
 
 
 var host = os.platform();
 var host = os.platform();
 var jakeRoot = __dirname;
 var jakeRoot = __dirname;
+var jenkinsBuild = process.env.ATOMIC_JENKINS_BUILD == 1
 
 
 var artifactsFolder = jakeRoot + "/Artifacts";
 var artifactsFolder = jakeRoot + "/Artifacts";
 
 
@@ -316,12 +317,18 @@ namespace('build', function() {
     var cmds = [
     var cmds = [
       atomicToolBinary + " bind " + jakeRoot + " Script/Packages/Atomic/ IOS",
       atomicToolBinary + " bind " + jakeRoot + " Script/Packages/Atomic/ IOS",
       atomicToolBinary + " bind " + jakeRoot + " Script/Packages/AtomicPlayer/ IOS",
       atomicToolBinary + " bind " + jakeRoot + " Script/Packages/AtomicPlayer/ IOS",
-      "cmake -DIOS=1 -G Xcode ../../",
-      "security -v list-keychains -d system -s /Users/jenkins/Library/Keychains/codesign.keychain", // TODO: only if jenkins
-      "security -v unlock-keychain /Users/jenkins/Library/Keychains/codesign.keychain", // TODO: only if jenkins
-      "xcodebuild -configuration Release"
+      "cmake -DIOS=1 -G Xcode ../../"
     ]
     ]
 
 
+    if (jenkinsBuild) {
+
+      cmds.push("security -v list-keychains -d system -s /Users/jenkins/Library/Keychains/codesign.keychain");
+      cmds.push("security -v unlock-keychain /Users/jenkins/Library/Keychains/codesign.keychain");
+
+    }
+
+    cmds.push("xcodebuild -configuration Release");
+
     jake.exec(cmds, function() {
     jake.exec(cmds, function() {
       fs.copySync(iosPlayerBinary, platformBinariesFolder + "/IOS/" + path.basename(iosPlayerBinary));
       fs.copySync(iosPlayerBinary, platformBinariesFolder + "/IOS/" + path.basename(iosPlayerBinary));
       console.log("Built iOS Player");
       console.log("Built iOS Player");
@@ -370,7 +377,7 @@ namespace('build', function() {
 
 
 namespace('package', function() {
 namespace('package', function() {
 
 
-  task('macosx', ['build:ios'], function() {
+  task('macosx', ['clean:all', 'build:macosx'], function() {
 
 
     jake.mkdirP(macOSXPackageFolder + "/AtomicEditor.app/Contents/Resources/");
     jake.mkdirP(macOSXPackageFolder + "/AtomicEditor.app/Contents/Resources/");