[Jnode-svn-commits] SF.net SVN: jnode: [2937] branches/jikesRVM

[<kon...@us...>]

Revision: 2937
          http://jnode.svn.sourceforge.net/jnode/?rev=2937&view=rev
Author:   konkubinaten
Date:     2006-12-19 03:42:30 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
Fix the build system. I do not really know why it works now and didn't before, but at least it does :)

Modified Paths:
--------------
    branches/jikesRVM/build.sh
    branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java

Modified: branches/jikesRVM/build.sh
===================================================================
--- branches/jikesRVM/build.sh	2006-12-17 10:27:39 UTC (rev 2936)
+++ branches/jikesRVM/build.sh	2006-12-19 11:42:30 UTC (rev 2937)
@@ -2,7 +2,6 @@
 
 dir=`dirname $0`
 
-for i in `find $dir/core/src/core/ |grep -v .svn | sort -r`; do touch $i ; done
 java -Xmx1450M -jar $dir/core/lib/ant-launcher.jar -lib $JAVA_HOME/lib -lib $dir/core/lib -f $dir/all/build.xml $*
 
 

Modified: branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java	2006-12-17 10:27:39 UTC (rev 2936)
+++ branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java	2006-12-19 11:42:30 UTC (rev 2937)
@@ -565,14 +565,29 @@
             // Twice, this is intended!
             emitObjects(os, arch, blockedObjects, false);
 
-            // Emit the statics table
+            /* Emit the statics table
             log("Emit statics", Project.MSG_VERBOSE);
             blockedObjects.remove(clsMgr.getSharedStatics());
             blockedObjects.remove(clsMgr.getIsolatedStatics());
             emitObjects(os, arch, blockedObjects, true);
             // Twice, this is intended!
             emitObjects(os, arch, blockedObjects, true);
+            */
 
+            log("Emit shared statics", Project.MSG_VERBOSE);
+            blockedObjects.remove(clsMgr.getSharedStatics());
+            emitObjects(os, arch, blockedObjects, true);
+            // Twice, this is intended!
+            emitObjects(os, arch, blockedObjects, true);
+
+            log("Emit isolated statics", Project.MSG_VERBOSE);
+            blockedObjects.remove(clsMgr.getIsolatedStatics());
+            emitObjects(os, arch, blockedObjects, true);
+            // Twice, this is intended!
+            emitObjects(os, arch, blockedObjects, true);
+
+
+
             // Emit the remaining objects
             log("Emit rest; blocked=" + blockedObjects, Project.MSG_VERBOSE);
             emitObjects(os, arch, null, true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.