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/23 13:29:14 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - Changed the tool
classes to implement the flex-tool-api interfaces
Repository: flex-sdk
Updated Branches:
refs/heads/develop 27501dddc -> 4caf1e925
Changed the tool classes to implement the flex-tool-api interfaces
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ee16e8bc
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ee16e8bc
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ee16e8bc
Branch: refs/heads/develop
Commit: ee16e8bc36ea1a918cdf9b0e23183d1eb814e0b9
Parents: e7e441d
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Nov 10 10:15:45 2014 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Nov 10 10:15:45 2014 +0100
----------------------------------------------------------------------
build.xml | 1 +
modules/compiler/build.xml | 9 ++++++--
.../compiler/src/java/flex2/tools/ASDoc.java | 15 ++++++++++++-
.../compiler/src/java/flex2/tools/Compc.java | 14 +++++++++++-
.../compiler/src/java/flex2/tools/Mxmlc.java | 14 +++++++++++-
.../src/java/flex2/tools/Optimizer.java | 17 +++++++++++++--
modules/downloads.xml | 23 ++++++++++++++++++--
7 files changed, 84 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8acac59..e82c1f6 100644
--- a/build.xml
+++ b/build.xml
@@ -1038,6 +1038,7 @@ There are no known issues.
<include name="swfutils.jar"/>
<include name="fxgutils.jar"/>
<include name="velocity-dep-1.4-flex.jar"/>
+ <include name="flex-tool-api.jar"/>
<exclude name="external/optional/**"/>
</fileset>
</copy>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/modules/compiler/build.xml
----------------------------------------------------------------------
diff --git a/modules/compiler/build.xml b/modules/compiler/build.xml
index 1948f90..561711b 100644
--- a/modules/compiler/build.xml
+++ b/modules/compiler/build.xml
@@ -32,6 +32,8 @@
<property name="lib.ext.dir" value="${lib.dir}/external"/>
<property name="lib.opt.dir" value="${lib.ext.dir}/optional"/>
+ <property name="lib.in.dir" value="${FLEX_HOME}/in"/>
+
<property name="ext.dir" value="external"/>
<property name="opt.dir" value="${ext.dir}/optional"/>
@@ -57,7 +59,7 @@
<!-- Including Adobe proprietary font and license code. -->
<property name="mxmlc.mpl_excludes.classpath" value="${opt.dir}/afe.jar ${opt.dir}/aglj40.jar ${opt.dir}/rideau.jar ${opt.dir}/flex-fontkit.jar "/>
- <property name="mxmlc.adobe.classpath" value="${mxmlc.mpl_excludes.classpath} asc.jar ${ext.dir}/xml-apis.jar batik-all-flex.jar velocity-dep-1.4-flex.jar ${ext.dir}/commons-collections.jar ${ext.dir}/commons-discovery.jar ${ext.dir}/commons-logging.jar swfutils.jar fxgutils.jar ${opt.dir}/flex-messaging-common.jar ${localized.mxmlc.jars} ${ext.dir}/xalan.jar"/>
+ <property name="mxmlc.adobe.classpath" value="${mxmlc.mpl_excludes.classpath} asc.jar ${ext.dir}/xml-apis.jar batik-all-flex.jar velocity-dep-1.4-flex.jar ${ext.dir}/commons-collections.jar ${ext.dir}/commons-discovery.jar ${ext.dir}/commons-logging.jar swfutils.jar fxgutils.jar ${opt.dir}/flex-messaging-common.jar ${localized.mxmlc.jars} ${ext.dir}/xalan.jar flex-tool-api.jar"/>
<property name="mxmlc.classpath" value="${mxmlc.adobe.classpath} ${ext.dir}/xml-apis-ext.jar ${env.property.dir}"/>
<property name="compc.main" value="flex2.tools.Compc"/>
@@ -165,7 +167,10 @@
<copy file="${FLEX_HOME}/LICENSE" todir="${module.classes}/META-INF"/>
<copy file="${FLEX_HOME}/NOTICE" todir="${module.classes}/META-INF"/>
- <echo message="Building lib/mxmlc.jar"/>
+ <!-- Copy the flex-tool-api jar -->
+ <copy file="${lib.in.dir}/flex-tool-api.jar" todir="${lib.dir}"/>
+
+ <echo message="Building lib/mxmlc.jar"/>
<jar file="${module.jar}" basedir="${module.classes}"
includes="**/*.properties,flex2/compiler/**/*,flex2/license/**/*,flex2/linker/**/*,flex2/tools/*,flex2/tools/oem/Message.class,flex2/tools/oem/ProgressMeter.class,flex2/tools/oem/Component.class,flex2/tools/oem/Script.class,flash/**/*,flex/**/*"
excludes="flex2/tools/Shell*,flex2/tools/Optimizer*,flex2/tools/Digest*,flex2/tools/SwcDependencies*">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/modules/compiler/src/java/flex2/tools/ASDoc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc.java b/modules/compiler/src/java/flex2/tools/ASDoc.java
index a79a7de..a8c5fde 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc.java
+++ b/modules/compiler/src/java/flex2/tools/ASDoc.java
@@ -29,6 +29,7 @@ import flash.localization.LocalizationManager;
import flash.localization.XLRLocalizer;
import flash.localization.ResourceBundleLocalizer;
import flash.util.Trace;
+import org.apache.flex.tools.FlexTool;
/**
* The entry-point for ASDoc.
@@ -36,8 +37,20 @@ import flash.util.Trace;
* @see flex2.compiler.asdoc.AsDocAPI
* @author Brian Deitte
*/
-public class ASDoc extends Tool
+public class ASDoc extends Tool implements FlexTool
{
+
+ @Override
+ public String getName() {
+ return "ASDOC";
+ }
+
+ @Override
+ public int execute(String[] args) {
+ ASDoc.asdoc(args);
+ return 0;
+ }
+
public static void main(String[] args)
{
asdoc(args);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/modules/compiler/src/java/flex2/tools/Compc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Compc.java b/modules/compiler/src/java/flex2/tools/Compc.java
index 8175f08..9591850 100644
--- a/modules/compiler/src/java/flex2/tools/Compc.java
+++ b/modules/compiler/src/java/flex2/tools/Compc.java
@@ -36,6 +36,7 @@ import flash.localization.LocalizationManager;
import flash.localization.XLRLocalizer;
import flash.localization.ResourceBundleLocalizer;
import flash.util.Trace;
+import org.apache.flex.tools.FlexTool;
import java.io.File;
import java.io.FileNotFoundException;
@@ -48,8 +49,19 @@ import java.util.*;
*
* @author Brian Deitte
*/
-public class Compc extends Tool
+public class Compc extends Tool implements FlexTool
{
+ @Override
+ public String getName() {
+ return "COMPC";
+ }
+
+ @Override
+ public int execute(String[] args) {
+ compc(args);
+ return ThreadLocalToolkit.errorCount();
+ }
+
public static void main(String[] args)
{
compc(args);
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/modules/compiler/src/java/flex2/tools/Mxmlc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc.java b/modules/compiler/src/java/flex2/tools/Mxmlc.java
index dfec3e9..0854d1b 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc.java
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc.java
@@ -41,6 +41,7 @@ import flex2.compiler.util.ThreadLocalToolkit;
import flex2.linker.ConsoleApplication;
import flex2.linker.LinkerAPI;
import flex2.linker.LinkerException;
+import org.apache.flex.tools.FlexTool;
import java.io.*;
import java.util.*;
@@ -53,10 +54,21 @@ import java.util.Map.Entry;
*
* @author Clement Wong
*/
-public final class Mxmlc extends Tool
+public final class Mxmlc extends Tool implements FlexTool
{
public static final String FILE_SPECS = "file-specs";
+ @Override
+ public String getName() {
+ return "MXMLC";
+ }
+
+ @Override
+ public int execute(String[] args) {
+ mxmlc(args);
+ return ThreadLocalToolkit.errorCount();
+ }
+
/**
* The entry-point for Mxmlc.
* Note that if you change anything in this method, make sure to check Compc, Shell, and
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/modules/compiler/src/java/flex2/tools/Optimizer.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Optimizer.java b/modules/compiler/src/java/flex2/tools/Optimizer.java
index d81787e..0a7f679 100644
--- a/modules/compiler/src/java/flex2/tools/Optimizer.java
+++ b/modules/compiler/src/java/flex2/tools/Optimizer.java
@@ -45,15 +45,28 @@ import flex2.compiler.config.ConfigurationValue;
import flex2.compiler.io.FileUtil;
import flex2.compiler.util.CompilerMessage;
import flex2.compiler.util.ThreadLocalToolkit;
+import org.apache.flex.tools.FlexTool;
/**
* The post-link optimizer as a command-line tool...
*
* @author Clement Wong
*/
-public class Optimizer
+public class Optimizer implements FlexTool
{
- public static void main(String[] args)
+
+ @Override
+ public String getName() {
+ return "OPTIMIZER";
+ }
+
+ @Override
+ public int execute(String[] args) {
+ main(args);
+ return 0;
+ }
+
+ public static void main(String[] args)
{
flex2.compiler.CompilerAPI.useAS3();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ee16e8bc/modules/downloads.xml
----------------------------------------------------------------------
diff --git a/modules/downloads.xml b/modules/downloads.xml
index 9275fc2..7c707e5 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -82,7 +82,7 @@
they are each downloaded only if they don't already exist.
-->
- <target name="main" depends="batik-jars, commons-jars, javacc-jar, saxon9-jar, velocity-jars, xalan-jar, xerces-jars"
+ <target name="main" depends="batik-jars, commons-jars, javacc-jar, saxon9-jar, velocity-jars, xalan-jar, xerces-jars, flex-tool-api-jar"
description="Downloads all the required thirdparty JARs"/>
<!--
@@ -559,5 +559,24 @@
<globmapper from="*" to="xerces-LICENSE/*"/>
</copy>
<delete dir="${download.dir}/${xerces.dir}"/>
- </target>
+ </target>
+
+ <!--
+ flex-tool-api
+ -->
+
+ <target name="flex-tool-api-jar-check" description="Checks if flex-tool-api.jar is in lib directory.">
+ <available file="${lib.ext.dir}/flex-tool-api.jar" property="flexToolApi.jar.exists"/>
+ </target>
+
+ <target name="flex-tool-api-jar" depends="flex-tool-api-jar-check" unless="flexToolApi.jar.exists"
+ description="Downloads and copies flex-tool-api.jar to the lib directory.">
+
+ <get src="http://repository.apache.org/content/groups/snapshots/org/apache/flex/flex-tool-api/1.0.0-SNAPSHOT/flex-tool-api-1.0.0-20141105.140704-1.jar"
+ dest="${download.dir}/flex-tool-api.jar"
+ verbose="false"/>
+
+ <copy file="${download.dir}/flex-tool-api.jar" toDir="${lib.ext.dir}" verbose="true"/>
+ </target>
+
</project>
[2/3] git commit: [flex-sdk] [refs/heads/develop] - - Created a
LegacyToolGroup - Fine-tuned the flex-tool-api implementation. - Converted
DigestTool into a FlexTool
Posted by cd...@apache.org.
- Created a LegacyToolGroup
- Fine-tuned the flex-tool-api implementation.
- Converted DigestTool into a FlexTool
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/95d1b0a3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/95d1b0a3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/95d1b0a3
Branch: refs/heads/develop
Commit: 95d1b0a3bafc8b58bc61927c752bd07503493f1b
Parents: ee16e8b
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Nov 10 14:53:07 2014 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Nov 10 14:53:07 2014 +0100
----------------------------------------------------------------------
.../compiler/src/java/flex2/tools/ASDoc.java | 2 +-
.../compiler/src/java/flex2/tools/Compc.java | 2 +-
.../src/java/flex2/tools/DigestTool.java | 18 ++++++++--
.../src/java/flex2/tools/LegacyToolGroup.java | 38 ++++++++++++++++++++
.../compiler/src/java/flex2/tools/Mxmlc.java | 2 +-
.../src/java/flex2/tools/Optimizer.java | 2 +-
modules/downloads.xml | 2 +-
7 files changed, 58 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/compiler/src/java/flex2/tools/ASDoc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc.java b/modules/compiler/src/java/flex2/tools/ASDoc.java
index a8c5fde..82541d6 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc.java
+++ b/modules/compiler/src/java/flex2/tools/ASDoc.java
@@ -42,7 +42,7 @@ public class ASDoc extends Tool implements FlexTool
@Override
public String getName() {
- return "ASDOC";
+ return FLEX_TOOL_ASDOC;
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/compiler/src/java/flex2/tools/Compc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Compc.java b/modules/compiler/src/java/flex2/tools/Compc.java
index 9591850..184d407 100644
--- a/modules/compiler/src/java/flex2/tools/Compc.java
+++ b/modules/compiler/src/java/flex2/tools/Compc.java
@@ -53,7 +53,7 @@ public class Compc extends Tool implements FlexTool
{
@Override
public String getName() {
- return "COMPC";
+ return FLEX_TOOL_COMPC;
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/compiler/src/java/flex2/tools/DigestTool.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool.java b/modules/compiler/src/java/flex2/tools/DigestTool.java
index 6c93866..306a4de 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool.java
+++ b/modules/compiler/src/java/flex2/tools/DigestTool.java
@@ -37,6 +37,7 @@ import flex2.compiler.swc.SwcException;
import flex2.compiler.swc.SwcGroup;
import flex2.compiler.util.CompilerMessage;
import flex2.compiler.util.ThreadLocalToolkit;
+import org.apache.flex.tools.FlexTool;
/**
* Given the path to a file and a swc, update the digest xml in catalog.xml of the swc
@@ -45,10 +46,21 @@ import flex2.compiler.util.ThreadLocalToolkit;
* @author dloverin
*
*/
-public class DigestTool extends Tool
+public class DigestTool extends Tool implements FlexTool
{
static private final String PROGRAM_NAME = "digest";
+ @Override
+ public String getName() {
+ return FLEX_TOOL_DIGEST;
+ }
+
+ @Override
+ public int execute(String[] args) {
+ digestTool(args);
+ return ThreadLocalToolkit.errorCount();
+ }
+
/**
* @param args
*/
@@ -86,8 +98,8 @@ public class DigestTool extends Tool
DigestConfiguration configuration = rootConfiguration.getDigestConfiguration();
// load SWC
- SwcCache cache = null;
- File libraryFile = null;
+ SwcCache cache;
+ File libraryFile;
BufferedInputStream libraryInput = null;
try
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/compiler/src/java/flex2/tools/LegacyToolGroup.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/LegacyToolGroup.java b/modules/compiler/src/java/flex2/tools/LegacyToolGroup.java
new file mode 100644
index 0000000..4884d61
--- /dev/null
+++ b/modules/compiler/src/java/flex2/tools/LegacyToolGroup.java
@@ -0,0 +1,38 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package flex2.tools;
+
+import org.apache.flex.tools.AbstractFlexToolGroup;
+
+/**
+ * FlexToolGroup exposing the implementations of the old legacy compilers tools.
+ */
+public class LegacyToolGroup extends AbstractFlexToolGroup {
+
+ public LegacyToolGroup() {
+ super("Legacy");
+ addFlexTool(new ASDoc());
+ addFlexTool(new Compc());
+ addFlexTool(new Mxmlc());
+ addFlexTool(new DigestTool());
+ addFlexTool(new Optimizer());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/compiler/src/java/flex2/tools/Mxmlc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc.java b/modules/compiler/src/java/flex2/tools/Mxmlc.java
index 0854d1b..f48bd37 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc.java
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc.java
@@ -60,7 +60,7 @@ public final class Mxmlc extends Tool implements FlexTool
@Override
public String getName() {
- return "MXMLC";
+ return FLEX_TOOL_MXMLC;
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/compiler/src/java/flex2/tools/Optimizer.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Optimizer.java b/modules/compiler/src/java/flex2/tools/Optimizer.java
index 0a7f679..bc496bf 100644
--- a/modules/compiler/src/java/flex2/tools/Optimizer.java
+++ b/modules/compiler/src/java/flex2/tools/Optimizer.java
@@ -57,7 +57,7 @@ public class Optimizer implements FlexTool
@Override
public String getName() {
- return "OPTIMIZER";
+ return FLEX_TOOL_OPTIMIZER;
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/95d1b0a3/modules/downloads.xml
----------------------------------------------------------------------
diff --git a/modules/downloads.xml b/modules/downloads.xml
index 7c707e5..f9e8758 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -572,7 +572,7 @@
<target name="flex-tool-api-jar" depends="flex-tool-api-jar-check" unless="flexToolApi.jar.exists"
description="Downloads and copies flex-tool-api.jar to the lib directory.">
- <get src="http://repository.apache.org/content/groups/snapshots/org/apache/flex/flex-tool-api/1.0.0-SNAPSHOT/flex-tool-api-1.0.0-20141105.140704-1.jar"
+ <get src="http://repository.apache.org/content/groups/snapshots/org/apache/flex/flex-tool-api/1.0.0-SNAPSHOT/flex-tool-api-1.0.0-20141110.132854-7.jar"
dest="${download.dir}/flex-tool-api.jar"
verbose="false"/>
[3/3] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'feature/flex-tool-api' into develop
Posted by cd...@apache.org.
Merge branch 'feature/flex-tool-api' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4caf1e92
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4caf1e92
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4caf1e92
Branch: refs/heads/develop
Commit: 4caf1e925758311b14b077eeaf9188d8a67bd9d6
Parents: 27501dd 95d1b0a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Nov 23 13:20:49 2014 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Nov 23 13:20:49 2014 +0100
----------------------------------------------------------------------
build.xml | 1 +
modules/compiler/build.xml | 9 +++--
.../compiler/src/java/flex2/tools/ASDoc.java | 15 +++++++-
.../compiler/src/java/flex2/tools/Compc.java | 14 +++++++-
.../src/java/flex2/tools/DigestTool.java | 18 ++++++++--
.../src/java/flex2/tools/LegacyToolGroup.java | 38 ++++++++++++++++++++
.../compiler/src/java/flex2/tools/Mxmlc.java | 14 +++++++-
.../src/java/flex2/tools/Optimizer.java | 17 +++++++--
modules/downloads.xml | 23 ++++++++++--
9 files changed, 137 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4caf1e92/build.xml
----------------------------------------------------------------------