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 2013/11/21 05:34:28 UTC
[1/3] git commit: [flex-falcon] [refs/heads/develop] - remove some
asserts
Updated Branches:
refs/heads/develop 03568ef9a -> 635ef7bf2
remove some asserts
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3d87ef91
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3d87ef91
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3d87ef91
Branch: refs/heads/develop
Commit: 3d87ef91a00cbc30778c8e54028da66031a93631
Parents: 685f5f1
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 20 12:21:13 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 20 12:21:43 2013 -0800
----------------------------------------------------------------------
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 +-
.../internal/codegen/databinding/MXMLBindingDirectiveHelper.java | 1 -
.../flex/compiler/internal/css/codegen/CSSCompilationSession.java | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d87ef91/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index f722223..fc7392b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -413,7 +413,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
{
// TODO: figure out what this looks like
// propertyGetterFunction = this.propertyGetter;
- assert propertyGetterFunction != null;
+ // assert propertyGetterFunction != null;
}
else if (watcherInfoBase.isRoot && makeStaticWatcher)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d87ef91/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
index b4ea1c3..0fb28a8 100644
--- a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
+++ b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/MXMLBindingDirectiveHelper.java
@@ -290,7 +290,6 @@ public class MXMLBindingDirectiveHelper
if (watcherInfoBase.isRoot && !makeStaticWatcher)
{
propertyGetterFunction = this.propertyGetter;
- assert propertyGetterFunction != null;
}
else if (watcherInfoBase.isRoot && makeStaticWatcher)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d87ef91/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java b/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
index ce9c50d..29d0c9a 100644
--- a/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
+++ b/compiler/src/org/apache/flex/compiler/internal/css/codegen/CSSCompilationSession.java
@@ -168,8 +168,6 @@ public class CSSCompilationSession
*/
protected ICSSDocument synthesisNormalizedCSS()
{
- assert singleSelectorRules.isEmpty() && rulesWithMediaQueries.isEmpty() : "CSSCompilationSession.synthesisNormalizedCSS() can only be called once per compilation session.";
-
for (final ICSSDocument cssDocument : cssDocuments)
{
for (final ICSSRule newRule : cssDocument.getRules())
[2/3] git commit: [flex-falcon] [refs/heads/develop] - fix SWC
building. Was not handling include-classes correctly
Posted by ah...@apache.org.
fix SWC building. Was not handling include-classes correctly
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/685f5f13
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/685f5f13
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/685f5f13
Branch: refs/heads/develop
Commit: 685f5f130043f80f44e3cf3aeadb3ba6f741cc93
Parents: 03568ef
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 20 12:20:13 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 20 12:21:43 2013 -0800
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/targets/SWCTarget.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/685f5f13/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java b/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
index 17cf971..2c231ba 100644
--- a/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
+++ b/compiler/src/org/apache/flex/compiler/internal/targets/SWCTarget.java
@@ -772,11 +772,11 @@ public class SWCTarget extends Target implements ISWCTarget
for (String className : classNames)
{
Collection<XMLName> tagNames = flexProject.getTagNamesForClass(className);
- boolean okToAdd = false;
+ boolean okToAdd = true;
for (XMLName tagName : tagNames)
{
- if (!flexProject.isManifestComponentLookupOnly(tagName))
- okToAdd = true;
+ if (flexProject.isManifestComponentLookupOnly(tagName))
+ okToAdd = false;
}
if (okToAdd)
compilableClassNames.add(className);
[3/3] git commit: [flex-falcon] [refs/heads/develop] - add ability to
use older version of closure compiler
Posted by ah...@apache.org.
add ability to use older version of closure compiler
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/635ef7bf
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/635ef7bf
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/635ef7bf
Branch: refs/heads/develop
Commit: 635ef7bf2ab4061eb8040216f762793de6e367b0
Parents: 3d87ef9
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 20 20:34:11 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 20 20:34:11 2013 -0800
----------------------------------------------------------------------
compiler.jx/downloads.xml | 4 +++-
compiler.jx/local-template.properties | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/635ef7bf/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 913f895..a366f2e 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -23,6 +23,8 @@
<property name="FALCONJX_HOME" location="."/>
<property name="lib.dir" value="${FALCONJX_HOME}/lib"/>
<property name="download.dir" value="${FALCONJX_HOME}/in"/>
+ <property file="${basedir}/local.properties"/>
+ <property name="closure.download.filename" value="compiler-latest.zip" />
<!--
Notes:
@@ -187,7 +189,7 @@
Was: param name="zipFile" value="compiler-latest.zip"
-->
- <param name="zipFile" value="compiler-latest.zip"/>
+ <param name="zipFile" value="${closure.download.filename}"/>
</antcall>
<get src="http://www.apache.org/licenses/LICENSE-2.0" dest="${lib.dir}/google/closure-compiler/closure-LICENSE.txt"/>
<copy todir="${lib.dir}/google/closure-compiler">
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/635ef7bf/compiler.jx/local-template.properties
----------------------------------------------------------------------
diff --git a/compiler.jx/local-template.properties b/compiler.jx/local-template.properties
new file mode 100644
index 0000000..c34f221
--- /dev/null
+++ b/compiler.jx/local-template.properties
@@ -0,0 +1,21 @@
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+# Closure Compiler file name. Used to get older versions
+closure.download.filename=compiler-20130823.zip