Merge branch 'master' into codecache

iconara · Dec 17, 2009 · 79ce626 · 79ce626
2 parents 7fee4a2 + ef6c935
commit 79ce626
Show file tree

Hide file tree

Showing 88 changed files with 1,509 additions and 413 deletions.
diff --git a/bin/ast b/bin/ast
@@ -59,7 +59,7 @@ end
 if ARGV.length > 1
   puts "You may only specify one script (see --help)"
   exit 0
-elsif ARGV == 1
+elsif ARGV.length == 1
   if expression
     puts "-e and a script is not a valid combination (see --help)"
     exit 0

diff --git a/bin/gem.bat b/bin/gem.bat
@@ -3,4 +3,4 @@ IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby" -S "gem" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby" "%~dpn0" %*
+@"%~dp0jruby.exe" "%~dpn0" %*
diff --git a/bin/jirb.bat b/bin/jirb.bat
@@ -3,4 +3,4 @@ IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby" -S "jirb" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby" "%~dpn0" %*
+@"%~dp0jruby.exe" "%~dpn0" %*
diff --git a/bin/jirb_swing.bat b/bin/jirb_swing.bat
@@ -3,4 +3,4 @@ IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby" -S "jirb_swing" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby" "%~dpn0" %*
+@"%~dp0jruby.exe" "%~dpn0" %*
diff --git a/bin/jrubyd.bat b/bin/jrubyd.bat
@@ -1,7 +1,9 @@
 @ECHO OFF
+
 @set debug_args=-J-Xdebug -J-Xrunjdwp:transport=dt_shmem,server=y,suspend=y
+
 IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby.exe" %debug_args% %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby.exe" %debug_args% "%~dpn0" %*
+@"%~dp0jruby.exe" %debug_args% "%~dpn0" %*
diff --git a/bin/rake.bat b/bin/rake.bat
@@ -3,4 +3,4 @@ IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby" -S "rake" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby" "%~dpn0" %*
+@"%~dp0jruby.exe" "%~dpn0" %*
diff --git a/bin/rdoc.bat b/bin/rdoc.bat
@@ -3,4 +3,4 @@ IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby" -S "rdoc" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby" "%~dpn0" %*
+@"%~dp0jruby.exe" "%~dpn0" %*
diff --git a/bin/ri.bat b/bin/ri.bat
@@ -3,4 +3,4 @@ IF NOT "%~f0" == "~f0" GOTO :WinNT
 @"jruby" -S "ri" %1 %2 %3 %4 %5 %6 %7 %8 %9
 GOTO :EOF
 :WinNT
-@"jruby" "%~dpn0" %*
+@"%~dp0jruby.exe" "%~dpn0" %*
diff --git a/build.xml b/build.xml
@@ -147,10 +147,17 @@
             <include name="**/*.properties"/>
         </fileset>
         <filterset>
-            <filter token="os.arch" value="${os.arch}"/>
+            <filter token="version.ruby.major" value="${version.ruby.major}"/>
+            <filter token="version.ruby" value="${version.ruby}"/>
+            <filter token="version.ruby.patchlevel" value="${version.ruby.patchlevel}"/>
+            <filter token="version.ruby1_9.major" value="${version.ruby1_9.major}"/>
+            <filter token="version.ruby1_9" value="${version.ruby1_9}"/>
+            <filter token="version.ruby1_9.patchlevel" value="${version.ruby1_9.patchlevel}"/>
+            <filter token="build.date" value="${build.date}"/>
+            <filter token="version.jruby" value="${version.jruby}"/>
             <filter token="java.specification.version" value="${java.specification.version}"/>
             <filter token="javac.version" value="${javac.version}"/>
-            <filter token="build.date" value="${build.date}"/>
+            <filter token="os.arch" value="${os.arch}"/>
         </filterset>
     </copy>
   </target>
@@ -297,6 +304,7 @@
         <zipfileset src="${build.lib.dir}/jffi-i386-OpenBSD.jar"/>
         <zipfileset src="${build.lib.dir}/jffi-x86_64-OpenBSD.jar"/>
         <zipfileset src="${build.lib.dir}/jffi-i386-Windows.jar"/>
+        <zipfileset src="${build.lib.dir}/jffi-x86_64-Windows.jar"/>
         <zipfileset src="${build.lib.dir}/jffi-s390x-Linux.jar"/>
         <zipfileset src="${build.lib.dir}/joda-time-1.6.jar"/>
         <zipfileset src="${build.lib.dir}/dynalang-0.3.jar"/>
@@ -443,6 +451,7 @@
       <jarjar destfile="${dest.lib.dir}/${filename}">
         <fileset dir="${jruby.classes.dir}"/>
         <fileset dir="${build.dir}/jar-complete">
+          <exclude name="META-INF/jruby.home/lib/ruby/site_ruby/shared/builtin/**"/>
           <exclude name="META-INF/jruby.home/lib/ruby/1.9/**"/>
         </fileset>
         <zipfileset src="${build.lib.dir}/asm-3.2.jar"/>
@@ -990,12 +999,12 @@
         <sysproperty key="jruby.thread.pool.enabled" value="@{thread.pooling}"/>
         <sysproperty key="jruby.reflection" value="@{reflection}"/>
         <sysproperty key="jruby.launch.inproc" value="@{inproc}"/>
-	<sysproperty key="emma.coverage.out.file" value="${test.results.dir}/coverage.emma" />
+        <sysproperty key="emma.coverage.out.file" value="${test.results.dir}/coverage.emma" />
-	<sysproperty key="emma.coverage.out.merge" value="true" />
+        <sysproperty key="emma.coverage.out.merge" value="true" />
         <sysproperty key="emma.verbosity.level" value="silent" />
 
         <arg line="@{jruby.args}"/>
-        <arg value="${base.dir}/bin/rake"/>
+        <arg line="-S rake"/>
         <arg line="@{rake.targets}"/>
       </java>
     </sequential>

diff --git a/build_lib/jffi-x86_64-Windows.jar b/build_lib/jffi-x86_64-Windows.jar
diff --git a/build_lib/jnr-posix.jar b/build_lib/jnr-posix.jar
diff --git a/default.build.properties b/default.build.properties
@@ -33,7 +33,11 @@ jruby.test.memory=512M
 jruby.test.jvm=java
 ruby.executable=/usr/bin/ruby
 install4j.executable=/Applications/install4j\ 4/bin/install4jc
-version.jruby=1.5.0.dev
+version.ruby=1.8.7
 version.ruby.major=1.8
 version.ruby.minor=7
-
+version.ruby.patchlevel=174
+version.ruby1_9.major=1.9
+version.ruby1_9=1.9.2dev
+version.ruby1_9.patchlevel=24787
+version.jruby=1.5.0.dev
diff --git a/lib/ruby/1.8/Win32API.rb b/lib/ruby/1.8/Win32API.rb
@@ -22,7 +22,7 @@ def self.find_type(name)
 
   def self.map_types(spec)
     if spec.kind_of?(String)
-      spec.split //
+      spec.split(//)
     elsif spec.kind_of?(Array)
       spec
     else

diff --git a/lib/ruby/site_ruby/shared/builtin/javasupport.rb b/lib/ruby/site_ruby/shared/builtin/javasupport.rb
@@ -35,7 +35,6 @@
 
 require 'builtin/javasupport/java'
 require 'builtin/javasupport/proxy/array'
-require 'builtin/javasupport/proxy/interface'
 require 'builtin/javasupport/utilities/base'
 require 'builtin/javasupport/utilities/array'
 require 'builtin/javasupport/core_ext'

diff --git a/lib/ruby/site_ruby/shared/builtin/javasupport/proxy/interface.rb b/lib/ruby/site_ruby/shared/builtin/javasupport/proxy/interface.rb
diff --git a/lib/ruby/site_ruby/shared/ffi/library.rb b/lib/ruby/site_ruby/shared/ffi/library.rb
@@ -136,10 +136,12 @@ def callback(*args)
       else
         [ nil, args[0], args[1] ]
       end
+
       options = Hash.new
       options[:convention] = defined?(@ffi_convention) ? @ffi_convention : :default
       options[:enums] = @ffi_enums if defined?(@ffi_enums)
-      cb = FFI::CallbackInfo.new(find_type(ret), params.map { |e| find_type(e) })
+
+      cb = FFI::CallbackInfo.new(find_type(ret), params.map { |e| find_type(e) }, options)
 
       # Add to the symbol -> type map (unless there was no name)
       unless name.nil?

diff --git a/lib/ruby/site_ruby/shared/ffi/times.rb b/lib/ruby/site_ruby/shared/ffi/times.rb
@@ -6,6 +6,7 @@ class Foreign
     SC_CLK_TCK = com.kenai.constantine.platform.Sysconf::_SC_CLK_TCK.value
 
     extend FFI::Library
+    ffi_lib FFI::Library::LIBC
     class Times < FFI::Struct
       layout \
         :utime => :long, 

diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.jruby.ext.posix</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.8</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.jruby.ext.posix</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.8</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <version>1.5.0dev</version>
   <name>JRuby Shared</name>
   <url>http://www.jruby.org/</url>
-  <description>A 1.8.5 compatible Ruby interpreter written in 100% pure Java</description>
+  <description>A 1.8.7 compatible Ruby interpreter written in 100% pure Java</description>
 
   <issueManagement>
     <system>JIRA</system>

diff --git a/rubyspecs.revision b/rubyspecs.revision
@@ -1,6 +1,6 @@
 # These are the pointers to the 'stable/frozen' versions of
 # mspec and rubyspecs, used to for our CI runs.
 
-mspec.revision=bcec47c70e0678a29fd0c1345358c4daf7b971a3
+mspec.revision=1521f846a8e9c6da51697e962c39dc1f3c0fc473
 
-rubyspecs.revision=9b8d16adaa79a5b627f76b968d2e730b1ae3476f
+rubyspecs.revision=515547fc2e2024d3730fe6af925f37781e6cbd0e
diff --git a/spec/java_integration/types/coercion_spec.rb b/spec/java_integration/types/coercion_spec.rb
@@ -424,11 +424,9 @@ def receiveByte(obj)
     vri.result.should == obj
     vri.result.class.should == Fixnum
 
-    pending "char appears to be getting signed/unsigned-garbled" do
+    vri_handler.receiveCharObj(obj).should == obj
-      vri_handler.receiveCharObj(obj).should == obj
+    vri.result.should == obj
-      vri.result.should == obj
+    vri.result.class.should == Fixnum
-      vri.result.class.should == Fixnum
-    end
 
     vri_handler.receiveIntObj(obj).should == obj
     vri.result.should == obj

diff --git a/spec/jruby.1.8.mspec b/spec/jruby.1.8.mspec
@@ -19,12 +19,6 @@ class MSpecScript
   set :core, [
     SPEC_DIR + '/core',
 
-    # FIXME: Temporarily exclusion until JRUBY-4180 is fixed.
-    '^' + SPEC_DIR + '/core/proc/case_compare_spec.rb',
-    '^' + SPEC_DIR + '/core/proc/element_reference_spec.rb',
-    '^' + SPEC_DIR + '/core/proc/yield_spec.rb',
-    '^' + SPEC_DIR + '/core/proc/call_spec.rb',
-
     # 1.9
     '^' + SPEC_DIR + '/core/basicobject'
   ]

diff --git a/spec/tags/1.8/ruby/core/proc/call_tags.txt b/spec/tags/1.8/ruby/core/proc/call_tags.txt
@@ -0,0 +1 @@
+fails(JRUBY-4180):Proc#call can receive block arguments
diff --git a/spec/tags/1.8/ruby/core/proc/element_reference_tags.txt b/spec/tags/1.8/ruby/core/proc/element_reference_tags.txt
@@ -0,0 +1 @@
+fails(JRUBY-4180):Proc#[] can receive block arguments