Updated Branches: refs/heads/develop c8275ed61 -> a309f44b9
add option to read fb project files to get compiler options. Not all options are supported yet. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fd89dd0f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fd89dd0f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fd89dd0f Branch: refs/heads/develop Commit: fd89dd0fe48fc5f20bac92dc7cb7cbdd4f68fa41 Parents: c8275ed Author: Alex Harui <[email protected]> Authored: Fri Nov 15 22:12:42 2013 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Nov 18 10:03:03 2013 -0800 ---------------------------------------------------------------------- .../org/apache/flex/compiler/clients/MXMLC.java | 19 +- .../flex/compiler/config/Configuration.java | 19 + .../config/FlashBuilderConfigurator.java | 471 +++++++++++++++++++ 3 files changed, 508 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fd89dd0f/compiler/src/org/apache/flex/compiler/clients/MXMLC.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/clients/MXMLC.java b/compiler/src/org/apache/flex/compiler/clients/MXMLC.java index 001fa0b..e0d23e4 100644 --- a/compiler/src/org/apache/flex/compiler/clients/MXMLC.java +++ b/compiler/src/org/apache/flex/compiler/clients/MXMLC.java @@ -57,6 +57,7 @@ import org.apache.flex.compiler.config.RSLSettings.RSLAndPolicyFileURLPair; import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.filespecs.IFileSpecification; import org.apache.flex.compiler.internal.common.Counter; +import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator; import org.apache.flex.compiler.internal.config.localization.LocalizationManager; import org.apache.flex.compiler.internal.graph.GraphMLWriter; import org.apache.flex.compiler.internal.projects.FlexProject; @@ -87,6 +88,7 @@ import org.apache.flex.swf.ISWF; import org.apache.flex.swf.io.ISWFWriter; import org.apache.flex.swf.io.SWFWriterAndSizeReporter; import org.apache.flex.utils.FilenameNormalization; + import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -406,7 +408,11 @@ public class MXMLC ConfigurationPathResolver resolver = new ConfigurationPathResolver(System.getProperty("user.dir")); projectConfigurator.setConfigurationPathResolver(resolver); projectConfigurator.setWarnOnFlexOnlyOptionUsage(false); - projectConfigurator.setConfiguration(args, getConfigurationDefaultVariable()); + if (useFlashBuilderProjectFiles(args)) + projectConfigurator.setConfiguration(FlashBuilderConfigurator.computeFlashBuilderArgs(args, getTargetType().getExtension()), + getConfigurationDefaultVariable()); + else + projectConfigurator.setConfiguration(args, getConfigurationDefaultVariable()); projectConfigurator.applyToProject(project); getTargetSettings(); // get targetSettings here to flush out any configuration problems. problems = new ProblemQuery(projectConfigurator.getCompilerProblemSettings()); @@ -486,6 +492,16 @@ public class MXMLC return ICompilerSettingsConstants.FILE_SPECS_VAR; } + private boolean useFlashBuilderProjectFiles(String[] args) + { + for (String arg : args) + { + if (arg.equals("-fb") || arg.equals("-use-flashbuilder-project-files")) + return true; + } + return false; + } + /** * Validate target file. * @@ -1008,4 +1024,5 @@ public class MXMLC { return problems; } + } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fd89dd0f/compiler/src/org/apache/flex/compiler/config/Configuration.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/config/Configuration.java b/compiler/src/org/apache/flex/compiler/config/Configuration.java index f0deae8..0b4544b 100644 --- a/compiler/src/org/apache/flex/compiler/config/Configuration.java +++ b/compiler/src/org/apache/flex/compiler/config/Configuration.java @@ -228,6 +228,7 @@ public class Configuration aliases.put( "l", "compiler.library-path" ); aliases.put( "el", "compiler.external-library-path" ); + aliases.put( "fb", "use-flashbuilder-project-files" ); aliases.put( "is", "include-sources"); aliases.put( "sp", "compiler.source-path"); aliases.put( "rsl", "runtime-shared-libraries"); @@ -1118,6 +1119,24 @@ public class Configuration } // + // 'use-flashbuilder-project-files' option + // + private Boolean useFlashBuilderProjectFiles = false; + + public Boolean getUseFlashBuilderProjectFiles() + { + return useFlashBuilderProjectFiles; + } + + @Config + @Mapping({"use-flashbuilder-project-files"}) + @FlexOnly + public void setUseFlashBuilderProjectFiles(ConfigurationValue cv, Boolean useFiles) throws ConfigurationException + { + useFlashBuilderProjectFiles = useFiles; + } + + // // 'verify-digests' options // http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fd89dd0f/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java ---------------------------------------------------------------------- diff --git a/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java b/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java new file mode 100644 index 0000000..2949147 --- /dev/null +++ b/compiler/src/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java @@ -0,0 +1,471 @@ +/* + * + * 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 org.apache.flex.compiler.internal.config; + +import java.io.File; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Stack; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.apache.commons.io.IOUtils; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +import org.apache.flex.compiler.exceptions.ConfigurationException; +import org.apache.flex.compiler.filespecs.FileSpecification; + +/** + * A utility class, which is used to parse an XML file of configuration options + * and populate a ConfigurationBuffer. A counterpart of CommandLineConfigurator + * and SystemPropertyConfigurator. + * + * @see <a href="http://help.adobe.com/en_US/flex/using/WS2db454920e96a9e51e63e3d11c0bf67670-7ff2.html";>Configuration file syntax</a> + */ +public class FlashBuilderConfigurator +{ + + public static class SAXConfigurationException extends SAXParseException + { + private static final long serialVersionUID = -3388781933743434302L; + + SAXConfigurationException(ConfigurationException e, Locator locator) + { + super(null, locator); // ? + this.innerException = e; + } + + public ConfigurationException innerException; + } + + /** + * Take the command line args which should contain the -use-flashbuilder-project-files + * option and an FB project folder, and return a new array of args + * based on the FB project files. + * @param args original set of args + * @return new array of args + */ + public static String[] computeFlashBuilderArgs(String[] args, String suffix) + { + String fbFolder = args[args.length - 1]; + + ArrayList<String> fbArgs = new ArrayList<String>(); + boolean isDebug = false; + String sdkdir = null; + for (String arg : args) + { + if (arg.equals("-debug") || arg.equals("-debug=true")) + isDebug = true; + if (arg.contains("+flexlib")) + sdkdir = arg.substring(9); + } + + ActionScriptPropertiesReader aspr = new ActionScriptPropertiesReader(); + try + { + aspr.read(fbArgs, fbFolder, isDebug, suffix, sdkdir); + } + catch (ConfigurationException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + FlexLibPropertiesReader flpr = new FlexLibPropertiesReader(); + if (suffix.equals(".swc")) + { + try + { + flpr.read(fbArgs, fbFolder); + } + catch (ConfigurationException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + for (String arg : args) + fbArgs.add(arg); + // remove last original arg which should have been project folder + fbArgs.remove(fbArgs.size() - 1); + if (suffix.equals(".swc")) + { + //fbArgs.add(flpr.classes); + } + else + { + // add new last arg which is path to app + fbArgs.add(aspr.applicationPath); + } + + System.out.println("using FlashBuilder Project Files"); + System.out.println("FlashBuilder settings:"); + for (String arg : fbArgs) + System.out.println(" " + arg); + return fbArgs.toArray(new String[fbArgs.size()]); + } + + private static class ActionScriptPropertiesReader + { + public String applicationPath; + + public void read(ArrayList<String> fbArgs, String fbFolder, boolean isDebug, String suffix, String sdkdir) throws ConfigurationException + { + String path = fbFolder + "/" + ".actionScriptProperties"; + final ASPropertiesHandler h = new ASPropertiesHandler(fbArgs, path, fbFolder, "actionScriptProperties", isDebug, suffix, sdkdir); + final SAXParserFactory factory = SAXParserFactory.newInstance(); + Reader reader = null; + try + { + FileSpecification fs = new FileSpecification(path); + reader = fs.createReader(); + final SAXParser parser = factory.newSAXParser(); + final InputSource source = new InputSource(reader); + parser.parse(source, h); + applicationPath = h.applicationPath; + } + catch (SAXConfigurationException e) + { + throw e.innerException; + } + catch (SAXParseException e) + { + throw new ConfigurationException.OtherThrowable(e, null, path, e.getLineNumber()); + } + catch (Exception e) + { + throw new ConfigurationException.OtherThrowable(e, null, path, -1); + } + finally + { + IOUtils.closeQuietly(reader); + } + } + } + + + /** + * SAX handler for .actionScriptProperties XML. + */ + private static class ASPropertiesHandler extends DefaultHandler + { + public ASPropertiesHandler(ArrayList<String> fbArgs, + String source, + String contextPath, + String rootElement, + boolean isDebug, + String suffix, + String sdkdir) + { + this.isDebug = isDebug; + this.fbArgs = fbArgs; + this.source = source; + this.contextPath = contextPath; + this.rootElement = rootElement; + this.suffix = suffix; + this.sdkdir = sdkdir; + } + + private Stack<String> contextStack = new Stack<String>(); + private ArrayList<String> fbArgs; + private final String source; + private final String contextPath; + private final String rootElement; + private final String suffix; + private Locator locator; + private boolean isDebug; + private String sdkdir; + + public String applicationPath; + private String outputFileName; + private boolean inExclude; + private String workspacePath; + + @Override + public void startElement(final String uri, final String localName, final String qname, final Attributes attributes) throws SAXException + { + // Verify and initialize the context stack at root element. + if (contextStack.size() == 0) + { + if (!qname.equals(rootElement)) + { + throw new SAXConfigurationException( + new ConfigurationException.IncorrectElement(rootElement, qname, this.source, locator.getLineNumber()), + locator); + } + contextStack.push(qname); + applicationPath = attributes.getValue("mainApplicationPath"); + outputFileName = applicationPath.substring(0, applicationPath.lastIndexOf('.')); + return; + } + else + { + if (qname.equals("compiler")) + { + String extras = attributes.getValue("additionalCompilerArguments"); + if (extras != null && extras.length() > 0) + { + String[] parts = extras.split(" "); + for (String part : parts) + fbArgs.add(part); + } + String srcPath = attributes.getValue("sourceFolderPath"); + if (srcPath != null && srcPath.length() > 0) + { + applicationPath = contextPath + "/" + srcPath + "/" + applicationPath; + fbArgs.add("-source-path+=" + contextPath + "/" + srcPath); + } + String isApollo = attributes.getValue("useApolloConfig"); + if (isApollo != null && isApollo.length() > 0) + { + if (isApollo.equals("true")) + { + fbArgs.add("+configname=air"); + } + } + String isAccessible = attributes.getValue("generateAccessible"); + if (isAccessible != null && isAccessible.length() > 0) + { + if (isAccessible.equals("true")) + { + fbArgs.add("-compiler.accessible=true"); + } + } + String outputFolder = attributes.getValue("outputFolderPath"); + if (outputFolder != null && outputFolder.length() > 0) + { + // swap bin-debug for bin-release if not debug swf + if (!isDebug) + outputFolder = outputFolder.replace("debug", "release"); + + String outFile = "-output="; + if (!outputFolder.startsWith("/")) + outFile += contextPath + "/"; + fbArgs.add(outFile + outputFolder + "/" + outputFileName + suffix); + } + } + else if (qname.equals("sourcePathEntry")) + { + String kind = attributes.getValue("kind"); + if (kind.equals("1")) + { + String path = attributes.getValue("path"); + fbArgs.add("-source-path+=" + contextPath + "/" + path); + } + } + else if (qname.equals("libraryPathEntry")) + { + if (!inExclude) + { + String kind = attributes.getValue("kind"); + String path = attributes.getValue("path"); + if (!kind.equals("4")) // not an sdk reference + { + if (path.contains("${DOCUMENTS}")) + { + if (workspacePath == null) + { + workspacePath = path; + while (workspacePath != null && workspacePath.length() > 0) + { + File workspaceFile = new File(workspacePath + "/.metadata"); + if (workspaceFile.exists()) + break; + workspacePath = workspaceFile.getParent(); + } + } + path = path.replace("${DOCUMENTS}", workspacePath); + fbArgs.add("-library-path+=" + path); + } + else if (path.contains("${PROJECT_FRAMEWORKS}")) + { + path = path.replace("${PROJECT_FRAMEWORKS}", sdkdir); + fbArgs.add("-library-path+=" + path); + } + else + { + if (path.startsWith("/")) + { + File f = new File(contextPath); + // FB puts a "/" in front of references to other projects + String parentPath = f.getParent(); + f = new File(parentPath + path); + if (f.exists()) + fbArgs.add("-library-path+=" + parentPath + path); + else + fbArgs.add("-library-path+=" + path); + + } + fbArgs.add("-library-path+=" + contextPath + "/" + path); + } + } + } + } + else if (qname.equals("excludedEntries")) + inExclude = true; + } + } + + @Override + public void endElement(String uri, String localName, String qname) throws SAXException + { + if (qname.equals("excludedEntries")) + inExclude = false; + } + + @Override + public void characters(char ch[], int start, int length) + { + } + + @Override + public void setDocumentLocator(Locator locator) + { + this.locator = locator; + } + } + + private static class FlexLibPropertiesReader + { + public void read(ArrayList<String> fbArgs, String fbFolder) throws ConfigurationException + { + String path = fbFolder + "/" + ".flexLibProperties"; + final FlexLibPropertiesHandler h = new FlexLibPropertiesHandler(fbArgs, path, fbFolder, "flexLibProperties"); + final SAXParserFactory factory = SAXParserFactory.newInstance(); + Reader reader = null; + try + { + FileSpecification fs = new FileSpecification(path); + reader = fs.createReader(); + final SAXParser parser = factory.newSAXParser(); + final InputSource source = new InputSource(reader); + parser.parse(source, h); + } + catch (SAXConfigurationException e) + { + throw e.innerException; + } + catch (SAXParseException e) + { + throw new ConfigurationException.OtherThrowable(e, null, path, e.getLineNumber()); + } + catch (Exception e) + { + throw new ConfigurationException.OtherThrowable(e, null, path, -1); + } + finally + { + IOUtils.closeQuietly(reader); + } + } + } + + + + /** + * SAX handler for .flexLibProperties XML. + */ + private static class FlexLibPropertiesHandler extends DefaultHandler + { + public FlexLibPropertiesHandler(ArrayList<String> fbArgs, + String source, + String contextPath, + String rootElement) + { + this.fbArgs = fbArgs; + this.source = source; + this.contextPath = contextPath; + this.rootElement = rootElement; + } + + private Stack<String> contextStack = new Stack<String>(); + private ArrayList<String> fbArgs; + private final String source; + private final String contextPath; + private final String rootElement; + private Locator locator; + + private ArrayList<String> includedClasses = new ArrayList<String>(); + + @Override + public void startElement(final String uri, final String localName, final String qname, final Attributes attributes) throws SAXException + { + // Verify and initialize the context stack at root element. + if (contextStack.size() == 0) + { + if (!qname.equals(rootElement)) + { + throw new SAXConfigurationException( + new ConfigurationException.IncorrectElement(rootElement, qname, this.source, locator.getLineNumber()), + locator); + } + contextStack.push(qname); + return; + } + else + { + if (qname.equals("classEntry")) + { + String path = attributes.getValue("path"); + includedClasses.add(path); + } + else if (qname.equals("namespaceManifestEntry")) + { + String manifest = attributes.getValue("manifest"); + String namespace = attributes.getValue("namespace"); + fbArgs.add("-namespace"); + fbArgs.add(namespace); + String mf = contextPath + "/" + manifest; + File f = new File(mf); + if (!f.exists()) + { + mf = contextPath + "/src/" + manifest; + } + fbArgs.add(mf); + fbArgs.add("-include-namespaces"); + fbArgs.add(namespace); + } + } + } + + @Override + public void endElement(String uri, String localName, String qname) throws SAXException + { + } + + @Override + public void characters(char ch[], int start, int length) + { + } + + @Override + public void setDocumentLocator(Locator locator) + { + this.locator = locator; + } + } +}
