Browse Source

Ensure not losing executable permission

Josh Engebretson 10 years ago
parent
commit
0c193e6966
2 changed files with 29 additions and 20 deletions
  1. 1 1
      Build/CIScripts/GenEditorData.js
  2. 28 19
      Build/CIScripts/GenMacEditor.js

+ 1 - 1
Build/CIScripts/GenEditorData.js

@@ -179,7 +179,7 @@ namespace('build', function() {
 
 
     process.chdir(buildDir);
     process.chdir(buildDir);
 
 
-    var cmds = ["zip -r ./EditorData.zip ./"];
+    var cmds = ["zip -r -X ./EditorData.zip ./"];
 
 
     jake.exec(cmds,
     jake.exec(cmds,
       function() {
       function() {

+ 28 - 19
Build/CIScripts/GenMacEditor.js

@@ -17,6 +17,8 @@ namespace('build', function() {
       var editorAppFolder = dstDir + "AtomicEditor.app";
       var editorAppFolder = dstDir + "AtomicEditor.app";
 
 
       cmds = [
       cmds = [
+      "chmod +x " + editorAppFolder + "/Contents/MacOS/AtomicEditor",
+      "chmod +x " + editorAppFolder + "/Contents/Resources/ToolData/Deployment/MacOS/AtomicPlayer.app/Contents/MacOS/AtomicPlayer",
       "security unlock-keychain -p \"jenkins\" /Users/jenkins/Library/Keychains/login.keychain",
       "security unlock-keychain -p \"jenkins\" /Users/jenkins/Library/Keychains/login.keychain",
       "codesign -s \"THUNDERBEAST GAMES LLC\" -f -v " + editorAppFolder,
       "codesign -s \"THUNDERBEAST GAMES LLC\" -f -v " + editorAppFolder,
       "cd " + dstDir + " && zip -r -X " + "./MacEditorInstaller/AtomicEditor_MacOSX_" + bcommon.buildSHA + ".zip ./AtomicEditor.app"
       "cd " + dstDir + " && zip -r -X " + "./MacEditorInstaller/AtomicEditor_MacOSX_" + bcommon.buildSHA + ".zip ./AtomicEditor.app"
@@ -41,36 +43,43 @@ namespace('build', function() {
 
 
     bcommon.cleanCreateDir(dstDir);
     bcommon.cleanCreateDir(dstDir);
 
 
-    console.log("Generating Mac App Bundle");
+    cmds = ["unzip " + srcDir + "EditorData.zip -d " + srcDir];
 
 
-    var editorAppFolder = dstDir + "AtomicEditor.app/Contents/";
+    jake.exec(cmds, function() {
+
+      console.log("Generating Mac App Bundle");
 
 
-    fs.copySync(srcDir + "MacApps/EditorApp",
-      editorAppFolder);
+      var editorAppFolder = dstDir + "AtomicEditor.app/Contents/";
 
 
-    fs.copySync(srcDir + "EditorBinaries/Mac/AtomicEditor",
-      editorAppFolder + "MacOS/AtomicEditor");
+      fs.copySync(srcDir + "MacApps/EditorApp",
+        editorAppFolder);
 
 
-    fs.copySync(srcDir + "Resources/CoreData",
-      editorAppFolder + "Resources/CoreData");
+      fs.copySync(srcDir + "EditorBinaries/Mac/AtomicEditor",
+        editorAppFolder + "MacOS/AtomicEditor");
 
 
-    fs.copySync(srcDir + "Resources/EditorData",
-      editorAppFolder + "Resources/EditorData");
+      fs.copySync(srcDir + "Resources/CoreData",
+        editorAppFolder + "Resources/CoreData");
 
 
-    fs.copySync(srcDir + "Resources/PlayerData",
-      editorAppFolder + "Resources/PlayerData");
+      fs.copySync(srcDir + "Resources/EditorData",
+        editorAppFolder + "Resources/EditorData");
 
 
-    fs.copySync(srcDir + "Resources/ToolData",
-      editorAppFolder + "Resources/ToolData");
+      fs.copySync(srcDir + "Resources/PlayerData",
+        editorAppFolder + "Resources/PlayerData");
 
 
-    fs.copySync(srcDir + "AtomicExamples",
-      editorAppFolder + "Resources/ToolData/AtomicExamples");
+      fs.copySync(srcDir + "Resources/ToolData",
+        editorAppFolder + "Resources/ToolData");
 
 
-    fs.copySync(srcDir + "Docs",
-      editorAppFolder + "Resources/ToolData/Docs/JSDocs");
+      fs.copySync(srcDir + "AtomicExamples",
+        editorAppFolder + "Resources/ToolData/AtomicExamples");
 
 
-    complete();
+      fs.copySync(srcDir + "Docs",
+        editorAppFolder + "Resources/ToolData/Docs/JSDocs");
+
+      complete();
 
 
+    }, {
+      printStdout: true
+    });
 
 
   });
   });