Merge branch 'master' of github.com:MagLev/maglev

bin/maglev

@@ -178,7 +178,7 @@ initialize() {
   fi
   # grab a virgin repository if no repository exists
   if [ ! -e $GEMSTONE_DATADIR/extent/extent0.ruby.dbf ]; then
-    cp -p $GEMSTONE/bin/extent0.ruby.dbf $GEMSTONE_DATADIR/extent/
+    cp -p $MAGLEV_HOME/bin/extent0.ruby.dbf $GEMSTONE_DATADIR/extent/
     chmod 660 $GEMSTONE_DATADIR/extent/extent0.ruby.dbf
   fi
 }

lib/ruby/1.8/include/ruby.h

@@ -895,40 +895,32 @@ RUBY_DLLSPEC void  rb_rdata_store(VALUE obj, void *p);
 
 #define Data_Get_Struct(obj, type, sval)  sval = (type*)rb_rdata_fetch(obj)
 
-// RUBY_DLLSPEC void rb_gc_mark_locations(VALUE* a, VALUE* b); 
-// RUBY_DLLSPEC void rb_gc_mark(VALUE obj);
-// RUBY_DLLSPEC void rb_gc_mark_maybe(VALUE obj);
-
-/** Mark variable global */
-// RUBY_DLLSPEC void rb_global_variable(VALUE* handle_address);
-
-// RUBY_DLLSPEC void rb_gc_register_address(VALUE* address);
-
-/** Unmark variable as global */
-// RUBY_DLLSPEC void rb_gc_unregister_address(VALUE* address); 
-
 /** Return the global variable. $ optional */
 RUBY_DLLSPEC VALUE rb_gv_get(const char* name);
 
 /** Set named global to given value, returning the value. $ optional. */
 RUBY_DLLSPEC VALUE rb_gv_set(const char* name, VALUE value);
 
-
 #ifndef MAGLEV_LINT
+/** Mark variable global */
+#define rb_global_variable rb_gc_register_address
 static void rb_gc_register_address(VALUE* address) {
     char to_s[17] = {'\0'};
     sprintf(to_s, "%p", address);
     rb_gv_set((const char*)to_s, *address);
 }
 
+/** Unmark variable as global */
 static void rb_gc_unregister_address(VALUE* address) {
     char to_s[17] = {'\0'};
     sprintf(to_s, "%p", address);
     rb_gv_set((const char*)to_s, Qnil);
 }
 
+/** No-op, gc access cannot be provided */
 #define rb_gc_mark(v)
 #define rb_gc_mark_maybe(v)
+// RUBY_DLLSPEC void rb_gc_mark_locations(VALUE* a, VALUE* b);
 #endif
 
 static inline VALUE rb_errinfo()

src/kernel/bootstrap/Globals.rb

@@ -156,12 +156,12 @@
 # RUBY_PLATFORM  is installed in RubyContext>>_initTransient:
 RUBY_VERSION = '1.8.7'
 # Note - the packager modifies the date on any line starting with RUBY_RELEASE_DATE
-RUBY_RELEASE_DATE = '2011-10-25'
+RUBY_RELEASE_DATE = '2011-10-27'
 RUBY_PATCHLEVEL = 249  # TODO: finalize for 1.8.7
 RUBY_DESCRIPTION = 'ruby 1.8.7 (maglev patchlevel 249)'
 RUBY_COPYRIGHT = 'ruby - Copyright (C) 1993-2010 Yukihiro Matsumoto; maglev additions Copyright(C) 2009-2010 GemStone Systems Inc.'
 
-VERSION = '27174'
+VERSION = '27184'
 
 MAGLEV_VERSION = VERSION  # per Trac 901
 

update.sh

@@ -136,12 +136,10 @@ if [  -e "`which rake 2>/dev/null`" ]; then
 
     if [ ! -e bin/extent0.ruby.dbf ]; then
         extent0='gemstone/bin/extent0.dbf'
-        echo "[Info] Building new extent0.ruby.dbf from $extent0"
+        echo "[Info] Building new extent0.ruby.dbf from $extent0 and creating default maglev stone"
         if [ -e $extent0 ]; then
 
             if rake build:maglev ; then
-                echo "[Info] Creating new default 'maglev' repository"
-                rake stone:create[maglev] >/dev/null
                 echo "[Info] Generating the MagLev HTML documentation"
                 rake rdoc >/dev/null 2>&1
             else
@@ -150,6 +148,11 @@ if [  -e "`which rake 2>/dev/null`" ]; then
         else
             echo "[Warning] Can't find ${extent0}: Skip building ruby extent"
         fi
+    else
+        if [ ! -e etc/conf.d/maglev.conf ]; then
+            echo "[Info] Creating new default 'maglev' repository"
+            rake stone:create[maglev] >/dev/null
+        fi
     fi
 else
     echo "[Warning] rake not found!"

version.txt

@@ -1,2 +1,3 @@
-maglev 1.0RC1 (ruby 1.8.7) (2011-10-25 rev 27174)
-GEMSTONE: 3.1.0 Build: gss64_maglev_branch-27174
+maglev 1.0RC1 (ruby 1.8.7) (2011-10-27 rev 1.0RC1-27184-44ee86f)
+GEMSTONE: 3.1.0 Build: gss64_maglev_branch-27184
+Thu Oct 27 16:22:46 2011