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 2019/05/31 19:35:31 UTC

[royale-compiler] 01/03: try removing paths from SWCs in compilationunit names when using debugfilealias as a clue that we want reproducible binaries

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

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

commit a4421498d7f424df069e83add18171c2993b1e11
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri May 31 12:33:59 2019 -0700

    try removing paths from SWCs in compilationunit names  when using debugfilealias as a clue that we want reproducible binaries
---
 .../compiler/internal/units/SWCCompilationUnit.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/units/SWCCompilationUnit.java b/compiler/src/main/java/org/apache/royale/compiler/internal/units/SWCCompilationUnit.java
index 7a3d1ce..03b66b4 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/units/SWCCompilationUnit.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/units/SWCCompilationUnit.java
@@ -456,7 +456,21 @@ public class SWCCompilationUnit extends CompilationUnitBase
      */
     protected static String getLinkReportName(ICompilationUnit cu)
     {
-        StringBuilder reportBuilder = new StringBuilder(cu.getAbsoluteFilename());
+    	String absoluteFileName = cu.getAbsoluteFilename();
+    	ICompilerProject project = cu.getProject();
+    	if (project instanceof RoyaleProject)
+    	{
+    		String alias = ((RoyaleProject)project).getSwfDebugfileAlias();
+    		if (alias != null)
+    		{
+    			// clip off path to SWC
+    			int slash = absoluteFileName.lastIndexOf("/");
+    			int backslash = absoluteFileName.lastIndexOf("\\");
+    			int lastSep = slash > backslash ? slash : backslash;
+    			absoluteFileName = absoluteFileName.substring(slash + 1);
+    		}
+    	}
+        StringBuilder reportBuilder = new StringBuilder(absoluteFileName);
         reportBuilder.append('(');
         
         ArrayList<String> definitionQnames = new ArrayList<String>(cu.getDefinitionPromises().size());