瀏覽代碼

Merge pull request #1063 from AtomicGameEngine/JME-ATOMIC-TWEAKS

Make the AtomicNET requirement buttons more clear, always cleanly create the editor target folder regardless of noclean option
JoshEngebretson 9 年之前
父節點
當前提交
4cfbb46947

+ 4 - 4
Build/Scripts/BuildLinux.js

@@ -23,9 +23,6 @@ function copyAtomicNET() {
 
 
 function copyAtomicEditor() {
 function copyAtomicEditor() {
 
 
-    if ( config["noclean"])
-        host.cleanCreateDir(editorAppFolder);
-
     // Copy the Editor binaries
     // Copy the Editor binaries
     fs.copySync(buildDir + "Source/AtomicEditor/AtomicEditor",
     fs.copySync(buildDir + "Source/AtomicEditor/AtomicEditor",
     config.artifactsRoot + "AtomicEditor/AtomicEditor");
     config.artifactsRoot + "AtomicEditor/AtomicEditor");
@@ -104,8 +101,11 @@ namespace('build', function() {
         async: true
         async: true
     }, function() {
     }, function() {
 
 
+        // Always cleanly create the editor target folder
+        host.cleanCreateDir(editorAppFolder);
+
         // We clean atomicNET here as otherwise platform binaries would be deleted
         // We clean atomicNET here as otherwise platform binaries would be deleted
-        var createDirs = [config.artifactsRoot + "AtomicNET/", buildDir, editorAppFolder, host.getGenScriptRootDir()];
+        var createDirs = [config.artifactsRoot + "AtomicNET/", buildDir, host.getGenScriptRootDir()];
 
 
         var removeDirs = [config.artifactsRoot + "Build/Android/"];
         var removeDirs = [config.artifactsRoot + "Build/Android/"];
 
 

+ 4 - 1
Build/Scripts/BuildMac.js

@@ -84,8 +84,11 @@ namespace('build', function() {
         async: true
         async: true
     }, function() {
     }, function() {
 
 
+        // Always cleanly create the editor target folder
+        host.cleanCreateDir(config.editorAppFolder);
+
         // We clean atomicNET here as otherwise platform binaries would be deleted
         // We clean atomicNET here as otherwise platform binaries would be deleted
-        var createDirs = [config.artifactsRoot + "AtomicNET/", buildDir, config.editorAppFolder, host.getGenScriptRootDir()];
+        var createDirs = [config.artifactsRoot + "AtomicNET/", buildDir, host.getGenScriptRootDir()];
         var removeDirs = [config.artifactsRoot + "Build/Android/", config.artifactsRoot + "Build/IOS/"];
         var removeDirs = [config.artifactsRoot + "Build/Android/", config.artifactsRoot + "Build/IOS/"];
 
 
         host.setupDirs(!config.noclean, createDirs, removeDirs);
         host.setupDirs(!config.noclean, createDirs, removeDirs);

+ 4 - 1
Build/Scripts/BuildWindows.js

@@ -86,8 +86,11 @@ namespace('build', function() {
         async: true
         async: true
     }, function() {
     }, function() {
 
 
+        // Always cleanly create the editor target folder
+        host.cleanCreateDir(editorAppFolder);
+
         // We clean atomicNET here as otherwise platform binaries would be deleted
         // We clean atomicNET here as otherwise platform binaries would be deleted
-        var createDirs = [config.artifactsRoot + "AtomicNET/", buildDir, editorAppFolder, host.getGenScriptRootDir()];
+        var createDirs = [config.artifactsRoot + "AtomicNET/", buildDir, host.getGenScriptRootDir()];
 
 
         var removeDirs = [config.artifactsRoot + "Build/Android/"];
         var removeDirs = [config.artifactsRoot + "Build/Android/"];
 
 

+ 1 - 1
Resources/EditorData/AtomicEditor/editor/ui/atomicnetwindow.tb.txt

@@ -10,5 +10,5 @@ TBLayout: axis: y, distribution: gravity
         TBButton: text: "...", id: download_button, skin: TBButton.greentext
         TBButton: text: "...", id: download_button, skin: TBButton.greentext
             font: size: 16
             font: size: 16
             lp: min-width: 128, min-height: 64
             lp: min-width: 128, min-height: 64
-        TBButton: text: Ok, id: ok
+        TBButton: text: "Download Later", id: ok
             lp: min-width: 64, min-height: 64
             lp: min-width: 64, min-height: 64