Browse Source

Adding mac editor build task

Josh Engebretson 10 years ago
parent
commit
854e1f40dc

+ 2 - 2
Build/CIScripts/BuildMac.js

@@ -21,7 +21,7 @@ namespace('build', function() {
     var cmds = [
     var cmds = [
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/Atomic/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/Atomic/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/AtomicPlayer/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/AtomicPlayer/ MACOSX",
-      "cmake -DATOMICTOOL_NOGEN=1 -G Xcode ../../../../",
+      "cmake -DATOMIC_DEV_BUILD=0 -G Xcode ../../../../",
       "xcodebuild -target AtomicPlayer -configuration Release"
       "xcodebuild -target AtomicPlayer -configuration Release"
     ];
     ];
 
 
@@ -55,7 +55,7 @@ namespace('build', function() {
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/ToolCore/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/ToolCore/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/Editor/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/Editor/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/AtomicNET/ MACOSX",
       atomicTool + " bind " + bcommon.atomicRoot + " Script/Packages/AtomicNET/ MACOSX",
-      "cmake -DATOMICTOOL_NOGEN=1 -G Xcode ../../../../",
+      "cmake -DATOMIC_DEV_BUILD=0 -G Xcode ../../../../",
       "xcodebuild -target AtomicEditor -configuration Release"
       "xcodebuild -target AtomicEditor -configuration Release"
     ];
     ];
 
 

+ 1 - 1
Build/CIScripts/GenEditorData.js

@@ -90,7 +90,7 @@ namespace('build', function() {
     async: true
     async: true
   }, function() {
   }, function() {
 
 
-    console.log("compiling Editor Scripts");
+    console.log("Compiling Editor Scripts");
 
 
     var scriptFolder = atomicRoot + "Resources/EditorData/AtomicEditor/EditorScripts/";
     var scriptFolder = atomicRoot + "Resources/EditorData/AtomicEditor/EditorScripts/";
 
 

+ 47 - 0
Build/CIScripts/GenMacEditor.js

@@ -0,0 +1,47 @@
+var fs = require('fs-extra');
+var bcommon = require("./BuildCommon");
+var host = require("./Host");
+
+var atomicRoot = bcommon.atomicRoot;
+var srcDir = bcommon.artifactsRoot + "Build/EditorData/";
+var dstDir = bcommon.artifactsRoot + "Build/MacEditor/";
+
+namespace('build', function() {
+
+  task('genmaceditor', {
+    async: true
+  }, function() {
+
+    bcommon.cleanCreateDir(dstDir);
+
+    console.log("Generating Mac App Bundle");
+
+    var editorAppFolder = dstDir + "AtomicEditor.app/Contents/";
+
+    fs.copySync(srcDir + "MacApps/EditorApp",
+      editorAppFolder);
+
+    fs.copySync(srcDir + "EditorBinaries/Mac/AtomicEditor",
+      editorAppFolder + "MacOS/AtomicEditor");
+
+    fs.copySync(srcDir + "Resources/CoreData",
+      editorAppFolder + "Resources/CoreData");
+
+    fs.copySync(srcDir + "Resources/PlayerData",
+      editorAppFolder + "Resources/PlayerData");
+
+    fs.copySync(srcDir + "Resources/ToolData",
+      editorAppFolder + "Resources/ToolData");
+
+    fs.copySync(srcDir + "AtomicExamples",
+      editorAppFolder + "Resources/ToolData/AtomicExamples");
+
+    fs.copySync(srcDir + "Docs",
+      editorAppFolder + "Resources/ToolData/Docs/JSDocs");
+
+    complete();
+
+
+  });
+
+}); // end of build namespace

+ 1 - 0
Build/CIScripts/Host.js

@@ -8,6 +8,7 @@ if (os.platform() == "darwin") {
   require("./BuildWeb");
   require("./BuildWeb");
   require("./BuildAndroid");
   require("./BuildAndroid");
   require("./GenEditorData");
   require("./GenEditorData");
+  require("./GenMacEditor");
 
 
 } else if (os.platform() == "win32") {
 } else if (os.platform() == "win32") {
   module.exports = require("./HostWindows");
   module.exports = require("./HostWindows");

+ 1 - 1
Build/CIScripts/Windows/CompileAtomic.bat

@@ -1,3 +1,3 @@
 call "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
 call "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
-cmake ..\\..\\..\\ -DATOMIC_DEV_BUILD=1 -G "Visual Studio 14 2015 Win64"
+cmake ..\\..\\..\\ -DATOMIC_DEV_BUILD=0 -G "Visual Studio 14 2015 Win64"
 msbuild /m Atomic.sln /p:Configuration=Release /p:Platform=x64
 msbuild /m Atomic.sln /p:Configuration=Release /p:Platform=x64