flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Frédéric THOMAS <ftho...@apache.org>
Subject RE: [2/2] git commit: [flex-falcon] [refs/heads/IDEA-FLEX_JS_COMPILER] - FLEX-34860 : Updated the Ant files
Date Wed, 27 May 2015 13:49:17 GMT
Hi,

I would like the build to be reviewed, someone ?

Thanks,
Frédéric THOMAS

> From: fthomas@apache.org
> To: commits@flex.apache.org
> Date: Wed, 27 May 2015 13:45:30 +0000
> Subject: [2/2] git commit: [flex-falcon] [refs/heads/IDEA-FLEX_JS_COMPILER] - FLEX-34860
: Updated the Ant files
> 
> FLEX-34860 : Updated the Ant files
> 
> - NOTE: I needed swfutils.jar from the FLEX_HOME, the current kind of copy sources didn't
work for me, this need eventually to be reviewed.
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f47c8490
> Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f47c8490
> Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f47c8490
> 
> Branch: refs/heads/IDEA-FLEX_JS_COMPILER
> Commit: f47c8490cd2018325dd4fae9766ebcd690d61c7f
> Parents: a6f360e
> Author: Frédéric THOMAS <webdoublefx@gmail.com>
> Authored: Wed May 27 14:44:56 2015 +0100
> Committer: Frédéric THOMAS <webdoublefx@gmail.com>
> Committed: Wed May 27 14:44:56 2015 +0100
> 
> ----------------------------------------------------------------------
>  build.xml                   |  6 +++---
>  flex-compiler-oem/build.xml | 35 ++++++++++++++++++++++++++++++++---
>  2 files changed, 35 insertions(+), 6 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f47c8490/build.xml
> ----------------------------------------------------------------------
> diff --git a/build.xml b/build.xml
> index 3a8b300..7447397 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -66,7 +66,7 @@
>          <ant dir="compiler" target="sdk"/>
>      </target>
>  
> -    <target name="main" depends="sdk, javadoc, tests" description="Default target
- Builds a Falcon SDK, builds Falcon Javadoc, and runs tests."/>
> +    <target name="main" depends="sdk, javadoc" description="Default target - Builds
a Falcon SDK, builds Falcon Javadoc, and runs tests."/>
>  
>      <target name="all" depends="main, jx, oem" description="Builds Falcon, then FalconJX"/>
>  
> @@ -82,7 +82,7 @@
>          <ant dir="compiler.tests" target="main"/>
>      </target>
>  
> -    <target name="compiler.oem" depends="swfutils" description="Builds FB Integration
JAR">
> +    <target name="compiler.oem" depends="compiler.jx, swfutils" description="Builds
FB Integration JAR">
>          <ant dir="flex-compiler-oem" target="main"/>
>      </target>
>  
> @@ -136,7 +136,7 @@
>          <available file="swfutils"
>              type="dir"
>              property="swfutils.bundled"
> -            value="true" />
> +            value="false" />
>      </target>
>      
>      <target name="compiler.jx" description="Builds FalconJX.">
> 
> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f47c8490/flex-compiler-oem/build.xml
> ----------------------------------------------------------------------
> diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
> index cded834..3833416 100644
> --- a/flex-compiler-oem/build.xml
> +++ b/flex-compiler-oem/build.xml
> @@ -79,6 +79,8 @@
>  
>      <path id="classpath">
>          <fileset dir="${sdk}/lib" includes="**/*.jar"/>
> +        <fileset dir="U:/sources/asf/flex/falcon/compiler.jx/lib" includes="jsc.jar"/>
> +        <fileset dir="${FLEX_HOME}/lib" includes="swfutils.jar"/>
>      </path>
>  
>  
> @@ -98,7 +100,6 @@
>                 source="${javac.src}" target="${javac.src}"
>          	   includes="**/*.java" destdir="${oem}/bin" classpathref="classpath" includeAntRuntime="true">
>              <src path="${oem}/src"/>
> -            <src path="${basedir}/../swfutils/src"/>
>          </javac>
>          <!--
>          <copy todir="${compiler}/generated/classes">
> @@ -106,6 +107,33 @@
>          </copy>
>           -->
>      </target>
> +
> +
> +    <target name="set.compc.jar.uptodate">
> +        <uptodate property="compc.jar.uptodate"
> +                  targetfile="${sdk}/lib/compc.jar">
> +            <srcfiles dir="${compiler}/generated/classes">
> +                <include name="**/*.class"/>
> +                <include name="**/*.properties"/>
> +            </srcfiles>
> +        </uptodate>
> +    </target>
> +
> +    <target name="compc.jar" depends="oem.jar,set.compc.jar.uptodate" unless="compc.jar.uptodate">
> +        <mkdir dir="${sdk}/lib"/>
> +        <jar file="${sdk}/lib/compc.jar" basedir="${compiler}/generated/classes"
whenmanifestonly="create">
> +            <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}
- COMPC Command Line Compiler"/>
> +                <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
> +                <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
> +                <attribute name="Main-Class" value="flex2.tools.Compc"/>
> +                <attribute name="Class-Path" value="flex-compiler-oem.jar"/>
> +            </manifest>
> +        </jar>
> +    </target>
>  		
>  	<target name="set.oem.jar.uptodate">
>  		<uptodate property="oem.jar.uptodate"
> @@ -126,12 +154,13 @@
>                  <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="Class-Path" value="falcon-mxmlc.jar falcon-compc.jar
swfutils.jar"/>
> +                <attribute name="Main-Class" value="flex2.tools.Mxmlc"/>
> +                <attribute name="Class-Path" value="compiler.jar swfutils.jar ../js/lib/jsc.jar"/>
>              </manifest>
>          </jar>
>  	</target>
>  	
> -    <target name="jar" depends="oem.jar"
> +    <target name="jar" depends="oem.jar, compc.jar"
>      	    description="Creates JAR files"/>
>  	    	
>  	<target name="sdk" depends="jar" description="Builds a Falcon SDK"/>
> 
 		 	   		  
Mime
View raw message