[2/2] git commit: [flex-falcon] [refs/heads/develop] - fix compc in FB
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 aha...@apache.org
Authored: Mon Jun 9 23:59:43 2014 -0700
Committer: Alex Harui aha...@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 (IteratorVirtualFile 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);
[Harbs/TLF-Table-Work] e806c6: Changes related to importing of Table tags. Many o...
Branch: refs/heads/master Home: https://github.com/Harbs/TLF-Table-Work Commit: e806c6b0c1b79b357eebde85f212e51e18eec334 https://github.com/Harbs/TLF-Table-Work/commit/e806c6b0c1b79b357eebde85f212e51e18eec334 Author: Judah Frangipane flexcapaci...@gmail.com Date: 2014-06-10 (Tue, 10 Jun 2014) Changed paths: M flex-tlf/textLayout/src/flashx/textLayout/conversion/BaseTextLayoutImporter.as M flex-tlf/textLayout/src/flashx/textLayout/conversion/TextLayoutExporter.as M flex-tlf/textLayout/src/flashx/textLayout/conversion/TextLayoutImporter.as M flex-tlf/textLayout/src/flashx/textLayout/elements/CellCoordinates.as M flex-tlf/textLayout/src/flashx/textLayout/elements/CellRange.as M flex-tlf/textLayout/src/flashx/textLayout/elements/FlowGroupElement.as M flex-tlf/textLayout/src/flashx/textLayout/elements/TableCellElement.as M flex-tlf/textLayout/src/flashx/textLayout/elements/TableElement.as M flex-tlf/textLayout/src/flashx/textLayout/elements/TableRowElement.as M tests/TableTest/src/TableExplorer.mxml A tests/TableTest/src/assets/images/addColumnIcon.png A tests/TableTest/src/assets/images/addRowIcon.png A tests/TableTest/src/assets/images/addTableIcon.png R tests/TableTest/src/assets/images/addTableIcons.png A tests/TableTest/src/assets/images/removeColumnIcon.png A tests/TableTest/src/assets/images/removeRowIcon.png A tests/TableTest/src/assets/images/removeTableIcon.png R tests/TableTest/src/assets/images/subtractTableIcons.png Log Message: --- Changes related to importing of Table tags. Many of these areas will need to be refactored since tables do not fit in the TLF model Added method to parse table cell elements to BaseTextLayoutImporter Added table header to import element which just uses table cell importer Added getTextFlowContent method temporarily for testing import of table data contents. This will be removed when things are working. Added removeAllRows and removeAllRowsWithContent to TableElement Fixed bug where child of TableElement throws error if mxmlChildren is not TableCellElement Updated canOwnFlowElement to accept table element types for support import methods. Added cells, addCell and addCellAt to TableRowElement Added import of simple table data, remove all rows to TableExplorer Commit: abdc4086e79442573b1c2531a4d3d173f6ccad62 https://github.com/Harbs/TLF-Table-Work/commit/abdc4086e79442573b1c2531a4d3d173f6ccad62 Author: Judah Frangipane flexcapaci...@gmail.com Date: 2014-06-10 (Tue, 10 Jun 2014) Changed paths: M flex-tlf/textLayout/src/flashx/textLayout/compose/TextFlowTableBlock.as M flex-tlf/textLayout/src/flashx/textLayout/container/ContainerController.as M flex-tlf/textLayout/src/flashx/textLayout/edit/SelectionManager.as M flex-tlf/textLayout/src/flashx/textLayout/elements/CellCoordinates.as M flex-tlf/textLayout/src/flashx/textLayout/elements/TableBlockContainer.as M flex-tlf/textLayout/src/flashx/textLayout/elements/TableCellElement.as M flex-tlf/textLayout/src/flashx/textLayout/elements/TableElement.as A flex-tlf/textLayout/src/flashx/textLayout/elements/TableLeafElement.as Log Message: --- Merge branch 'master' of https://github.com/Harbs/TLF-Table-Work Conflicts: flex-tlf/textLayout/src/flashx/textLayout/elements/CellCoordinates.as Compare: https://github.com/Harbs/TLF-Table-Work/compare/bb0ca7355ed0...abdc4086e794
Re: git commit: [flex-sdk] [refs/heads/develop] - FLEX-34078 fix callouts closing when selecting dates in DateFields
-1 for reasons stated below. Justin, you never responded so I'm thinking my attempts to ask you about this have been missed in all the other noise. -Alex On 5/26/14 10:12 PM, Alex Harui aha...@adobe.com wrote: This change broke Falcon, although Falcon is not reporting the failure correctly. And I'm sort of surprised it didn't break the SDK build because it introduces a dependency from spark.swc to mx.swc and mx.swc is not listed in the set of libraries used to build experimental.swc. It is also not a good idea to start dragging mx stuff into spark-only apps. Might affect mobile app sizes and might affect those with spark-only build setups. I'm not familiar with Callout, but in other components with drop downs, the drop down's owner property is set to the base component, then you check to see if the component owns the clicked item. Can similar logic be used here and eliminate the mx.swc dependency? Thanks, -Alex On 5/18/14 12:30 PM, jmcl...@apache.org jmcl...@apache.org wrote: Repository: flex-sdk Updated Branches: refs/heads/develop 3a087a60e - 080f5e64d FLEX-34078 fix callouts closing when selecting dates in DateFields Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/080f5e64 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/080f5e64 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/080f5e64 Branch: refs/heads/develop Commit: 080f5e64d5718d76c51ecf6b07552b8bfc1b112e Parents: 3a087a6 Author: Justin Mclean jmcl...@apache.org Authored: Sun May 18 12:30:41 2014 -0700 Committer: Justin Mclean jmcl...@apache.org Committed: Sun May 18 12:30:41 2014 -0700 -- .../src/spark/components/supportClasses/DropDownController.as | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/080f5e64/frameworks/ p rojects/spark/src/spark/components/supportClasses/DropDownController.as -- diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownC o ntroller.as b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownC o ntroller.as index e1ff2fd..364 100644 --- a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownC o ntroller.as +++ b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownC o ntroller.as @@ -38,6 +38,7 @@ import mx.managers.ISystemManager; import spark.components.DropDownList; import spark.events.DropDownEvent; +import mx.controls.CalendarLayout; use namespace mx_internal; @@ -613,6 +614,8 @@ public class DropDownController extends EventDispatcher var document:Object = (target as IUIComponent).document; if ((hostComponent in document) document.hostComponent is DropDownList) return; + if (target.parent is CalendarLayout) + return; } if (hitAreaAdditions != null)
Jenkins build is still unstable: flex-falcon #79
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/changes
