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 2020/04/14 07:58:40 UTC
[royale-compiler] branch release/0.9.7 updated: order the APIs to
get reproducible builds
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch release/0.9.7
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/release/0.9.7 by this push:
new 5471b91 order the APIs to get reproducible builds
5471b91 is described below
commit 5471b91db3d42f64a1b8e02cd443d75c3e328632
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Apr 14 00:57:50 2020 -0700
order the APIs to get reproducible builds
---
.../internal/codegen/typedefs/reference/BaseReference.java | 7 ++++++-
.../internal/codegen/typedefs/reference/ClassReference.java | 9 +++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/BaseReference.java b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/BaseReference.java
index 0be229f..22af55f 100644
--- a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/BaseReference.java
+++ b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/BaseReference.java
@@ -34,7 +34,7 @@ import com.google.javascript.rhino.JSTypeExpression;
import com.google.javascript.rhino.Node;
import com.google.javascript.rhino.jstype.JSType.Nullability;
-public abstract class BaseReference
+public abstract class BaseReference implements Comparable< BaseReference >
{
private String qualifiedName;
@@ -329,4 +329,9 @@ public abstract class BaseReference
public TrueConstant isTrueConstant() {
return null;
}
+
+ @Override
+ public int compareTo(BaseReference o) {
+ return this.getBaseName().compareTo(o.getBaseName());
+ }
}
diff --git a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ClassReference.java b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ClassReference.java
index d32cde3..f22aa83 100644
--- a/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ClassReference.java
+++ b/compiler-externc/src/main/java/org/apache/royale/compiler/internal/codegen/typedefs/reference/ClassReference.java
@@ -96,6 +96,7 @@ public class ClassReference extends BaseReference
if (!isInterface())
allMethods.addAll(staticFields.values());
allMethods.addAll(instanceFields.values());
+ Collections.sort(allMethods);
return allMethods;
}
@@ -105,6 +106,7 @@ public class ClassReference extends BaseReference
if (!isInterface())
allMethods.addAll(staticMethods.values());
allMethods.addAll(instanceMethods.values());
+ Collections.sort(allMethods);
return allMethods;
}
@@ -494,7 +496,7 @@ public class ClassReference extends BaseReference
if (classReference != null)
result.add(classReference);
}
-
+ Collections.sort(result);
return result;
}
@@ -508,6 +510,7 @@ public class ClassReference extends BaseReference
if (reference != null)
result.add(reference);
}
+ Collections.sort(result);
return result;
}
@@ -521,6 +524,7 @@ public class ClassReference extends BaseReference
if (reference != null)
result.add(reference);
}
+ Collections.sort(result);
return result;
}
@@ -549,6 +553,7 @@ public class ClassReference extends BaseReference
getModel().problems.add(problem);
}
}
+ Collections.sort(result);
return result;
}
@@ -563,7 +568,7 @@ public class ClassReference extends BaseReference
result.addAll(superClass.getInterfaces());
superClass = superClass.getSuperClass();
}
-
+ Collections.sort(result);
return result;
}