[royale-compiler] 03/03: Merge branch 'develop' into as2wasm

[er...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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

commit 839ceb8c7d171e7e4e8d1468e0c078191f6b3d0b
Merge: 1eff836 741c8ff
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Fri Dec 15 10:05:50 2017 +0100

    Merge branch 'develop' into as2wasm

 build.xml             | 36 +++++++++++++++++++++++++++++++++---
 compiler-jx/build.xml |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --cc compiler-jx/build.xml
index 7891931,3bfa292..e002e67
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@@ -111,29 -105,8 +111,29 @@@
          <property name="jar.classpath" value="commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang-2.6.jar ../../compiler/lib/external/commons-lang-2.6.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar  ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar" />
  
          <copy file="${basedir}/../LICENSE.base" tofile="${classes.dir}/META-INF/LICENSE"/>
-         <copy file="${basedir}/../NOTICE" tofile="${classes.dir}/META-INF/NOTICE"/>
+         <copy file="${basedir}/../NOTICE.base" tofile="${classes.dir}/META-INF/NOTICE"/>
          
 +		<echo message="Building ${wastc.jar}" />
 +    <ant dir="../compiler-test-utils">
 +      <target name="clean" />
 +      <target name="main" />
 +    </ant>
 +    <copy file="${basedir}/../compiler-test-utils/target/classes/org/apache/royale/utils/EnvProperties.class" tofile="${classes.dir}/org/apache/royale/utils/EnvProperties.class"/>
 +		<jar file="${wastc.jar}" basedir="${classes.dir}"
 +         includes="**/*.properties,org/apache/**/*,META-INF/**/*"
 +         excludes="" >
 +      <include name="META-INF/LICENSE"/>
 +      <include name="META-INF/NOTICE"/>
 +      <manifest>
 +        <attribute name="Sealed" value="${manifest.sealed}"/>
 +        <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
 +        <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
 +        <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
 +				<attribute name="Main-Class" value="org.apache.royale.compiler.clients.WASTC" />
 +        <attribute name="Class-Path" value="compiler.jar" />
 +      </manifest>
 +    </jar>
 +
  		<echo message="Building ${jsc.jar}" />
  		<jar file="${jsc.jar}" basedir="${classes.dir}"
              includes="**/*.properties,org/apache/**/*,com/google/**/*,META-INF/**/*"

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