merged from CVS.

ChangeLog

@@ -1,3 +1,19 @@
+Tue Mar  9 14:16:06 2004  Shugo Maeda <[email protected]>
+
+	* Makefile.in: use $(RUBY) to execute bin2c.
+
+Tue Mar  9 14:08:19 2004  MOROHOSHI Akihiko <[email protected]>
+
+	* eruby_main.c (proc_args): pass ARGV to scripts.
+
+Wed Feb 25 13:37:07 2004  U.Nakamura <[email protected]>
+
+	* autoconf.rb: should use RUBY_PLATFORM instead of PLATFORM.
+
+Wed Dec 24 00:45:29 2003  Shugo Maeda <[email protected]>
+
+	* eruby_main.c (run): call rb_exec_end_proc().
+
 Wed Dec 24 00:11:19 2003  Shugo Maeda <[email protected]>
 
 	* version 1.0.5 released.

Makefile.in

@@ -160,7 +160,7 @@ $(MANPAGE): @[email protected]
 	$(RM) $@~
 
 eruby_logo.c: @VPATH@eruby_logo.png
-	$(srcdir)/bin2c $(srcdir)/eruby_logo.png
+	$(RUBY) $(srcdir)/bin2c $(srcdir)/eruby_logo.png
 eruby_lib.@OBJEXT@: @VPATH@eruby_lib.c @[email protected] config.h
 eruby_logo.@OBJEXT@: @VPATH@eruby_logo.c @VPATH@eruby_logo.h
 eruby_main.@OBJEXT@: @VPATH@eruby_main.c @[email protected] @VPATH@eruby_logo.h

configure.rb

@@ -333,7 +333,7 @@ def AC_PROG_INSTALL
 $LIBRUBY_A = CONFIG["LIBRUBY_A"]
 $RUBY_SO_NAME = CONFIG["RUBY_SO_NAME"]
 
-case PLATFORM
+case RUBY_PLATFORM
 when /-aix/
   if $RUBY_SHARED
     $LIBRUBYARG = "-Wl,$(libdir)/" + CONFIG["LIBRUBY_SO"]
@@ -431,7 +431,7 @@ def AC_PROG_INSTALL
 $ENABLE_SHARED = false
 AC_ENABLE("shared") { |enableval|
   if enableval == "yes"
-    if PLATFORM =~ /-mswin32/
+    if /-mswin32/ =~ RUBY_PLATFORM
       AC_MSG_ERROR("can't enable shared on mswin32")
     end
     $ENABLE_SHARED = true
@@ -449,15 +449,15 @@ def AC_PROG_INSTALL
 if $ENABLE_SHARED
   $LIBERUBY = "${LIBERUBY_SO}"
   $LIBERUBYARG = "-L. -leruby"
-  case PLATFORM
+  case RUBY_PLATFORM
   when /-sunos4/
     $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
   when /-linux/
     $DLDFLAGS = '-Wl,-soname,liberuby.so.$(MAJOR).$(MINOR)'
     $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
   when /-(freebsd|netbsd)/
     $LIBERUBY_SO = "liberuby.so.$(MAJOR).$(MINOR)"
-    if PLATFORM =~ /elf/ || PLATFORM =~ /-freebsd[3-9]/
+    if /elf/ =~ RUBY_PLATFORM || /-freebsd[3-9]/ =~ RUBY_PLATFORM
       $LIBERUBY_SO = "liberuby.so.$(MAJOR_MINOR)"
       $LIBERUBY_ALIASES = "liberuby.so"
     else
@@ -493,7 +493,7 @@ def AC_PROG_INSTALL
   end
 end
 
-if PLATFORM =~ /-mswin32/
+if /-mswin32/ =~ RUBY_PLATFORM
   $AR = "lib"
   $AROPT = "/out:$@"
   $LIBERUBY_A = "liberuby.lib"
@@ -519,7 +519,7 @@ def AC_PROG_INSTALL
 AC_SUBST("AROPT")
 
 $EXT_DLDFLAGS = CONFIG["DLDFLAGS"]
-if $RUBY_SHARED || RUBY_PLATFORM =~ /mswin32/
+if $RUBY_SHARED || /mswin32/ =~ RUBY_PLATFORM
   $EXT_LIBRUBYARG = "$(LIBRUBYARG)"
 else
   $EXT_LIBRUBYARG = ""

configure.rb.in

@@ -35,7 +35,7 @@ $ENABLE_SHARED = false
 AC_ARG_ENABLE("shared",
 	      "  --enable-shared         build a shared library for eruby") { |enableval|
   if enableval == "yes"
-    if PLATFORM =~ /-mswin32/
+    if /-mswin32/ =~ RUBY_PLATFORM
       AC_MSG_ERROR("can't enable shared on mswin32")
     end
     $ENABLE_SHARED = true
@@ -53,15 +53,15 @@ $LIBERUBY_ALIASES = "liberuby.#{CONFIG['DLEXT']}"
 if $ENABLE_SHARED
   $LIBERUBY = "${LIBERUBY_SO}"
   $LIBERUBYARG = "-L. -leruby"
-  case PLATFORM
+  case RUBY_PLATFORM
   when /-sunos4/
     $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
   when /-linux/
     $DLDFLAGS = '-Wl,-soname,liberuby.so.$(MAJOR).$(MINOR)'
     $LIBERUBY_ALIASES = "liberuby.so.$(MAJOR).$(MINOR) liberuby.so"
   when /-(freebsd|netbsd)/
     $LIBERUBY_SO = "liberuby.so.$(MAJOR).$(MINOR)"
-    if PLATFORM =~ /elf/ || PLATFORM =~ /-freebsd[3-9]/
+    if /elf/ =~ RUBY_PLATFORM || /-freebsd[3-9]/ =~ RUBY_PLATFORM
       $LIBERUBY_SO = "liberuby.so.$(MAJOR_MINOR)"
       $LIBERUBY_ALIASES = "liberuby.so"
     else
@@ -97,7 +97,7 @@ EOIF
   end
 end
 
-if PLATFORM =~ /-mswin32/
+if /-mswin32/ =~ RUBY_PLATFORM
   $AR = "lib"
   $AROPT = "/out:$@"
   $LIBERUBY_A = "liberuby.lib"
@@ -123,7 +123,7 @@ AC_SUBST("LIBERUBY_ALIASES")
 AC_SUBST("AROPT")
 
 $EXT_DLDFLAGS = CONFIG["DLDFLAGS"]
-if $RUBY_SHARED || RUBY_PLATFORM =~ /mswin32/
+if $RUBY_SHARED || /mswin32/ =~ RUBY_PLATFORM
   $EXT_LIBRUBYARG = "$(LIBRUBYARG)"
 else
   $EXT_LIBRUBYARG = ""

eruby_main.c

@@ -1,5 +1,5 @@
 /*
- * $Id: eruby_main.c,v 1.37 2003/12/23 15:10:54 shugo Exp $
+ * $Id$
  * Copyright (C) 2000  ZetaBITS, Inc.
  * Copyright (C) 2000  Information-technology Promotion Agency, Japan
  * Copyright (C) 2000  Shugo Maeda <[email protected]>
@@ -540,7 +540,8 @@ static void proc_args(int argc, char **argv)
 	    eruby_filename = "-";
 	}
 	else {
-	    eruby_filename = argv[option_index];
+	    eruby_filename = argv[option_index++];
+            ruby_set_argv(argc - option_index, argv + option_index);
 	}
     }
 }
@@ -570,6 +571,7 @@ static void run()
     if (eruby_mode == MODE_FILTER && (RTEST(ruby_debug) || RTEST(ruby_verbose))) {
 	print_generated_code(stderr, code, 0);
     }
+    rb_exec_end_proc();
 #if RUBY_VERSION_CODE >= 180
     out = RSTRING(rb_stdout)->ptr;
     nout = RSTRING(rb_stdout)->len;