Browse Source

Merge pull request #1221 from AtomicGameEngine/JME-ATOMIC-WEBCI

Adding WebGL player copy for CI editor build task
JoshEngebretson 9 years ago
parent
commit
ba58778673
1 changed files with 20 additions and 5 deletions
  1. 20 5
      Build/Scripts/PackageEditor.js

+ 20 - 5
Build/Scripts/PackageEditor.js

@@ -4,6 +4,9 @@ var config = require("./BuildConfig");
 
 namespace('package', function() {
 
+    // TODO: Look into if possible to archive on jenkins with different base dir than workspace
+    var webplayerSrcDir = config.artifactsRoot + "Artifacts/DistGen/Artifacts/AtomicEditor/AtomicEditor.app/Contents/Resources/ToolData/Deployment/Web";
+
     task('windows_editor', {
         async: true
     }, function() {
@@ -13,6 +16,12 @@ namespace('package', function() {
 
         host.cleanCreateDir(dstDir);
 
+        // Copy WebGL CI artifacts into editor package
+        if (fs.existsSync(webplayerSrcDir)) {
+            fs.copySync(webplayerSrcDir,
+            config.artifactsRoot + "Artifacts/AtomicEditor/Resources/ToolData/Deployment/");
+        }
+
         var installerName = "AtomicEditor_Windows64_Setup_" + config.buildSHA + ".exe";
         var installerPath = config.artifactsRoot + "Dist/" + installerName;
 
@@ -69,6 +78,12 @@ namespace('package', function() {
 
         host.cleanCreateDir(dstDir);
 
+        // Copy WebGL CI artifacts into editor package
+        if (fs.existsSync(webplayerSrcDir)) {
+            fs.copySync(webplayerSrcDir,
+            config.artifactsRoot + "Artifacts/AtomicEditor/AtomicEditor.app/Contents/Resources/ToolData/Deployment/");
+        }
+
         cmds = [];
 
         if (config.jenkins) {
@@ -97,7 +112,7 @@ namespace('package', function() {
         });
 
     });
-    
+
     task('linux_editor', {
         async: true
     }, function() {
@@ -109,14 +124,14 @@ namespace('package', function() {
 
         host.cleanCreateDir(dstDir);  // create new staging directory
         fs.removeSync(dstDeb);  // remove old one, if there
-        
+
         // copy in the two magic dirs
         fs.copySync(config.atomicRoot + "Build/Linux/DEBIAN", dstDir + "DEBIAN");
         fs.copySync(config.atomicRoot + "Build/Linux/usr", dstDir + "usr" );
 
         // copy in the atomic dir
         fs.copySync(editorAppFolder, dstDir + "usr/share/atomicgameengine" );
-       
+
         //copy in menu pixmap
         fs.copySync(config.atomicRoot + "Build/Linux/atomic_menu.xpm", dstDir + "usr/share/atomicgameengine/atomic_menu.xpm" );
 
@@ -124,10 +139,10 @@ namespace('package', function() {
         fs.copySync(config.atomicRoot + "LICENSE.md", dstDir + "usr/share/doc/atomicgameengine/copyright" );
 
         cmds = [];
-        
+
         // go to staging root directory
         cmds.push("cd " + config.artifactsRoot + " ;" );
-        
+
         // get rid of some lintian errors
         cmds.push("find " + dstDir + "usr/share/atomicgameengine/ -name .gitignore -type f -delete ;");
         cmds.push("find " + dstDir + "usr/share/atomicgameengine/ -maxdepth 9 -type f -print0 | xargs -0 chmod oug-x ;");