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/03/19 16:57:58 UTC
[royale-compiler] branch develop updated (d89f9cd -> f86cc27)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from d89f9cd try to figure out why checkintests build is failing for some folks
new dcbbecc more diagnostics
new f86cc27 report filename correctly for <fx:Style src='somefile.css'/>. Line number is off by one still
The 2 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:
.../internal/codegen/mxml/royale/MXMLRoyalePublisher.java | 2 +-
.../royale/compiler/internal/tree/mxml/MXMLStyleNode.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-compiler] 01/02: more diagnostics
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit dcbbecc099000a5fd940a199205a269d6e5638db
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Mar 19 09:57:06 2018 -0700
more diagnostics
---
.../compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java | 2 +-
1 file changed, 1 insertion(+), 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 aa5e096..d006087 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
@@ -162,7 +162,7 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
// The source directory is the source path entry containing the Main class.
List<File> sourcePaths = project.getSourcePath();
String targetFile = configuration.getTargetFile().toLowerCase();
- System.out.println("find project folder...");
+ System.out.println("find project folder for " + targetFile);
File imageSrcDir = null;
for (File sp : sourcePaths)
{
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-compiler] 02/02: report filename correctly for . Line number is off by one still
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit f86cc274065fcb3857c3ce5fae778cff7a4f72c2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Mar 19 09:57:46 2018 -0700
report filename correctly for <fx:Style src='somefile.css'/>. Line number is off by one still
---
.../royale/compiler/internal/tree/mxml/MXMLStyleNode.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLStyleNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLStyleNode.java
index de1b7a7..038f034 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLStyleNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLStyleNode.java
@@ -63,6 +63,12 @@ class MXMLStyleNode extends MXMLNodeBase implements IMXMLStyleNode
* {@code <fx:Style src="styles.css" />}.
*/
private String cssText;
+
+ /**
+ * path of included css.
+ * {@code <fx:Style src="styles.css" />}.
+ */
+ private String cssSourcePath = null;
@Override
public ASTNodeID getNodeID()
@@ -84,7 +90,7 @@ class MXMLStyleNode extends MXMLNodeBase implements IMXMLStyleNode
if (cssText != null && !cssText.isEmpty() && !cssText.trim().isEmpty())
{
ANTLRStringStream stream = new ANTLRStringStream(cssText);
- stream.name = getSourcePath();
+ stream.name = cssSourcePath != null ? cssSourcePath : getSourcePath();
cssDocument = CSSDocument.parse(stream, problems);
}
else
@@ -114,7 +120,10 @@ class MXMLStyleNode extends MXMLNodeBase implements IMXMLStyleNode
// Doing so makes this compilation unit dependent on that file.
final String sourcePath = resolveSourceAttributePath(builder, attribute, info);
if (sourcePath != null)
+ {
cssText = builder.readExternalFile(attribute, sourcePath);
+ cssSourcePath = sourcePath;
+ }
}
else
{
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.