You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2016/04/07 09:24:16 UTC
[1/5] git commit: [flex-utilities] [refs/heads/develop] - Update
package.json to get FlexJS 0.6.0 binaries; add FlatUI links
Repository: flex-utilities
Updated Branches:
refs/heads/develop 1491d7468 -> c22e215e2
Update package.json to get FlexJS 0.6.0 binaries; add FlatUI links
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f38731f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f38731f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f38731f5
Branch: refs/heads/develop
Commit: f38731f500056391a8bfafd36c24dddb830c0c86
Parents: 1491d74
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Apr 6 17:53:04 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Thu Apr 7 00:21:00 2016 -0700
----------------------------------------------------------------------
npm-flexjs/package.json | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f38731f5/npm-flexjs/package.json
----------------------------------------------------------------------
diff --git a/npm-flexjs/package.json b/npm-flexjs/package.json
index 241ae12..3b93e08 100644
--- a/npm-flexjs/package.json
+++ b/npm-flexjs/package.json
@@ -34,17 +34,19 @@
"mxmlc": "./js/bin/mxmlcnpm"
},
"org_apache_flex": {
- "flexjs_path_binary": "flex/flexjs/0.5.0/binaries/",
- "flexjs_file_name": "apache-flex-flexjs-0.5.0-bin.zip",
- "falcon_path_binary": "flex/falcon/0.5.0/binaries/",
- "falcon_file_name": "apache-flex-falconjx-0.5.0-bin.zip",
- "flash_player_global_url": "http://download.macromedia.com/get/flashplayer/updaters/19/",
- "flash_player_global_file_name": "playerglobal19_0.swc",
- "adobe_air_url": "http://airdownload.adobe.com/air/win/download/19.0/",
+ "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",
+ "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/",
"adobe_air_file_name": "AdobeAIRSDK.zip",
- "player_version": "19.0",
- "swf_version": "30",
+ "player_version": "21.0",
+ "swf_version": "32",
"swf_object_url": "http://github.com/swfobject/swfobject/archive/",
- "swf_object_file_name": "2.2.zip"
+ "swf_object_file_name": "2.2.zip",
+ "flatui_url": "https://github.com/designmodo/Flat-UI/archive/",
+ "flatui_file_name": "2.2.2.zip"
}
}
[3/5] git commit: [flex-utilities] [refs/heads/develop] - Handle
installation abort gracefully
Posted by bi...@apache.org.
Handle installation abort gracefully
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/59fbf7a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/59fbf7a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/59fbf7a7
Branch: refs/heads/develop
Commit: 59fbf7a7a87381e7a56093ff6e1a7be302b21627
Parents: e696300
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Apr 6 17:54:03 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Thu Apr 7 00:21:04 2016 -0700
----------------------------------------------------------------------
npm-flexjs/dependencies/download_dependencies.js | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/59fbf7a7/npm-flexjs/dependencies/download_dependencies.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/download_dependencies.js b/npm-flexjs/dependencies/download_dependencies.js
index 09b9858..e8fa370 100644
--- a/npm-flexjs/dependencies/download_dependencies.js
+++ b/npm-flexjs/dependencies/download_dependencies.js
@@ -27,9 +27,11 @@ var flashplayerglobal = require('./FlashPlayerGlobal');
var apacheFlexJS = require('./ApacheFlexJS');
var apacheFalcon = require('./ApacheFalcon');
var swfObject = require('./SWFObject');
+var flatUI = require('./FlatUI');
var installSteps = [
createDownloadsDirectory,
+ installFlatUI,
installFlashPlayerGlobal,
installAdobeAIR,
installSWFObject,
@@ -76,12 +78,14 @@ function handleInstallStepComplete(event)
function installFlashPlayerGlobal()
{
flashplayerglobal.once('complete', handleInstallStepComplete);
+ flashplayerglobal.once('abort', handleAbort);
flashplayerglobal.install();
}
function installAdobeAIR(event)
{
adobeair.once('complete', handleInstallStepComplete);
+ adobeair.once('abort', handleAbort);
adobeair.install();
}
@@ -103,9 +107,20 @@ function installSWFObject(event)
swfObject.install();
}
+function installFlatUI(event)
+{
+ flatUI.once('complete', handleInstallStepComplete);
+ flatUI.install();
+}
+
function allDownloadsComplete()
{
- console.log('Finished all downloads');
+ console.log('Installation complete!');
+}
+
+function handleAbort()
+{
+ process.exit(1);
}
start();
\ No newline at end of file
[4/5] git commit: [flex-utilities] [refs/heads/develop] - Fix license
text and colors
Posted by bi...@apache.org.
Fix license text and colors
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d50c6402
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d50c6402
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d50c6402
Branch: refs/heads/develop
Commit: d50c6402ba2283f8a956c085053e9895beeaeacc
Parents: 59fbf7a
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Apr 6 17:54:47 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Thu Apr 7 00:21:06 2016 -0700
----------------------------------------------------------------------
npm-flexjs/dependencies/AdobeAIR.js | 8 ++++---
npm-flexjs/dependencies/FlashPlayerGlobal.js | 29 ++++++++++++-----------
2 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d50c6402/npm-flexjs/dependencies/AdobeAIR.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/AdobeAIR.js b/npm-flexjs/dependencies/AdobeAIR.js
index d037a48..d9afb92 100644
--- a/npm-flexjs/dependencies/AdobeAIR.js
+++ b/npm-flexjs/dependencies/AdobeAIR.js
@@ -38,15 +38,16 @@ Apache FlexJS SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
The Adobe AIR SDK is subject to and governed by the\n\
Adobe AIR SDK License Agreement specified here:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
- This license is not compatible with the Apache v2 license.\n\
-Do you want to download and install the Adobe AIR SDK? (y/n)";
+This license is not compatible with the Apache v2 license.\n\
+Do you want to download and install the Adobe AIR SDK?\
+This is a required component (y/n)";
function promptForAdobeAIR()
{
var schema = {
properties: {
accept: {
- description: adobeAirPromptText.magenta,
+ description: adobeAirPromptText.grey,
pattern: /^[YNyn\s]{1}$/,
message: 'Please respond with either y or n'.red,
required: true
@@ -62,6 +63,7 @@ function promptForAdobeAIR()
else
{
console.log('Aborting installation');
+ AdobeAIR.emit('abort');
}
});
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d50c6402/npm-flexjs/dependencies/FlashPlayerGlobal.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/FlashPlayerGlobal.js b/npm-flexjs/dependencies/FlashPlayerGlobal.js
index 2e5e32b..a8197bc 100644
--- a/npm-flexjs/dependencies/FlashPlayerGlobal.js
+++ b/npm-flexjs/dependencies/FlashPlayerGlobal.js
@@ -32,20 +32,20 @@ var FlashPlayerGlobal = module.exports = Object.create(events.EventEmitter.proto
var flashPlayerGlobalURL = pjson.org_apache_flex.flash_player_global_url;
var fileNameFlashPlayerGlobal = pjson.org_apache_flex.flash_player_global_file_name;
var flashPlayerGlobalPromptText = "\
- Apache FlexJS SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
- \n\
- The playerglobal.swc file is subject to and governed by the\n\
- Adobe Flex SDK License Agreement specified here:\n\
- http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
- By downloading, modifying, distributing, using and/or accessing the playerglobal.swc file\n\
- you agree to the terms and conditions of the applicable end user license agreement.\n\
- \n\
- In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here:\n\
- http://www.adobe.com/products/eula/third_party/.\n\
- Adobe recommends that you review these third-party terms.\n\
- \n\
- This license is not compatible with the Apache v2 license.\n\
- Do you want to download and install the playerglobal.swc? (y/n)";
+Apache FlexJS SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+The playerglobal.swc file is subject to and governed by the\n\
+Adobe Flex SDK License Agreement specified here:\n\
+http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
+By downloading, modifying, distributing, using and/or accessing the playerglobal.swc file\n\
+you agree to the terms and conditions of the applicable end user license agreement.\n\
+\n\
+In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here:\n\
+http://www.adobe.com/products/eula/third_party/.\n\
+Adobe recommends that you review these third-party terms.\n\
+\n\
+This license is not compatible with the Apache v2 license.\n\
+Do you want to download and install the playerglobal.swc?\n\
+This is a required component (y/n)";
FlashPlayerGlobal.promptForFlashPlayerGlobal = function()
{
@@ -68,6 +68,7 @@ FlashPlayerGlobal.promptForFlashPlayerGlobal = function()
else
{
console.log('Aborting installation');
+ FlashPlayerGlobal.emit('abort');
}
});
};
[5/5] git commit: [flex-utilities] [refs/heads/develop] - Fix up
README; upgrade vesion number to 0.6.0
Posted by bi...@apache.org.
Fix up README; upgrade vesion number to 0.6.0
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/c22e215e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/c22e215e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/c22e215e
Branch: refs/heads/develop
Commit: c22e215e2f9dc2547dd53db7c0da6eee64f0a04b
Parents: d50c640
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Thu Apr 7 00:19:55 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Thu Apr 7 00:21:08 2016 -0700
----------------------------------------------------------------------
npm-flexjs/README.md | 13 ++++++++++++-
npm-flexjs/package.json | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c22e215e/npm-flexjs/README.md
----------------------------------------------------------------------
diff --git a/npm-flexjs/README.md b/npm-flexjs/README.md
index 2e2d350..bac0c2c 100644
--- a/npm-flexjs/README.md
+++ b/npm-flexjs/README.md
@@ -52,4 +52,15 @@ Examples
ASJSC (Write ActionScript3 targeting HTML5/SVG DOM without requiring JavaScript):
Windows: asjsc C:\Users\<username>\AppData\Roaming\npm\node_modules\flexjs\examples\native\USStatesMap\src\USStatesMap.as
- Mac: asjsc /usr/local/lib/node_modules/flexjs/examples/native/USStatesMap/src/USStatesMap.as
\ No newline at end of file
+ Mac: asjsc /usr/local/lib/node_modules/flexjs/examples/native/USStatesMap/src/USStatesMap.as
+
+
+Note
+=================================
+
+ Note: Apache Flex™, Flex, FlexJS and Apache™ are trademarks of The Apache Software Foundation.
+ The Apache Flex SDK product page is located here: http://flex.apache.org
+
+ Adobe Flash, Adobe AIR, and Adobe PhoneGap are either registered trademarks or trademarks
+ of Adobe Systems Incorporated in the United States and/or other countries and are used by
+ permission from Adobe.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c22e215e/npm-flexjs/package.json
----------------------------------------------------------------------
diff --git a/npm-flexjs/package.json b/npm-flexjs/package.json
index 3b93e08..6181aea 100644
--- a/npm-flexjs/package.json
+++ b/npm-flexjs/package.json
@@ -1,6 +1,6 @@
{
"name": "flexjs",
- "version": "0.5.5",
+ "version": "0.6.0",
"description": "Apache FlexJS",
"keywords": [
"flex",
[2/5] git commit: [flex-utilities] [refs/heads/develop] - Add FlatUI
dependency download (optional)
Posted by bi...@apache.org.
Add FlatUI dependency download (optional)
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e6963007
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e6963007
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e6963007
Branch: refs/heads/develop
Commit: e696300772997136985f3f2a8e4b912f39a7abca
Parents: f38731f
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Apr 6 17:53:32 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Thu Apr 7 00:21:02 2016 -0700
----------------------------------------------------------------------
npm-flexjs/dependencies/FlatUI.js | 130 +++++++++++++++++++++++++++++++++
1 file changed, 130 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e6963007/npm-flexjs/dependencies/FlatUI.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/FlatUI.js b/npm-flexjs/dependencies/FlatUI.js
new file mode 100644
index 0000000..983d96a
--- /dev/null
+++ b/npm-flexjs/dependencies/FlatUI.js
@@ -0,0 +1,130 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+var request = require('request');
+var fs = require('fs');
+var events = require('events');
+var unzip = require('unzip');
+var mkdirp = require('mkdirp');
+var pjson = require('../package');
+var prompt = require('prompt');
+
+var constants = require('../dependencies/Constants');
+
+var FlatUI = module.exports = Object.create(events.EventEmitter.prototype);
+
+//FlatUI
+var flatUIURL = pjson.org_apache_flex.flatui_url;
+var fileNameFlatUI = pjson.org_apache_flex.flatui_file_name;
+var promptText =
+"Apache FlexJS includes an optional component set\n\
+that uses fonts from designmodo.com. The font\n\
+files are subject to and governed by the\n\
+Creative Commons Attribution-NonCommercial-NoDerivs 3.0\n\
+Unported license: http://creativecommons.org/licenses/by-nc-nd/3.0/\n\
+This license is not compatible with the Apache v2 license.\n\
+Do you want to install the designmodo fonts?\n\
+This is an optional component (y/n)";
+
+FlatUI.prompt = function()
+{
+ var schema = {
+ properties: {
+ accept: {
+ description: promptText.yellow,
+ pattern: /^[YNyn\s]{1}$/,
+ message: 'Please respond with either y or n'.red,
+ required: true
+ }
+ }
+ };
+ prompt.start();
+ prompt.get(schema, function (err, result) {
+ if(result.accept.toLowerCase() == 'y')
+ {
+ FlatUI.downloadFlatUI();
+ }
+ else
+ {
+ console.log('Skipping FlatUI installation');
+ FlatUI.emit('complete');
+ }
+ });
+};
+
+FlatUI.downloadFlatUI = function()
+{
+ console.log('Downloading FlatUI');
+ request
+ .get(flatUIURL + fileNameFlatUI)
+ .pipe(fs.createWriteStream(constants.DOWNLOADS_FOLDER + fileNameFlatUI)
+ .on('finish', function(){
+ console.log('FlatUI download complete');
+ extract();
+ })
+ );
+};
+
+function extract()
+{
+ var fontsDir = 'frameworks/fonts/';
+ try
+ {
+ mkdirp(constants.FLEXJS_FOLDER + fontsDir);
+ }
+ catch(e)
+ {
+ if ( e.code != 'EEXIST' ) throw e;
+ }
+ console.log('Extracting FlatUI');
+ fs.createReadStream(constants.DOWNLOADS_FOLDER + fileNameFlatUI)
+ .pipe(unzip.Parse())
+ .on('entry', function (entry) {
+ var fileName = entry.path;
+ if (fileName === 'Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot') {
+ entry.pipe(fs.createWriteStream(constants.FLEXJS_FOLDER + fontsDir + 'flat-ui-icons-regular.eot'));
+ }
+ else if (fileName === 'Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf') {
+ entry.pipe(fs.createWriteStream(constants.FLEXJS_FOLDER + fontsDir + 'flat-ui-icons-regular.ttf'));
+ }
+ else if (fileName === 'Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg') {
+ entry.pipe(fs.createWriteStream(constants.FLEXJS_FOLDER + fontsDir + 'flat-ui-icons-regular.svg'));
+ }
+ else if (fileName === 'Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff') {
+ entry.pipe(fs.createWriteStream(constants.FLEXJS_FOLDER + fontsDir + 'flat-ui-icons-regular.woff'));
+ }
+ else if (fileName === 'Flat-UI-2.2.2/README.md') {
+ entry.pipe(fs.createWriteStream(constants.FLEXJS_FOLDER + fontsDir + 'README.md'));
+ }
+ else {
+ entry.autodrain();
+ }
+ })
+ .on('finish', function(){
+ console.log('FlatUI extraction complete');
+ FlatUI.emit('complete');
+ })
+
+}
+
+FlatUI.install = function()
+{
+ FlatUI.prompt();
+};
\ No newline at end of file