You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/08/15 13:15:07 UTC
[1/3] git commit: [flex-asjs] [refs/heads/refactor-sprite] - exclude
one more file from source release package
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite c523ace32 -> 5b7a043d4
exclude one more file from source release package
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/94f5f3ad
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/94f5f3ad
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/94f5f3ad
Branch: refs/heads/refactor-sprite
Commit: 94f5f3adc1ccbc7761dfa39a9116f4914f7112dd
Parents: 30587b1
Author: Alex Harui <ah...@apache.org>
Authored: Sun Aug 14 21:59:32 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Aug 14 21:59:39 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94f5f3ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d16af54..29ac1d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,8 @@
<exclude>examples/**</exclude>
<!-- JSON files can't contain comments -->
<exclude>**/*.json</exclude>
+ <!-- This is appended to the LICENSE file for binary packages-->
+ <exclude>LICENSE.bin</exclude>
<!-- Stuff that needs to be removed -->
<exclude>fxg2svg/**</exclude>
[3/3] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merge
branch 'develop' into refactor-sprite
Posted by ha...@apache.org.
Merge branch 'develop' into refactor-sprite
* develop:
exclude one more file from source release package
also pick up swcs from the way the approval script sets up falconjx
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5b7a043d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5b7a043d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5b7a043d
Branch: refs/heads/refactor-sprite
Commit: 5b7a043d47f23c173aa174a209358524cd58106d
Parents: c523ace 94f5f3a
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 15 16:15:00 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 15 16:15:00 2016 +0300
----------------------------------------------------------------------
build.xml | 6 ++++++
pom.xml | 2 ++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
[2/3] git commit: [flex-asjs] [refs/heads/refactor-sprite] - also
pick up swcs from the way the approval script sets up falconjx
Posted by ha...@apache.org.
also pick up swcs from the way the approval script sets up falconjx
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/30587b17
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/30587b17
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/30587b17
Branch: refs/heads/refactor-sprite
Commit: 30587b177205813955e295bc0edf25841f00e022
Parents: ece2ee3
Author: Alex Harui <ah...@apache.org>
Authored: Sat Aug 13 23:34:00 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Aug 14 21:59:39 2016 -0700
----------------------------------------------------------------------
build.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/30587b17/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a74d3af..5410b78 100644
--- a/build.xml
+++ b/build.xml
@@ -342,6 +342,12 @@
property="FLEXJS_TYPEDEFS_HOME"
value="${basedir}"/>
+ <echo>basedir is ${basedir}</echo>
+ <available file="${basedir}/../falconjx/js/libs/js.swc"
+ type="file"
+ property="FLEXJS_TYPEDEFS_HOME"
+ value="${basedir}/../falconjx/js/libs"/>
+
<fail message="FLEXJS_TYPEDEFS_HOME must be set to a folder containing js/target/js.swc such as the flex-typedefs repo"
unless="FLEXJS_TYPEDEFS_HOME"/>
</target>