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 2012/12/06 19:07:28 UTC
svn commit: r1418019 - in /incubator/flex/falcon/trunk/compiler.tests:
build.xml
unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java
Author: aharui
Date: Thu Dec 6 18:07:27 2012
New Revision: 1418019
URL: http://svn.apache.org/viewvc?rev=1418019&view=rev
Log:
Fix another config problem when not copying sdks
Modified:
incubator/flex/falcon/trunk/compiler.tests/build.xml
incubator/flex/falcon/trunk/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java
Modified: incubator/flex/falcon/trunk/compiler.tests/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.tests/build.xml?rev=1418019&r1=1418018&r2=1418019&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.tests/build.xml (original)
+++ incubator/flex/falcon/trunk/compiler.tests/build.xml Thu Dec 6 18:07:27 2012
@@ -30,6 +30,7 @@
<property name="sdk" value="${env.FLEX_HOME}" />
<property name="sdk" value="${compiler}/generated/dist/sdk"/>
<property name="falcon" value="${compiler}/generated/dist/sdk"/>
+ <property name="fpsdk" value="${env.PLAYERGLOBAL_HOME}" />
<target name="download" description="Downloads third-party JARs">
<ant antfile="${compiler.tests}/downloads.xml" dir="${compiler.tests}"/>
@@ -82,6 +83,7 @@
haltonerror="false" haltonfailure="false"
failureproperty="tests.unit.failed">
<sysproperty key="FLEX_HOME" value="${sdk}" />
+ <sysproperty key="PLAYERGLOBAL_HOME" value="${fpsdk}" />
<classpath>
<pathelement location="${compiler.tests}/classes"/>
<fileset dir="${compiler}/lib" includes="**/*.jar"/>
Modified: incubator/flex/falcon/trunk/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java?rev=1418019&r1=1418018&r2=1418019&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java (original)
+++ incubator/flex/falcon/trunk/compiler.tests/unit-tests/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBaseTests.java Thu Dec 6 18:07:27 2012
@@ -49,6 +49,9 @@ public class MXMLNodeBaseTests
private static final String SDK = System.getProperty("FLEX_HOME") == null ?
FilenameNormalization.normalize("../compiler/generated/dist/sdk") :
System.getProperty("FLEX_HOME");
+ private static final String FPSDK = System.getProperty("PLAYERGLOBAL_HOME") == null ?
+ FilenameNormalization.normalize("../compiler/generated/dist/sdk/frameworks/libs/player") :
+ System.getProperty("PLAYERGLOBAL_HOME");
protected static Workspace workspace = new Workspace();
@@ -100,7 +103,7 @@ public class MXMLNodeBaseTests
// Compile the code against playerglobal.swc.
List<File> libraries = new ArrayList<File>();
- libraries.add(new File(FilenameNormalization.normalize(SDK + "\\frameworks\\libs\\player\\11.1\\playerglobal.swc")));
+ libraries.add(new File(FilenameNormalization.normalize(FPSDK + "\\11.1\\playerglobal.swc")));
libraries.add(new File(FilenameNormalization.normalize(SDK + "\\frameworks\\libs\\framework.swc")));
libraries.add(new File(FilenameNormalization.normalize(SDK + "\\frameworks\\libs\\rpc.swc")));
libraries.add(new File(FilenameNormalization.normalize(SDK + "\\frameworks\\libs\\spark.swc")));