You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/06/10 08:59:55 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - remove
unneeded import
Repository: flex-falcon
Updated Branches:
refs/heads/develop ce7cb617b -> 79b5a3430
remove unneeded import
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d767b6b3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d767b6b3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d767b6b3
Branch: refs/heads/develop
Commit: d767b6b3ffb568c12514a084c7b35bbc2a070f23
Parents: ce7cb61
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 9 23:59:14 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 9 23:59:14 2014 -0700
----------------------------------------------------------------------
flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d767b6b3/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java
index f339c5a..e530ce3 100644
--- a/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java
+++ b/flex-compiler-oem/src/flex2/tools/oem/internal/OEMUtil.java
@@ -30,7 +30,6 @@ import flex2.compiler.common.DefaultsConfigurator;
import flex2.compiler.config.CommandLineConfigurator;
import flex2.compiler.config.ConfigurationBuffer;
import flex2.compiler.config.ConfigurationException;
-import flex2.compiler.config.ConfigurationValue;
import flex2.compiler.config.FileConfigurator;
import flex2.compiler.config.SystemPropertyConfigurator;
import flex2.compiler.util.CompilerControl;
[2/2] git commit: [flex-falcon] [refs/heads/develop] - fix compc in FB
Posted by ah...@apache.org.
fix compc in FB
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/79b5a343
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/79b5a343
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/79b5a343
Branch: refs/heads/develop
Commit: 79b5a34305c6d8d903fc1c214a09aea2f14437c3
Parents: d767b6b
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 9 23:59:43 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 9 23:59:43 2014 -0700
----------------------------------------------------------------------
.../src/flex2/tools/oem/Library.java | 168 ++++++++++++++++++-
1 file changed, 166 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79b5a343/flex-compiler-oem/src/flex2/tools/oem/Library.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/flex2/tools/oem/Library.java b/flex-compiler-oem/src/flex2/tools/oem/Library.java
index 7d5b95b..d4f1a19 100644
--- a/flex-compiler-oem/src/flex2/tools/oem/Library.java
+++ b/flex-compiler-oem/src/flex2/tools/oem/Library.java
@@ -20,6 +20,8 @@
package flex2.tools.oem;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -32,9 +34,14 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.lang.annotation.Annotation;
import java.net.URI;
import org.apache.flex.compiler.clients.COMPC;
+import org.apache.flex.compiler.clients.problems.ProblemQuery;
+import org.apache.flex.compiler.problems.CompilerProblemSeverity;
+import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.flex.compiler.problems.annotations.DefaultSeverity;
import flex2.compiler.common.CompilerConfiguration;
import flex2.compiler.config.ConfigurationException;
@@ -43,6 +50,7 @@ import flex2.compiler.io.LocalFile;
import flex2.compiler.io.VirtualFile;
import flex2.compiler.util.Benchmark;
import flex2.compiler.util.CompilerControl;
+import flex2.compiler.util.CompilerMessage;
import flex2.compiler.util.MimeMappings;
import flex2.compiler.util.PerformanceData;
import flex2.compiler.util.ThreadLocalToolkit;
@@ -755,6 +763,15 @@ public class Library implements Builder, Cloneable
String[] commandLine = (localOEMConfiguration != null) ? localOEMConfiguration.getCompilerOptions() :
new String[0];
+ if (output != null)
+ {
+ // add output parameter
+ String[] outputCommandLine = new String[commandLine.length + 1];
+ System.arraycopy(commandLine, 0, outputCommandLine, 0, commandLine.length);
+ outputCommandLine[commandLine.length] = "-output=" + output.getAbsolutePath();
+ commandLine = outputCommandLine;
+ }
+
// Translate "classes" into "-include-classes" so the CompcConfiguration can
// properly validate the configuration.
if (classes.size() > 0)
@@ -777,6 +794,28 @@ public class Library implements Builder, Cloneable
return newCommandLine;
}
+ // Translate "sources" into "-include-sources" so the CompcConfiguration can
+ // properly validate the configuration.
+ if (sources.size() > 0)
+ {
+ StringBuilder buffer = new StringBuilder("-include-sources=");
+
+ for (Iterator<VirtualFile> iter = sources.iterator(); iter.hasNext();)
+ {
+ String className = iter.next().getName();
+ buffer.append(className);
+ if (iter.hasNext())
+ {
+ buffer.append(",");
+ }
+ }
+
+ String[] newCommandLine = new String[commandLine.length + 1];
+ System.arraycopy(commandLine, 0, newCommandLine, 0, commandLine.length);
+ newCommandLine[commandLine.length] = buffer.toString();
+
+ return newCommandLine;
+ }
return commandLine;
}
@@ -864,8 +903,15 @@ public class Library implements Builder, Cloneable
true /* cleanConfig */,
false /* cleanMessages */,
false /* cleanThreadLocals */);
- int returnValue = COMPC.staticMainNoExit(constructCommandLine(tempOEMConfiguration));
+ COMPC compc = new COMPC();
+ int returnValue = compc.mainNoExit(constructCommandLine(oemConfiguration));
+ if (returnValue == 0)
+ returnValue = OK;
+ else
+ returnValue = FAIL;
+ convertMessages(compc.getProblems());
+
clean(returnValue != OK, false, false);
return returnValue;
@@ -877,7 +923,31 @@ public class Library implements Builder, Cloneable
}
}
-
+
+ public long link(OutputStream output)
+ {
+ try
+ {
+ FileInputStream inStream = new FileInputStream(this.output);
+ byte[] b = new byte[(int) this.output.length()];
+ inStream.read(b);
+ output.write(b);
+ inStream.close();
+ return this.output.length();
+ }
+ catch (FileNotFoundException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (IOException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return -1;
+ }
+
/**
*
* @param cleanData
@@ -1042,4 +1112,98 @@ public class Library implements Builder, Cloneable
clone.oemConfiguration = oemConfiguration.clone();
return clone;
}
+
+ public void refreshLastModified()
+ {
+ }
+
+ public void convertMessages(ProblemQuery pq)
+ {
+ List<ICompilerProblem> probs = pq.getProblems();
+ for (ICompilerProblem prob : probs)
+ {
+ Class aClass = prob.getClass();
+ Annotation[] annotations = aClass.getAnnotations();
+
+ for(Annotation annotation : annotations){
+ if(annotation instanceof DefaultSeverity){
+ DefaultSeverity myAnnotation = (DefaultSeverity) annotation;
+ CompilerProblemSeverity cps = myAnnotation.value();
+ String level;
+ if (cps.equals(CompilerProblemSeverity.ERROR))
+ level = Message.ERROR;
+ else if (cps.equals(CompilerProblemSeverity.WARNING))
+ level = Message.WARNING;
+ else
+ break; // skip if IGNORE?
+ CompilerMessage msg = new CompilerMessage(level,
+ prob.getSourcePath(),
+ prob.getLine() + 1,
+ prob.getColumn());
+ try
+ {
+ String errText = (String) aClass.getField("DESCRIPTION").get(aClass);
+ while (errText.contains("${"))
+ {
+ int start = errText.indexOf("${");
+ int end = errText.indexOf("}", start);
+ String token = errText.substring(start + 2, end);
+ String value = (String) aClass.getField(token).get(prob);
+ token = "${" + token + "}";
+ errText = errText.replace(token, value);
+ }
+ msg.setMessage(errText);
+ }
+ catch (IllegalArgumentException e1)
+ {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ catch (SecurityException e1)
+ {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ catch (IllegalAccessException e1)
+ {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ catch (NoSuchFieldException e1)
+ {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ messages.add(msg);
+ try
+ {
+ logger.log(msg, aClass.getField("errorCode").getInt(null), prob.getSourcePath());
+ }
+ catch (IllegalArgumentException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (SecurityException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (IllegalAccessException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (NoSuchFieldException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+
+ }
+
+ }
}