You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2013/09/03 20:26:46 UTC
git commit: [flex-falcon] [refs/heads/develop] - Fixed FLEX-33700 :
Make Falcon accept either flex-sdk or sdk as FLEX-HOME
Updated Branches:
refs/heads/develop 6b5dbbcbb -> d931c83cb
Fixed FLEX-33700 : Make Falcon accept either flex-sdk or sdk as FLEX-HOME
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d931c83c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d931c83c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d931c83c
Branch: refs/heads/develop
Commit: d931c83cb4543382f409fdc85f7d834e93e0e92e
Parents: 6b5dbbc
Author: Frederic THOMAS <we...@gmail.com>
Authored: Tue Sep 3 20:24:06 2013 +0200
Committer: Frederic THOMAS <we...@gmail.com>
Committed: Tue Sep 3 20:24:06 2013 +0200
----------------------------------------------------------------------
.gitignore | 1 +
compiler/.gitignore | 5 ++++-
compiler/build.xml | 13 +++++++++++--
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d931c83c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index cd28c5d..f73935b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
*.iml
*.ipr
*.iws
+*.eml
#OS junk files
[Tt]humbs.db
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d931c83c/compiler/.gitignore
----------------------------------------------------------------------
diff --git a/compiler/.gitignore b/compiler/.gitignore
index 8c92367..b2e3d6d 100644
--- a/compiler/.gitignore
+++ b/compiler/.gitignore
@@ -1,3 +1,6 @@
# ignored files/directories for the 'compiler' project
/generated
-/lib
\ No newline at end of file
+/lib
+
+#local settings
+local.properties
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d931c83c/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 8b7c0c0..29e5e53 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -50,8 +50,17 @@
<!-- With the move to git the path to the assumed root is one level less up and doesn't need to include 'branches/develop' -->
<!-- Old path: -->
<!-- property name="sdk.branch" value="${compiler}/../../../sdk/branches/develop"/ -->
- <!-- New path: -->
- <property name="sdk.branch" value="${compiler}/../../flex-sdk"/>
+ <!-- New path: -->
+
+ <available file="${compiler}/../../flex-sdk"
+ type="dir"
+ property="sdk.branch"
+ value="${compiler}/../../flex-sdk" />
+
+ <available file="${compiler}/../../sdk"
+ type="dir"
+ property="sdk.branch"
+ value="${compiler}/../../sdk" />
<!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler/generated/dist/sdk directory -->
<!-- where a Falcon SDK is built -->