royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 02/02: fix build after wipe-all
Date Mon, 27 Nov 2017 05:58:09 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 685dc16b42a547bb000ec3e366d9759a46ef59ab
Author: Alex Harui <aharui@apache.org>
AuthorDate: Sun Nov 26 21:52:34 2017 -0800

    fix build after wipe-all
---
 compiler-externc/build.xml     | 3 ++-
 compiler-jx/build.xml          | 2 +-
 compiler-jx/src/test/build.xml | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler-externc/build.xml b/compiler-externc/build.xml
index 0bb9dd1..99c7457 100644
--- a/compiler-externc/build.xml
+++ b/compiler-externc/build.xml
@@ -120,7 +120,7 @@
         <ant antfile="${compiler-jx}/src/main/resources/downloads.xml" dir="${compiler-jx}/src/main/resources"
inheritAll="false"/>
     </target>
     
-    <target name="main" depends="prebuild,compile,test" >
+    <target name="main" depends="prebuild,compile" >
         <mkdir dir="${sdk}"/>
         <copy file="${basedir}/../LICENSE.base" tofile="${compiler-externc}/target/classes/META-INF/LICENSE"/>
         <copy file="${basedir}/../NOTICE.base" tofile="${compiler-externc}/target/classes/META-INF/NOTICE"/>
@@ -137,6 +137,7 @@
                 <!-- The .. in the line above allows the compiler to load the env.properties
file -->
             </manifest>
         </jar>
+        <antcall target="test" />
         <antcall target="jar-test" />
     </target>
 
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 8b0bb31..c0e336c 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -178,7 +178,7 @@
     <target name="super-clean" depends="thirdparty-clean,clean" />
 
     <target name="thirdparty-clean">
-        <ant antfile="${basedir}/src/main/resources/downloads.xml" dir="${basedir}" target="clean"
/>
+        <ant antfile="${basedir}/src/main/resources/downloads.xml" dir="${basedir}/src/main/resources"
inheritAll="false" target="clean" />
         <delete dir="${basedir}/target" />
         <delete failonerror="false" includeemptydirs="true">
             <fileset dir="${lib}" />
diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml
index c59c312..ed942d8 100644
--- a/compiler-jx/src/test/build.xml
+++ b/compiler-jx/src/test/build.xml
@@ -48,6 +48,7 @@
             <classpath>
                 <pathelement location="${compiler}/target/test-classes"/>
                 <pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
+                <pathelement location="${compiler}/../compiler-externc/target/test-classes"/>
                 <fileset dir="${compiler}/lib" includes="**/*.jar"/>
             </classpath>
         </javac>
@@ -66,6 +67,7 @@
             <classpath>
                 <pathelement location="${compiler}/target/test-classes"/>
                 <pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
+                <pathelement location="${compiler}/../compiler-externc/target/test-classes"/>
                 <fileset dir="${compiler}/lib" includes="**/*.jar"/>
                 <fileset dir="${compiler}/../compiler/lib" includes="**/*.jar"/>
             </classpath>
@@ -99,6 +101,7 @@
             <classpath>
                 <pathelement location="${compiler}/target/test-classes"/>
                 <pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
+                <pathelement location="${compiler}/../compiler-externc/target/test-classes"/>
                 <fileset dir="${compiler}/lib" includes="**/*.jar"/>
                 <fileset dir="${compiler}/../compiler/lib" includes="**/*.jar"/>
             </classpath>
@@ -128,6 +131,7 @@
             <classpath>
                 <pathelement location="${compiler}/target/test-classes"/>
                 <pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
+                <pathelement location="${compiler}/../compiler-externc/target/test-classes"/>
                 <fileset dir="${compiler}/lib" includes="**/*.jar"/>
                 <fileset dir="${compiler}/../compiler/lib" includes="**/*.jar"/>
             </classpath>
@@ -155,6 +159,7 @@
             <classpath>
                 <pathelement location="${compiler}/target/test-classes"/>
                 <pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
+                <pathelement location="${compiler}/../compiler-externc/target/test-classes"/>
                 <fileset dir="${compiler}/lib" includes="**/*.jar"/>
                 <fileset dir="${compiler}/../compiler/lib" includes="**/*.jar"/>
             </classpath>

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message