You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/02/26 21:26:35 UTC
[royale-compiler] branch feature/vivid-ui-set updated (c15f6ee ->
3364050)
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a change to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
discard c15f6ee copy theme files from assets folder to destination folder
discard 3f2b441 could debug info just be too much data?
discard 14ab701 more fixes
discard 574baaa oops wrong place
discard 84f62e4 try to deal with build failures
discard 912cce8 Merge branch 'feature/vivid-ui-set' of https://github.com/apache/royale-compiler into feature/vivid-ui-set
discard c9ee8cf Merge branch 'develop' into feature/vivid-ui-set
discard f0042b0 add other CSS files found in SWCs
add 8227a4a NPE check
new 9d82231 try to deal with build failures
new a914071 oops wrong place
new 06223c0 more fixes
new a2b6185 could debug info just be too much data?
new 3364050 copy theme files from assets folder to destination folder
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c15f6ee)
\
N -- N -- N refs/heads/feature/vivid-ui-set (3364050)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 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:
.../org/apache/royale/compiler/internal/tree/as/IdentifierNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.
[royale-compiler] 01/05: try to deal with build failures
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 9d8223188e5079a561428b5903105f9b26478ecd
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
carlosrovira@apache.org.
[royale-compiler] 05/05: copy theme files from assets folder to
destination folder
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 33640504de0e473a81461fa127431d3ec686449b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Feb 26 10:33:21 2018 -0800
copy theme files from assets folder to destination folder
---
.../codegen/mxml/royale/MXMLRoyalePublisher.java | 39 +++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
index b6275d3..7b75e49 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
@@ -29,7 +29,9 @@ import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.royale.compiler.clients.problems.ProblemQuery;
import org.apache.royale.compiler.codegen.js.IJSPublisher;
import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.css.ICSSDocument;
import org.apache.royale.compiler.css.ICSSPropertyValue;
+import org.apache.royale.compiler.filespecs.IFileSpecification;
import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogPublisher;
import org.apache.royale.compiler.internal.codegen.js.goog.JarSourceFile;
import org.apache.royale.compiler.internal.css.CSSArrayPropertyValue;
@@ -43,6 +45,7 @@ import org.apache.royale.compiler.internal.targets.ITargetAttributes;
import org.apache.royale.compiler.utils.JSClosureCompilerWrapper;
import org.apache.royale.swc.ISWC;
import org.apache.royale.swc.ISWCFileEntry;
+import org.apache.royale.swc.ISWCManager;
import java.io.*;
import java.net.URL;
@@ -57,6 +60,7 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
public static final String ROYALE_RELEASE_DIR_NAME = "js-release";
private static final String ROYALE_EXTERNS = "externs";
+ private static final String ROYALE_THEME_ASSETS = "assets/";
class DependencyRecord
{
@@ -184,6 +188,40 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
File imageSrcDir = new File(configuration.getTargetFile()).getAbsoluteFile().getParentFile();
// FIXME: All images need to be located relative to the Main class ... for Maven this is a problem.
FileUtils.copyDirectory(imageSrcDir, intermediateDir, resourceFilter);
+
+ // Iterate over all themes SWCs and add the contents of any included files in
+ // an assets folder to an assets folder in the destination folder.
+ final ISWCManager swcManager = project.getWorkspace().getSWCManager();
+ List<IFileSpecification> themes = project.getThemeFiles();
+ for (final IFileSpecification themeFile : themes)
+ {
+ final String extension = FilenameUtils.getExtension(themeFile.getPath());
+ if ("swc".equalsIgnoreCase(extension))
+ {
+ final ISWC swc = swcManager.get(new File(themeFile.getPath()));
+ Map<String, ISWCFileEntry> files = swc.getFiles();
+ for (String key : files.keySet())
+ {
+ if (key.startsWith(ROYALE_THEME_ASSETS))
+ {
+ ISWCFileEntry fileEntry = swc.getFile(key);
+ if (fileEntry != null)
+ {
+ InputStream is = fileEntry.createInputStream();
+ int n = is.available();
+ int total = 0;
+ byte[] data = new byte[n];
+ while (total < n)
+ {
+ total += is.read(data, total, n - total);
+ }
+ FileUtils.writeByteArrayToFile(new File(intermediateDir, key), data);
+ }
+ }
+ }
+ }
+ }
+
// If we are doing a release build, we need to copy them to the release dir too.
if (configuration.release()) {
FileUtils.copyDirectory(imageSrcDir, releaseDir, resourceFilter);
@@ -191,7 +229,6 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
clearEmptyDirectoryTrees(releaseDir);
}
-
/////////////////////////////////////////////////////////////////////////////////
// Copy / Dump the closure files into the intermediate directory.
/////////////////////////////////////////////////////////////////////////////////
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.
[royale-compiler] 02/05: oops wrong place
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit a9140716ead581c3da47265c5dabceabd9f0b70b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Feb 25 23:06:35 2018 -0800
oops wrong place
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 772fc76..ebffc45 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" -Dhttps.protocols=TLSv1.2
+ 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
carlosrovira@apache.org.
[royale-compiler] 03/05: more fixes
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 06223c061659092c0ccc6a538b6b453f2bae7779
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Feb 25 23:15:51 2018 -0800
more fixes
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ebffc45..adbeb10 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ node('windows-2012-1') {
echo 'Building Royale Framework'
// It seems the distribution needs a little more perm-gen space.
withEnv(["MAVEN_OPTS=-XX:MaxPermSize=256m"]) {
- bat "mvn -U -X clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml -P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e"
+ bat "mvn -U -X clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml -P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e -Dhttps.protocols=TLSv1.2"
}
}
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.
[royale-compiler] 04/05: could debug info just be too much data?
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/vivid-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit a2b6185d582189554112103137631fa2873c2013
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Feb 26 00:29:51 2018 -0800
could debug info just be too much data?
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index adbeb10..d5d533a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ node('windows-2012-1') {
echo 'Building Royale Framework'
// It seems the distribution needs a little more perm-gen space.
withEnv(["MAVEN_OPTS=-XX:MaxPermSize=256m"]) {
- bat "mvn -U -X clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml -P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e -Dhttps.protocols=TLSv1.2"
+ bat "mvn -U clean ${mavenGoal} ${mavenLocalRepo} -s C:\\.m2\\settings.xml -P apache-snapshots-enabled,build-examples,build-distribution -Dcom.adobe.systemIdsForWhichTheTermsOfTheAdobeLicenseAgreementAreAccepted=3872fc1e -Dhttps.protocols=TLSv1.2"
}
}
--
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.