Jelajahi Sumber

Build editor scripts along with bindings on Windows/Mac

JoshEngebretson 10 tahun lalu
induk
melakukan
42f24c9b6e

+ 7 - 0
Build/Scripts/BuildCommon.js

@@ -1,4 +1,5 @@
 var fs = require('fs-extra');
+var os = require('os');
 var path = require("path");
 var host = require("./Host");
 var atomicRoot = host.atomicRoot;
@@ -17,6 +18,12 @@ namespace('build', function() {
             cmds.push(bindCmd + "Script/Packages/" + pkgName + "/ " + platform);
         }
 
+        // Compile the Editor Scripts        
+        if (os.platform() == "win32")
+          cmds.push(atomicRoot + "Build/Windows/node/node.exe " + atomicRoot + "Build/TypeScript/tsc.js -p " + atomicRoot + "Script");
+        else if (os.platform() == "darwin")
+          cmds.push(atomicRoot + "Build/Mac/node/node " + atomicRoot + "Build/TypeScript/tsc.js -p " + atomicRoot + "Script");
+
         jake.exec(cmds, function() {
 
           complete();

+ 0 - 3
Build/Scripts/BuildWindows.js

@@ -30,9 +30,6 @@ namespace('build', function() {
     // Build the AtomicEditor
     cmds.push(atomicRoot + "Build/Scripts/Windows/CompileAtomicEditor.bat");
 
-    // Compile the Editor Scripts
-    cmds.push(atomicRoot + "Build/Windows/node/node.exe " + atomicRoot + "Build/TypeScript/tsc.js -p " + atomicRoot + "Script");
-
     jake.exec(cmds, function() {
 
       // Copy the Editor binaries

+ 1 - 2
Build/Scripts/HostMac.js

@@ -28,8 +28,7 @@ namespace('build', function() {
       bindCmd + "Script/Packages/AtomicPlayer/ MACOSX",
       bindCmd + "Script/Packages/ToolCore/ MACOSX",
       bindCmd + "Script/Packages/Editor/ MACOSX",
-      bindCmd + "Script/Packages/AtomicNET/ MACOSX",
-      atomicRoot + "Build/Mac/node/node " + atomicRoot + "Build/TypeScript/tsc.js -p " + atomicRoot + "Script",
+      bindCmd + "Script/Packages/AtomicNET/ MACOSX",      
       "cmake ../../../ -DATOMIC_DEV_BUILD=1 -G Xcode",
       "xcodebuild -configuration Debug"
     ]