[royale-compiler] branch release_practice updated: try to get same class order across platforms in SWCs

[aharui]

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


The following commit(s) were added to refs/heads/release_practice by this push:
     new 9bf2906  try to get same class order across platforms in SWCs
9bf2906 is described below

commit 9bf2906f581144644e9710d649eb4919ae88c424
Author: Alex Harui <aha...@apache.org>
AuthorDate: Wed May 1 12:22:18 2019 -0700

    try to get same class order across platforms in SWCs
---
 .../royale/compiler/internal/targets/SWCTarget.java       |  6 +++++-
 .../apache/royale/compiler/internal/targets/Target.java   | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git 
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
 
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
index 812dcbc..693631a 100644
--- 
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
+++ 
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
@@ -694,7 +694,11 @@ public class SWCTarget extends Target implements ISWCTarget
         rootCompilationUnits.addAll(getIncludesCompilationUnits());
         rootCompilationUnits.addAll(getIncludeLibrariesCompilationUnits());
         
-        return new Target.RootedCompilationUnits(rootCompilationUnits, 
problems);
+        Target.RootedCompilationUnits units = new 
Target.RootedCompilationUnits(rootCompilationUnits, problems);
+        Set<ICompilationUnit> unitSet = units.getUnits();
+        for (ICompilationUnit cu : unitSet)
+               System.out.println(cu.getName());
+        return units;
     }
     
     @Override
diff --git 
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/Target.java
 
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/Target.java
index cc16eb7..c1c36e0 100644
--- 
a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/Target.java
+++ 
b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/Target.java
@@ -26,9 +26,12 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import org.apache.royale.compiler.definitions.IDefinition;
 import 
org.apache.royale.compiler.definitions.references.IResolvedQualifiersReference;
@@ -766,11 +769,19 @@ public abstract class Target implements ITarget
         {
             assert units != null;
             assert problems != null;
-            this.units = units;
+            this.units = new TreeSet<ICompilationUnit>(new 
Comparator<ICompilationUnit>()
+            {
+                @Override
+                public int compare(ICompilationUnit o1, ICompilationUnit o2)
+                {
+                    return o1.getName().compareTo(o2.getName());
+                }
+            });
+            this.units.addAll(units);
             this.problems = problems;
         }
         
-        private final Set<ICompilationUnit> units;
+        private final SortedSet<ICompilationUnit> units;
         private final Iterable<ICompilerProblem> problems;
         
         public Set<ICompilationUnit> getUnits()