(royale-compiler) branch develop updated: compiler-jx: fix path resolution of js-include-script and js-include-css when included in an XML file referenced by the -load-config option

[joshtynjala]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0836b6e72 compiler-jx: fix path resolution of js-include-script and 
js-include-css when included in an XML file referenced by the -load-config 
option
0836b6e72 is described below

commit 0836b6e728ff3b253fd6d44b2e937a4e982ab91a
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Wed Mar 12 09:40:52 2025 -0700

    compiler-jx: fix path resolution of js-include-script and js-include-css 
when included in an XML file referenced by the -load-config option
---
 .../internal/driver/js/goog/JSGoogCompcConfiguration.java    | 10 ++++++----
 .../internal/driver/js/goog/JSGoogConfiguration.java         | 12 ++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
index 8d4883942..231208aa2 100644
--- 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
+++ 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
@@ -558,7 +558,6 @@ public class JSGoogCompcConfiguration extends 
JSConfiguration
     public void setJSIncludeScript(ConfigurationValue cv, List<String> value)
             throws ConfigurationException
     {
-        jsIncludeScript.addAll(value);
         for (String current : value)
         {
             String name = "js/scripts/" + 
Paths.get(current).getFileName().toString();
@@ -566,7 +565,9 @@ public class JSGoogCompcConfiguration extends 
JSConfiguration
             {
                 throw new ConfigurationException.RedundantFile(name, 
cv.getVar(), cv.getSource(), cv.getLine());
             }
-            includeFilesNamePath.put(name, current);
+            String path = resolvePathStrict(current, cv);
+            includeFilesNamePath.put(name, path);
+            jsIncludeScript.add(path);
         }
     }
 
@@ -588,7 +589,6 @@ public class JSGoogCompcConfiguration extends 
JSConfiguration
     public void setJSIncludeCss(ConfigurationValue cv, List<String> value)
             throws ConfigurationException
     {
-        jsIncludeCss.addAll(value);
         for (String current : value)
         {
             String name = "js/css/" + 
Paths.get(current).getFileName().toString();
@@ -596,7 +596,9 @@ public class JSGoogCompcConfiguration extends 
JSConfiguration
             {
                 throw new ConfigurationException.RedundantFile(name, 
cv.getVar(), cv.getSource(), cv.getLine());
             }
-            includeFilesNamePath.put(name, current);
+            String path = resolvePathStrict(current, cv);
+            includeFilesNamePath.put(name, path);
+            jsIncludeCss.add(path);
         }
     }
 
diff --git 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index 2e0cb2289..68ea46004 100644
--- 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -1070,7 +1070,11 @@ public class JSGoogConfiguration extends JSConfiguration
     public void setJSIncludeScript(ConfigurationValue cv, List<String> value)
             throws ConfigurationException
     {
-        jsIncludeScript.addAll(value);
+        for (String current : value)
+        {
+            String path = resolvePathStrict(current, cv);
+            jsIncludeScript.add(path);
+        }
     }
 
     //
@@ -1091,7 +1095,11 @@ public class JSGoogConfiguration extends JSConfiguration
     public void setJSIncludeCss(ConfigurationValue cv, List<String> value)
             throws ConfigurationException
     {
-        jsIncludeCss.addAll(value);
+        for (String current : value)
+        {
+            String path = resolvePathStrict(current, cv);
+            jsIncludeCss.add(path);
+        }
     }
 
 }