update license, notice and readme based on review by Justin
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fc1b0d01 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fc1b0d01 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fc1b0d01 Branch: refs/heads/develop Commit: fc1b0d017231c4a4fa239596d430357230290625 Parents: 4916bc1 Author: Alex Harui <[email protected]> Authored: Sun Sep 6 21:36:42 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Sun Sep 6 21:36:42 2015 -0700 ---------------------------------------------------------------------- LICENSE | 5 +---- LICENSE.bin | 19 +++++++++++++------ NOTICE | 5 +---- READme | 45 ++++++++++++++++++++------------------------- 4 files changed, 35 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 1f3e388..21f2725 100644 --- a/LICENSE +++ b/LICENSE @@ -210,9 +210,6 @@ separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. -Portions of frameworks/projects/HTML/src/defaults.css is based on +Portions of frameworks/projects/Flat/as/defaults.css is based on designmodoâs (http://designmodo.com/flat-free/) Flat UI which is available under an MIT license. - -Google Closure Library is available under Apache License 2.0. For details -see https://developers.google.com/closure/library/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/LICENSE.bin ---------------------------------------------------------------------- diff --git a/LICENSE.bin b/LICENSE.bin index 95ea89f..2c5e7a2 100644 --- a/LICENSE.bin +++ b/LICENSE.bin @@ -2,12 +2,19 @@ Below are the licenses for components included in the binary distribution. ------------------------------------------------------------------------------------------ -frameworks/fonts/flat-ui-icons-regular.eot -frameworks/fonts/flat-ui-icons-regular.ttf -frameworks/fonts/flat-ui-icons-regular.svg -frameworks/fonts/flat-ui-icons-regular.woff - This product bundles designmodoâs (http://designmodo.com/flat-free/) Flat UI glyph fonts available under an MIT license. For details, see - frameworks/fonts/README.md + +This product bundles Google Closure Library available under Apache License 2.0. +For details see https://developers.google.com/closure/library/ + +Google Closure Library appears to bundle: +- Mochikit, available under MIT License. See: + js/lib/google/closure-library/third_party/closure/goog/mochikit +- SVGPan, available under a â2-clauseâ BSD License. See: + js/lib/google/closure-library/third_party/closure/goog/svgpan/svgpan.js +- Dojo, available under a â3-clauseâ BSD License. See: + js/lib/google/closure-library/third_party/closure/goog/dojo/dom/query.js +- JPEG Encoder, available under a â3-clauseâ BSD License. See: + js/lib/google/closure-library/third_party/closure/goog/jpeg_encoder/jpeg_encoder_basic.js http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index ab4cb3d..76f24f4 100644 --- a/NOTICE +++ b/NOTICE @@ -1,8 +1,5 @@ Apache FlexJS -Copyright 2014 The Apache Software Foundation +Copyright 2015 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - -Google Closure Library is available under Apache License 2.0. For details -see https://developers.google.com/closure/library/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/READme ---------------------------------------------------------------------- diff --git a/READme b/READme index 8d93209..e8a799e 100644 --- a/READme +++ b/READme @@ -25,27 +25,19 @@ Getting the latest sources via git You can always checkout the latest source via git using the following command: - git clone https://git-wip-us.apache.org/repos/asf/flex-asjs.git asjs - cd asjs + git clone https://git-wip-us.apache.org/repos/asf/flex-asjs.git flex-asjs + cd flex-asjs git checkout develop - The Apache Flex Compiler also requires code from other Apache Flex git - repositories or an Apache Flex SDK. To get the latest source via git - for the Apache Flex SDK use the following command: - - git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git sdk - cd sdk - git checkout develop - - The Apache Flex SDK requires the Text Layout Framework repository which - you can get as follows: - - git clone https://git-wip-us.apache.org/repos/asf/flex-tlf.git tlf - cd tlf - git checkout develop + Apache FlexJS also requires code from several other Apache Flex git + repositories. To get the latest sources via git, first follow the + instructions in âInstall Prerequisitesâ, then from the flex-asjs + directory, run: + + ant all - To use an Apache Flex SDK, install an Apache Flex SDK on your computer and - follow the instructions in 'Install Prerequisites'. + This will clone all of the upstream repositories, checkout the develop branches + then run the builds in those repositories in the correct order. Building Apache FlexJS ====================== @@ -200,26 +192,29 @@ Install Prerequisites environment variables. On OSX some folks had permission issues after the install. See their documentation on using -g and sudo. - *9) Set FALCON_HOME to the root of its SDK. When using the flex-falcon - repository, set + *9) Set FALCON_HOME to the root of its SDK. If you have cloned the flex-falcon + repository as a sibling of the flex-asjs repository, you donât need to + set this variable, otherwise, set it as: FALCON_HOME=<repo-path>/compiler/generated/dist/sdk Look at flex-falcon/README for instructions on how to build Falcon - *10) Set FALCONJX_HOME to the root of its SDK. When using the flex-falcon - repository, set + *10) Set FALCONJX_HOME to the root of its SDK. If you have cloned the flex-falcon + repositoryas a sibling of the flex-asjs repository, you donât need to + set this variable, otherwise, set it as FALCONJX_HOME=<repo-path>/compiler.jx Look at flex-falcon/README_JX for instructions on how to build FalconJX - *11) Set FLEXUNIT_HOME to the root of a FlexUnit release or repo. + *11) Set FLEXUNIT_HOME to the root of a FlexUnit release or repo. If you + have cloned the flex-flexunit repository as a sibling of the flex-asjs + repository, you donât need to set this variable. Look at flex-flexunit/README for instructions on how to build FlexUnit Software Dependencies --------------------- - The Apache FlexJS framework does not have direct dependencies on third-party - software. Applications built with Apache FlexJS need the Google Closure Library. + The Apache FlexJS framework depends on the Google Closure Library. Using the Binary Distribution -----------------------------
