You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2014/11/05 11:11:22 UTC
git commit: [flex-falcon] [refs/heads/develop] - - Added generation
of Maven artifacts for FalconJX. - Added a staticMainNoExit method to
COMPJSC. - Adjusted a wrong version number in the download script comments.
Repository: flex-falcon
Updated Branches:
refs/heads/develop 639b1c9b3 -> 3011d6373
- Added generation of Maven artifacts for FalconJX.
- Added a staticMainNoExit method to COMPJSC.
- Adjusted a wrong version number in the download script comments.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3011d637
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3011d637
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3011d637
Branch: refs/heads/develop
Commit: 3011d63738668ef0777b25247b0b47337fc4a179
Parents: 639b1c9
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Wed Nov 5 11:11:10 2014 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Wed Nov 5 11:11:10 2014 +0100
----------------------------------------------------------------------
compiler.jx/downloads.xml | 2 +-
.../apache/flex/compiler/clients/COMPJSC.java | 15 ++++-
maven.xml | 14 +++++
maven/falcon-jx-compiler.pom | 59 ++++++++++++++++++++
4 files changed, 87 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3011d637/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 2a57a71..cc998a7 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -24,7 +24,7 @@
For Apache, the JARS must be removed from the repository.
Licenses:
- commons-io (2.0.1) - Apache 2.0
+ commons-io (2.4) - Apache 2.0
closure (9.2) - Apache 2.0
-->
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3011d637/compiler.jx/src/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/clients/COMPJSC.java b/compiler.jx/src/org/apache/flex/compiler/clients/COMPJSC.java
index 54a7897..99140bb 100644
--- a/compiler.jx/src/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler.jx/src/org/apache/flex/compiler/clients/COMPJSC.java
@@ -86,7 +86,18 @@ public class COMPJSC extends MXMLJSC
*
* @param args command line arguments
*/
- public static void main(final String[] args)
+ public static void main(final String[] args) {
+ int exitCode = staticMainNoExit(args);
+ System.exit(exitCode);
+ }
+
+ /**
+ * Entry point for the {@code <compc>} Ant task.
+ *
+ * @param args Command line arguments.
+ * @return An exit code.
+ */
+ public static int staticMainNoExit(final String[] args)
{
long startTime = System.nanoTime();
@@ -128,7 +139,7 @@ public class COMPJSC extends MXMLJSC
long endTime = System.nanoTime();
JSSharedData.instance.stdout((endTime - startTime) / 1e9 + " seconds");
- System.exit(exitCode);
+ return exitCode;
}
protected COMPJSC(IBackend backend)
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3011d637/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index a3f4f5c..efb8790 100644
--- a/maven.xml
+++ b/maven.xml
@@ -67,6 +67,12 @@
<param name="artifactName" value="falcon-compiler-oem"/>
<param name="fileName" value="../compiler/generated/dist/sdk/lib/flex-compiler-oem.jar"/>
</antcall>
+
+ <antcall target="-pack-maven-artifact">
+ <param name="moduleName" value="compiler.jx"/>
+ <param name="artifactName" value="falcon-jx-compiler"/>
+ <param name="fileName" value="../compiler.jx/lib/jsc.jar"/>
+ </antcall>
</target>
<target name="install" depends="package, -setup-aether-antlib">
@@ -79,6 +85,10 @@
<antcall target="-install-maven-artifact-file">
<param name="artifactName" value="falcon-compiler-oem"/>
</antcall>
+
+ <antcall target="-install-maven-artifact-file">
+ <param name="artifactName" value="falcon-jx-compiler"/>
+ </antcall>
</target>
<target name="deploy" depends="install">
@@ -91,6 +101,10 @@
<antcall target="-deploy-maven-artifact-file">
<param name="artifactName" value="falcon-compiler-oem"/>
</antcall>
+
+ <antcall target="-deploy-maven-artifact-file">
+ <param name="artifactName" value="falcon-jx-compiler"/>
+ </antcall>
</target>
<!--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3011d637/maven/falcon-jx-compiler.pom
----------------------------------------------------------------------
diff --git a/maven/falcon-jx-compiler.pom b/maven/falcon-jx-compiler.pom
new file mode 100644
index 0000000..8753648
--- /dev/null
+++ b/maven/falcon-jx-compiler.pom
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
+ </parent>
+
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-jx-compiler</artifactId>
+ <version>@VERSION@</version>
+
+ <name>Apache Flex - FalconJX Compiler</name>
+ <description>The Apache Flex FalconJX Compiler</description>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache Flex User List</name>
+ <subscribe>users-subscribe@flex.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@flex.apache.org</unsubscribe>
+ <post>users@flex.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/flex-users/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <scm>
+ <connection>scm:svn:https://git-wip-us.apache.org/repos/asf/flex-falcon.git</connection>
+ <developerConnection>scm:svn:https://git-wip-us.apache.org/repos/asf/flex-falcon.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/flex-falcon.git</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.compiler</groupId>
+ <artifactId>falcon-compiler</artifactId>
+ <version>@VERSION@</version>
+ </dependency>
+
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.28</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codeartisans</groupId>
+ <artifactId>org.json</artifactId>
+ <version>20131017</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>v20141023</version>
+ </dependency>
+ </dependencies>
+
+</project>