changeset 9169:f0fc8329bf98

ensure that the generated build-graal.xml is stable
author Doug Simon <doug.simon@oracle.com>
date Tue, 16 Apr 2013 22:55:31 +0200
parents 50161aa21af2
children 1d584a42941f
files make/build-graal.xml mx/commands.py
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/build-graal.xml	Tue Apr 16 22:46:02 2013 +0200
+++ b/make/build-graal.xml	Tue Apr 16 22:55:31 2013 +0200
@@ -75,14 +75,14 @@
   <target depends="compile" name="jar">
     <mkdir dir="${jar.dir}"/>
     <jar basedir="${classes.dir}" destfile="${jar.file}">
+      <service type="com.oracle.graal.nodes.spi.ReplacementsProvider">
+        <provider classname="com.oracle.graal.hotspot.replacements.CallSiteSubstitutions"/>
+        <provider classname="com.oracle.graal.hotspot.replacements.HotSpotInstalledCodeIntrinsics"/>
+        <provider classname="com.oracle.graal.replacements.GraalMethodSubstitutions"/>
+      </service>
       <service type="com.oracle.graal.phases.tiers.CompilerConfiguration">
         <provider classname="com.oracle.graal.compiler.phases.BasicConfiguration"/>
       </service>
-      <service type="com.oracle.graal.nodes.spi.ReplacementsProvider">
-        <provider classname="com.oracle.graal.hotspot.replacements.HotSpotInstalledCodeIntrinsics"/>
-        <provider classname="com.oracle.graal.hotspot.replacements.CallSiteSubstitutions"/>
-        <provider classname="com.oracle.graal.replacements.GraalMethodSubstitutions"/>
-      </service>
     </jar>
   </target>
   <target name="cleanclasses">
--- a/mx/commands.py	Tue Apr 16 22:46:02 2013 +0200
+++ b/mx/commands.py	Tue Apr 16 22:55:31 2013 +0200
@@ -500,9 +500,9 @@
     out.element('mkdir', {'dir' : '${jar.dir}'})
     out.open('jar', {'destfile' : '${jar.file}', 'basedir' : '${classes.dir}'})
 
-    for service, providers in serviceMap.iteritems():
+    for service in sorted(serviceMap.iterkeys()):
         out.open('service', {'type' : service})
-        for provider in providers:
+        for provider in sorted(serviceMap[service]):
             out.element('provider', {'classname' : provider})
         out.close('service')