flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/2] git commit: [flex-utilities] [refs/heads/develop] - update npm scripts in preparation for 0.7.0 binary package layout changes. The ApacheFalcon and ApacheFlexJS scripts are currently wired to the nightly builds and will need to be flipped back to
Date Tue, 30 Aug 2016 19:43:47 GMT
update npm scripts in preparation for 0.7.0 binary package layout changes.  The ApacheFalcon
and ApacheFlexJS scripts are currently wired to the nightly builds and will need to be flipped
back to the release after the mirror propagation is complete


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/3bcfdf1b
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/3bcfdf1b
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/3bcfdf1b

Branch: refs/heads/develop
Commit: 3bcfdf1bb99aeb6a1bde634bcea7eda3cbfb481e
Parents: fa67647
Author: Alex Harui <aharui@apache.org>
Authored: Tue Aug 30 12:43:08 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Aug 30 12:43:08 2016 -0700

----------------------------------------------------------------------
 npm-flexjs/dependencies/ApacheFalcon.js         | 44 +++++++++++++-------
 npm-flexjs/dependencies/ApacheFlexJS.js         | 11 ++++-
 .../dependencies/download_dependencies.js       |  2 +-
 npm-flexjs/package.json                         | 10 ++---
 4 files changed, 44 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3bcfdf1b/npm-flexjs/dependencies/ApacheFalcon.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/ApacheFalcon.js b/npm-flexjs/dependencies/ApacheFalcon.js
index d0edfa2..d9e5c86 100644
--- a/npm-flexjs/dependencies/ApacheFalcon.js
+++ b/npm-flexjs/dependencies/ApacheFalcon.js
@@ -39,6 +39,7 @@ var playerVersion = pjson.org_apache_flex.player_version;
 var swfVersion = pjson.org_apache_flex.swf_version;
 
 var falconCompilerLibFolder = 'falcon/compiler/lib/';
+var falconLibExternalFolder = 'lib/external/';
 var jsLibFolder = constants.FLEXJS_FOLDER + 'js/lib/';
 var googleClosureCompilerFolder =  constants.FLEXJS_FOLDER + 'js/lib/google/closure-compiler/';
 
@@ -54,7 +55,7 @@ var falconDependencies = [
     {
         url:'http://search.maven.org/remotecontent?filepath=org/antlr/antlr-complete/3.5.2/',
         remoteFileName:'antlr-complete-3.5.2.jar',
-        destinationPath:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder,
+        destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder,
         destinationFileName:'antlr.jar',
         unzip:false
     },
@@ -64,7 +65,7 @@ var falconDependencies = [
         destinationPath:constants.DOWNLOADS_FOLDER,
         destinationFileName:'',
         pathOfFileToBeCopiedFrom:'commons-cli-1.2/commons-cli-1.2.jar',
-        pathOfFileToBeCopiedTo:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder + 'commons-cli.jar',
+        pathOfFileToBeCopiedTo:constants.FLEXJS_FOLDER + falconLibExternalFolder + 'commons-cli.jar',
         unzip:true
     },
     {
@@ -73,20 +74,20 @@ var falconDependencies = [
         destinationPath:constants.DOWNLOADS_FOLDER,
         destinationFileName:'',
         pathOfFileToBeCopiedFrom:'commons-io-2.4/commons-io-2.4.jar',
-        pathOfFileToBeCopiedTo:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder + 'commons-io.jar',
+        pathOfFileToBeCopiedTo:constants.FLEXJS_FOLDER + falconLibExternalFolder + 'commons-io.jar',
         unzip:true
     },
     {
         url:'http://search.maven.org/remotecontent?filepath=/com/google/guava/guava/17.0/',
         remoteFileName:'guava-17.0.jar',
-        destinationPath:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder,
+        destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder,
         destinationFileName:'guava.jar',
         unzip:false
     },
     {
-        url:'http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler/lib/',
-        remoteFileName:'jburg.jar',
-        destinationPath:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder,
+        url:'http://search.maven.org/remotecontent?filepath=/net/sourceforge/jburg/jburg/1.10.2',
+        remoteFileName:'jburg-1.10.2.jar',
+        destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder,
         destinationFileName:'jburg.jar',
         unzip:false
     },
@@ -96,7 +97,7 @@ var falconDependencies = [
         destinationPath:constants.DOWNLOADS_FOLDER,
         destinationFileName:'',
         pathOfFileToBeCopiedFrom:'jflex-1.6.0/lib/jflex-1.6.0.jar',
-        pathOfFileToBeCopiedTo:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder + 'jflex.jar',
+        pathOfFileToBeCopiedTo:constants.FLEXJS_FOLDER + falconLibExternalFolder + 'jflex.jar',
         unzip:true
     },
     {
@@ -105,13 +106,13 @@ var falconDependencies = [
         destinationPath:constants.DOWNLOADS_FOLDER + 'lzma/',
         destinationFileName:'lzma-9.20.jar.zip',
         pathOfFileToBeCopiedFrom:'lzma-9.20.jar',
-        pathOfFileToBeCopiedTo:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder + 'lzma-sdk.jar',
+        pathOfFileToBeCopiedTo:constants.FLEXJS_FOLDER + falconLibExternalFolder + 'lzma-sdk.jar',
         unzip:true
     },
     {
         url:'http://search.maven.org/remotecontent?filepath=org/apache/flex/flex-tool-api/1.0.0/',
         remoteFileName:'flex-tool-api-1.0.0.jar',
-        destinationPath:constants.DOWNLOADS_FOLDER + falconCompilerLibFolder,
+        destinationPath:constants.FLEXJS_FOLDER + falconLibExternalFolder,
         destinationFileName:'flex-tool-api.jar',
         unzip:false
     },
@@ -242,7 +243,7 @@ ApacheFalcon.prepareForFalconDependencies = function()
 
     try
     {
-        mkdirp(constants.FLEXJS_FOLDER + 'externs');
+        mkdirp(constants.FLEXJS_FOLDER + 'flex-typedefs');
     }
     catch(e)
     {
@@ -312,7 +313,7 @@ ApacheFalcon.copyFiles = function()
     var mergedirs = require('merge-dirs');
 
     //Bin
-    mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/compiler/generated/dist/sdk/bin',
+    mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/compiler/src/assembly/scripts',
         constants.FLEXJS_FOLDER + 'bin',
         'overwrite');
 
@@ -324,17 +325,19 @@ ApacheFalcon.copyFiles = function()
         constants.FLEXJS_FOLDER + 'js/libs',
         'overwrite');
 
-    mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/externs',
-        constants.FLEXJS_FOLDER + 'externs',
+    mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/flex-typedefs',
+        constants.FLEXJS_FOLDER + 'flex-typedefs',
         'overwrite');
 
-    mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/compiler/generated/dist/sdk/lib',
+    mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/compiler/lib',
         constants.FLEXJS_FOLDER + 'lib',
         'overwrite');
 
+    /*
     mergedirs.default(constants.DOWNLOADS_FOLDER + 'falcon/compiler/lib',
         constants.FLEXJS_FOLDER + 'lib/external',
         'overwrite');
+	*/
 
 /*    fs.createReadStream(constants.DOWNLOADS_FOLDER + 'falcon/compiler/generated/dist/sdk/lib/'
+ 'falcon-mxmlc.jar')
         .pipe(fs.createWriteStream(jsLibFolder + 'mxmlc.jar'));
@@ -416,5 +419,14 @@ ApacheFalcon.falconInstallComplete = function()
 
 ApacheFalcon.install = function()
 {
-    request(constants.APACHE_MIRROR_RESOLVER_URL + pathToFalconBinary + fileNameFalconBinary
+ '?' + constants.REQUEST_JSON_PARAM, ApacheFalcon.handleFalconMirrorsResponse);
+    //request(constants.APACHE_MIRROR_RESOLVER_URL + pathToFalconBinary + fileNameFalconBinary
+ '?' + constants.REQUEST_JSON_PARAM, ApacheFalcon.handleFalconMirrorsResponse);
+    console.log('Downloading Apache Flex Falcon Compiler');
+	request
+		.get("http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/lastSuccessfulBuild/artifact/out/apache-flex-falconjx-0.7.0-bin.zip")
+		.pipe(fs.createWriteStream(constants.DOWNLOADS_FOLDER + fileNameFalconBinary)
+			.on('finish', function(){
+				console.log('Apache Flex Falcon Compiler download complete');
+				ApacheFalcon.extract();
+			})
+	);
 };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3bcfdf1b/npm-flexjs/dependencies/ApacheFlexJS.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/ApacheFlexJS.js b/npm-flexjs/dependencies/ApacheFlexJS.js
index deee801..bb28cfa 100644
--- a/npm-flexjs/dependencies/ApacheFlexJS.js
+++ b/npm-flexjs/dependencies/ApacheFlexJS.js
@@ -64,5 +64,14 @@ ApacheFlexJS.extract = function()
 
 ApacheFlexJS.install = function()
 {
-    request(constants.APACHE_MIRROR_RESOLVER_URL + pathToFlexJSBinary + fileNameFlexJSBinary
+ '?' + constants.REQUEST_JSON_PARAM, ApacheFlexJS.handleFlexJSMirrorsResponse);
+    //request(constants.APACHE_MIRROR_RESOLVER_URL + pathToFlexJSBinary + fileNameFlexJSBinary
+ '?' + constants.REQUEST_JSON_PARAM, ApacheFlexJS.handleFlexJSMirrorsResponse);
+    console.log('Downloading Apache FlexJS');
+	request
+		.get("http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/lastSuccessfulBuild/artifact/out/apache-flex-flexjs-0.7.0-bin.zip")
+		.pipe(fs.createWriteStream(constants.DOWNLOADS_FOLDER + fileNameFlexJSBinary)
+			.on('close', function(){
+				console.log('Apache FlexJS download complete');
+				ApacheFlexJS.extract();
+			})
+	);
 };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3bcfdf1b/npm-flexjs/dependencies/download_dependencies.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/download_dependencies.js b/npm-flexjs/dependencies/download_dependencies.js
index d71996d..6aadc2d 100644
--- a/npm-flexjs/dependencies/download_dependencies.js
+++ b/npm-flexjs/dependencies/download_dependencies.js
@@ -69,7 +69,7 @@ function updateScriptEOL()
                 //mac, linux, or cygwin scripts
                 data = eol.lf(data);
             }
-            fs.writeFileSync(filePath, data, {encoding: 'utf8', mode: 0o755});
+            fs.writeFileSync(filePath, data, {encoding: 'utf8', mode: 0x755});
         }
         while(files.length > 0)
     }

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3bcfdf1b/npm-flexjs/package.json
----------------------------------------------------------------------
diff --git a/npm-flexjs/package.json b/npm-flexjs/package.json
index 0fd08b3..85d7677 100644
--- a/npm-flexjs/package.json
+++ b/npm-flexjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flexjs",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Apache FlexJS",
   "keywords": [
     "flex",
@@ -35,10 +35,10 @@
     "mxmlc": "./js/bin/mxmlcnpm"
   },
   "org_apache_flex": {
-    "flexjs_path_binary": "flex/flexjs/0.6.0/binaries/",
-    "flexjs_file_name": "apache-flex-flexjs-0.6.0-bin.zip",
-    "falcon_path_binary": "flex/falcon/0.6.0/binaries/",
-    "falcon_file_name": "apache-flex-falconjx-0.6.0-bin.zip",
+    "flexjs_path_binary": "flex/flexjs/0.7.0/binaries/",
+    "flexjs_file_name": "apache-flex-flexjs-0.7.0-bin.zip",
+    "falcon_path_binary": "flex/falcon/0.7.0/binaries/",
+    "falcon_file_name": "apache-flex-falconjx-0.7.0-bin.zip",
     "flash_player_global_url": "http://download.macromedia.com/get/flashplayer/updaters/21/",
     "flash_player_global_file_name": "playerglobal21_0.swc",
     "adobe_air_url": "http://airdownload.adobe.com/air/win/download/21.0/",


Mime
View raw message