You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/02/26 07:02:15 UTC
[royale-compiler] branch feature/vivid-ui-set updated (e179dae ->
84f62e4)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from e179dae per platform json output
new f0042b0 add other CSS files found in SWCs
new c9ee8cf Merge branch 'develop' into feature/vivid-ui-set
new 912cce8 Merge branch 'feature/vivid-ui-set' of https://github.com/apache/royale-compiler into feature/vivid-ui-set
new 84f62e4 try to deal with build failures
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-compiler] 01/04: add other CSS files found in SWCs
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit f0042b0e4fb6f23e038b5d2a9e0be42662b8e2cc
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Feb 18 21:56:16 2018 -0800
add other CSS files found in SWCs
---
.../royale/compiler/internal/css/CSSManager.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
index a454e19..3b13a88 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
@@ -25,6 +25,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import org.apache.commons.io.FilenameUtils;
@@ -46,6 +47,7 @@ import org.apache.royale.compiler.problems.CSSUnresolvedClassReferenceProblem;
import org.apache.royale.compiler.problems.ICompilerProblem;
import org.apache.royale.compiler.units.ICompilationUnit;
import org.apache.royale.swc.ISWC;
+import org.apache.royale.swc.ISWCFileEntry;
import org.apache.royale.swc.ISWCManager;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -258,6 +260,24 @@ public class CSSManager implements ICSSManager
// Ignore theme file without a defaults CSS.
if (css != null && css != CSSDocumentCache.EMPTY_CSS_DOCUMENT)
builder.add(css);
+
+ if ("swc".equalsIgnoreCase(extension))
+ {
+ final ISWC swc = swcManager.get(new File(themeFile.getPath()));
+ // add other css files.
+ Map<String, ISWCFileEntry> files = swc.getFiles();
+ Set<String> fileNames = files.keySet();
+ for (String fileName : fileNames)
+ {
+ String suffix = FilenameUtils.getExtension(fileName);
+ if ("css".equalsIgnoreCase(suffix) && !fileName.contains("default"))
+ {
+ final CacheStoreKeyBase key = CSSDocumentCache.createKey(swc, fileName);
+ final ICSSDocument extracss = cssCache.get(key);
+ builder.add(extracss);
+ }
+ }
+ }
}
catch (CSSDocumentCache.ProblemParsingCSSRuntimeException cssError)
{
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-compiler] 02/04: Merge branch 'develop' into
feature/vivid-ui-set
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit c9ee8cfac204b5ab94730d47de9fc77a8f7174ec
Merge: f0042b0 f19695e
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Fri Feb 23 09:18:12 2018 +0100
Merge branch 'develop' into feature/vivid-ui-set
.../internal/codegen/js/jx/AsIsEmitter.java | 13 +++++++++
.../internal/codegen/js/jx/InterfaceEmitter.java | 17 +++++++----
.../codegen/mxml/royale/MXMLRoyaleEmitter.java | 34 +++++++++++++++++++++-
.../compiler/internal/graph/GoogDepsWriter.java | 17 +++++++++--
.../codegen/js/royale/TestRoyaleInterface.java | 4 +--
.../projects/overrides/interfaces/IA_result.js | 6 ++++
6 files changed, 80 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-compiler] 04/04: try to deal with build failures
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 84f62e49157457bffd6cd0ae42b05e4793f78751
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Feb 25 23:02:03 2018 -0800
try to deal with build failures
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2df32e8..772fc76 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,7 +78,7 @@ node('windows-2012-1') {
dir('typedefs') {
echo 'Building Royale Typedefs'
- bat "mvn -U clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml -P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e"
+ bat "mvn -U clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml -P apache-snapshots-enabled -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3c9041a9,3872fc1e" -Dhttps.protocols=TLSv1.2
}
stage 'Build Royale Framework'
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-compiler] 03/04: Merge branch 'feature/vivid-ui-set' of
https://github.com/apache/royale-compiler into feature/vivid-ui-set
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 912cce82b148a06afbbee30914d0b357afd1b9bf
Merge: c9ee8cf e179dae
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Feb 25 21:42:59 2018 -0800
Merge branch 'feature/vivid-ui-set' of https://github.com/apache/royale-compiler into feature/vivid-ui-set
.../apache/royale/compiler/clients/ASDOCJSC.java | 16 ++++++++++++--
.../codegen/js/royale/JSRoyaleASDocEmitter.java | 25 +++++++++++++++++-----
.../codegen/js/royale/JSRoyaleDocEmitter.java | 2 +-
.../java/org/apache/royale/maven/BaseMojo.java | 2 +-
.../main/resources/config/compile-app-config.xml | 2 ++
5 files changed, 38 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.