Permalink
Browse files

updated README for setting up unittest.properties and some minor chan…

…ges for build.xml etc

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/falcon/trunk@1422752 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 80d941b commit f4a26460de532146eed7d686969b88ab7f309659 Cyrill committed Dec 17, 2012
Showing with 22 additions and 18 deletions.
  1. +1 −1 README
  2. +5 −1 compiler.tests/build.xml
  3. +9 −9 compiler.tests/src/utils/EnvProperties.java
  4. +7 −7 compiler.tests/template-unittest.properties
View
2 README
@@ -10,4 +10,4 @@ See the README there for instructions.
3. Set the environment variable JFLEX_JAR to point to the JAR file for JFlex 1.4.3.
-
+Before running unit-, functional- or feature-tests you need to create a unittest.properties file ( template is found here compiler.tests/template-unittest.properties ).
View
@@ -32,6 +32,10 @@
<isset property="FLEX_HOME" />
</condition>
+ <condition property="fpdbg" value="${FLASHPLAYER_DEBUGGER}" else="${env.FLASHPLAYER_DEBUGGER}">
+ <isset property="FLASHPLAYER_DEBUGGER" />
+ </condition>
+
<property name="compiler" value="${compiler.tests}/../compiler"/>
<property name="falcon" value="${compiler}/generated/dist/sdk"/>
@@ -41,7 +45,7 @@
</target>
<target name="eclipse">
- <copy file="${env.FLASHPLAYER_DEBUGGER}" tofile="${compiler.tests}/temp/FlashPlayer.exe"/>
+ <copy file="${fpdbg}" tofile="${compiler.tests}/temp/FlashPlayer.exe"/>
</target>
<target name="jar.tests">
@@ -39,14 +39,14 @@
public String FDBG;
- private static EnvProperties propertyReader;
+ private static EnvProperties env;
public static EnvProperties initiate() {
- if(propertyReader == null) {
- propertyReader = new EnvProperties();
- propertyReader.setup();
+ if(env == null) {
+ env = new EnvProperties();
+ env.setup();
}
- return propertyReader;
+ return env;
}
private void setup()
@@ -63,19 +63,19 @@ private void setup()
SDK = p.getProperty("FLEX_HOME", System.getenv("FLEX_HOME"));
if(SDK == null)
SDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk");
- System.out.println("Env - FLEX_HOME = " + SDK);
+ System.out.println("environment property - FLEX_HOME = " + SDK);
FPSDK = p.getProperty("PLAYERGLOBAL_HOME", System.getenv("PLAYERGLOBAL_HOME"));
if(FPSDK == null)
FPSDK = FilenameNormalization.normalize("../compiler/generated/dist/sdk/frameworks/libs/player");
- System.out.println("Env - PLAYERGLOBAL_HOME = " + FPSDK);
+ System.out.println("environment property - PLAYERGLOBAL_HOME = " + FPSDK);
AIRSDK = p.getProperty("AIR_HOME", System.getenv("AIR_HOME"));
- System.out.println("Env - AIR_HOME = " + AIRSDK);
+ System.out.println("environment property - AIR_HOME = " + AIRSDK);
FDBG = p.getProperty("FLASHPLAYER_DEBUGGER", System.getenv("FLASHPLAYER_DEBUGGER"));
- System.out.println("Env - FLASHPLAYER_DEBUGGER = " + FDBG);
+ System.out.println("environment property - FLASHPLAYER_DEBUGGER = " + FDBG);
}
}
@@ -4,19 +4,19 @@
# Example (Windows) FLEX_HOME=C:\\dev\\apache-flex\\sdk
# (Mac Os X)
#
-# FLEX_HOME=
+FLEX_HOME=
-# Example (Windows) AIR_HOME=C://dev//air-sdk-3.4
+# Example (Windows) AIR_HOME=C:\\dev\\air-sdk-3.4
# (Mac Os X)
#
-# AIR_HOME=
+AIR_HOME=
#
-# Example (Windows) PLAYERGLOBAL_HOME=C://dev//apache-flex-4.8.0//frameworks//libs//player
+# Example (Windows) PLAYERGLOBAL_HOME=C:\\dev\\apache-flex-4.8.0\\frameworks\\libs\\player
# (Mac Os X)
#
-# PLAYERGLOBAL_HOME=
+PLAYERGLOBAL_HOME=
-# Example (Windows) FLASHPLAYER_DEBUGGER=C://Program Files//Adobe//Adobe Flash Builder//player//win//11.1//FlashPlayerDebugger.exe
+# Example (Windows) FLASHPLAYER_DEBUGGER=C:\\Program Files\\Adobe\\Adobe Flash Builder\\player\\win\\11.1\\FlashPlayerDebugger.exe
# (Mac Os X)
-# FLASHPLAYER_DEBUGGER=
+FLASHPLAYER_DEBUGGER=

0 comments on commit f4a2646

Please sign in to comment.