incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cza...@apache.org
Subject svn commit: r1422752 - in /incubator/flex/falcon/trunk: README compiler.tests/build.xml compiler.tests/src/utils/EnvProperties.java compiler.tests/template-unittest.properties
Date Mon, 17 Dec 2012 04:42:33 GMT
Author: czadra
Date: Mon Dec 17 04:42:31 2012
New Revision: 1422752

URL: http://svn.apache.org/viewvc?rev=1422752&view=rev
Log:
updated README for setting up unittest.properties and some minor changes for build.xml etc

Modified:
    incubator/flex/falcon/trunk/README
    incubator/flex/falcon/trunk/compiler.tests/build.xml
    incubator/flex/falcon/trunk/compiler.tests/src/utils/EnvProperties.java
    incubator/flex/falcon/trunk/compiler.tests/template-unittest.properties

Modified: incubator/flex/falcon/trunk/README
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/README?rev=1422752&r1=1422751&r2=1422752&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/README (original)
+++ incubator/flex/falcon/trunk/README Mon Dec 17 04:42:31 2012
@@ -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 ). 
\ No newline at end of file

Modified: incubator/flex/falcon/trunk/compiler.tests/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.tests/build.xml?rev=1422752&r1=1422751&r2=1422752&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.tests/build.xml (original)
+++ incubator/flex/falcon/trunk/compiler.tests/build.xml Mon Dec 17 04:42:31 2012
@@ -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">

Modified: incubator/flex/falcon/trunk/compiler.tests/src/utils/EnvProperties.java
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.tests/src/utils/EnvProperties.java?rev=1422752&r1=1422751&r2=1422752&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.tests/src/utils/EnvProperties.java (original)
+++ incubator/flex/falcon/trunk/compiler.tests/src/utils/EnvProperties.java Mon Dec 17 04:42:31
2012
@@ -39,14 +39,14 @@ public class EnvProperties {
 	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 @@ public class EnvProperties {
 		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);
 	}
 
 }

Modified: incubator/flex/falcon/trunk/compiler.tests/template-unittest.properties
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.tests/template-unittest.properties?rev=1422752&r1=1422751&r2=1422752&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.tests/template-unittest.properties (original)
+++ incubator/flex/falcon/trunk/compiler.tests/template-unittest.properties Mon Dec 17 04:42:31
2012
@@ -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=



Mime
View raw message