You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/04/27 07:48:52 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - fix classpath
Repository: flex-falcon
Updated Branches:
refs/heads/develop 99f59eece -> 302679f69
fix classpath
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/280fee5c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/280fee5c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/280fee5c
Branch: refs/heads/develop
Commit: 280fee5cfc11f38d8015fda40d98858e60354ded
Parents: 99f59ee
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 26 22:47:24 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 26 22:47:24 2016 -0700
----------------------------------------------------------------------
compiler/src/test/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/280fee5c/compiler/src/test/build.xml
----------------------------------------------------------------------
diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml
index e0481c3..0893bac 100644
--- a/compiler/src/test/build.xml
+++ b/compiler/src/test/build.xml
@@ -329,7 +329,7 @@
<classpath>
<pathelement location="${compiler}/target/test-classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
- <fileset dir="${compiler}/../compiler-build-tools/target/classes" includes="**/*.class"/>
+ <pathelement location="${compiler}/../compiler-build-tools/target/classes"/>
<pathelement location="${falcon}/lib/compiler.jar"/>
</classpath>
<batchtest todir="${compiler}/target/junit-reports">
[2/2] git commit: [flex-falcon] [refs/heads/develop] - fix lookup
Posted by ah...@apache.org.
fix lookup
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/302679f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/302679f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/302679f6
Branch: refs/heads/develop
Commit: 302679f699da840fd0942e5d701e5b59a0c3892b
Parents: 280fee5
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 26 22:48:41 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 26 22:48:41 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/flex/utils/EnvProperties.java | 12 ++++++------
.../test/java/org/apache/flex/utils/EnvProperties.java | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/302679f6/compiler-build-tools/src/main/java/org/apache/flex/utils/EnvProperties.java
----------------------------------------------------------------------
diff --git a/compiler-build-tools/src/main/java/org/apache/flex/utils/EnvProperties.java b/compiler-build-tools/src/main/java/org/apache/flex/utils/EnvProperties.java
index be22fee..c591964 100644
--- a/compiler-build-tools/src/main/java/org/apache/flex/utils/EnvProperties.java
+++ b/compiler-build-tools/src/main/java/org/apache/flex/utils/EnvProperties.java
@@ -85,7 +85,7 @@ public class EnvProperties {
{
String prefix = "";
Properties p = new Properties();
- String envFileName = FilenameNormalization.normalize("../env.properties");
+ String envFileName = FilenameNormalization.normalize("../../../env.properties");
try {
File f = new File(envFileName);
if (f.exists())
@@ -110,16 +110,16 @@ public class EnvProperties {
SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME"));
if(SDK == null)
{
- SDK = FilenameNormalization.normalize("../../flex-sdk");
+ SDK = FilenameNormalization.normalize("../../../../flex-sdk");
File mxmlc = new File(SDK + "/lib/mxmlc.jar");
if (!mxmlc.exists())
- SDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk");
+ SDK = FilenameNormalization.normalize("../../../compiler/lib");
}
System.out.println("environment property - FLEX_HOME = " + SDK);
FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME", System.getenv("PLAYERGLOBAL_HOME"));
if(FPSDK == null)
- FPSDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk/frameworks/libs/player");
+ FPSDK = FilenameNormalization.normalize("../../../frameworks/libs/player");
System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK);
FPVER = p.getProperty(prefix + "PLAYERGLOBAL_VERSION", System.getenv("PLAYERGLOBAL_VERSION"));
@@ -130,7 +130,7 @@ public class EnvProperties {
TLF = p.getProperty(prefix + "TLF_HOME", System.getenv("TLF_HOME"));
if (TLF == null)
{
- TLF = FilenameNormalization.normalize("../../flex-tlf");
+ TLF = FilenameNormalization.normalize("../../../../flex-tlf");
}
System.out.println("environment property - TLF_HOME = " + TLF);
@@ -142,7 +142,7 @@ public class EnvProperties {
ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME"));
if (ASJS == null)
- ASJS = FilenameNormalization.normalize("../../flex-asjs");
+ ASJS = FilenameNormalization.normalize("../../../../flex-asjs");
System.out.println("environment property - ASJS_HOME = " + ASJS);
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/302679f6/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
index 97d4835..ea75057 100644
--- a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
+++ b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
@@ -85,7 +85,7 @@ public class EnvProperties {
{
String prefix = "";
Properties p = new Properties();
- String envFileName = FilenameNormalization.normalize("../env.properties");
+ String envFileName = FilenameNormalization.normalize("../../../env.properties");
try {
File f = new File(envFileName);
if (f.exists())
@@ -110,16 +110,16 @@ public class EnvProperties {
SDK = p.getProperty(prefix + "FLEX_HOME", System.getenv("FLEX_HOME"));
if(SDK == null)
{
- SDK = FilenameNormalization.normalize("../../flex-sdk");
+ SDK = FilenameNormalization.normalize("../../../../flex-sdk");
File mxmlc = new File(SDK + "/lib/mxmlc.jar");
if (!mxmlc.exists())
- SDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk");
+ SDK = FilenameNormalization.normalize("../../../compiler/lib");
}
System.out.println("environment property - FLEX_HOME = " + SDK);
FPSDK = p.getProperty(prefix + "PLAYERGLOBAL_HOME", System.getenv("PLAYERGLOBAL_HOME"));
if(FPSDK == null)
- FPSDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk/frameworks/libs/player");
+ FPSDK = FilenameNormalization.normalize("../../../frameworks/libs/player");
System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK);
FPVER = p.getProperty(prefix + "PLAYERGLOBAL_VERSION", System.getenv("PLAYERGLOBAL_VERSION"));
@@ -130,7 +130,7 @@ public class EnvProperties {
TLF = p.getProperty(prefix + "TLF_HOME", System.getenv("TLF_HOME"));
if (TLF == null)
{
- TLF = FilenameNormalization.normalize("../../flex-tlf");
+ TLF = FilenameNormalization.normalize("../../../../flex-tlf");
}
System.out.println("environment property - TLF_HOME = " + TLF);
@@ -142,7 +142,7 @@ public class EnvProperties {
ASJS = p.getProperty(prefix + "ASJS_HOME", System.getenv("ASJS_HOME"));
if (ASJS == null)
- ASJS = FilenameNormalization.normalize("../../flex-asjs");
+ ASJS = FilenameNormalization.normalize("../../../../flex-asjs");
System.out.println("environment property - ASJS_HOME = " + ASJS);
}