Notable in this new release is a native binary launcher. Other
improvements are mentioned at:
http://www.jruby.org/2011/07/07/jruby-1-6-3
The native launcher means that you can use jruby in shebang lines, and
that the package no longer RUN_DEPENDS on bash. The launcher also
integrates the nailgun support, so a ng binary is no longer provided
separately.
This requires significant changes to the Makefile, as instead of having
to patch a bash script to add an environment variable, I need to unpack
a .gem file, patch a C file, and rebuild the .gem file.
If someone could take a look at the C patch to set the JAVA_HOME
environment variable and let me know if it's OK, I'd appreciate it.
Without the patch, if the JAVA_HOME environment variable is not set,
the process segfaults.
Tested on amd64 and i386, the only arches it builds on. Looking for
OKs.
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 2 Jun 2011 00:11:50 -0000 1.21
+++ Makefile 12 Jul 2011 05:29:21 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = pure-Java implementation of the Ruby language
-V = 1.6.2
+V = 1.6.3
DISTNAME = jruby-src-${V}
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
@@ -32,9 +32,9 @@ USE_GMAKE = Yes
WANTLIB = c m stdc++
BUILD_DEPENDS = devel/apache-ant \
+ shells/bash \
${RUN_DEPENDS}
-RUN_DEPENDS = java/javaPathHelper \
- shells/bash
+RUN_DEPENDS = java/javaPathHelper
MAKE_ENV = JAVA_HOME=${JAVA_HOME} ANT_OPTS="-Xms384m -Xmx384m" \
MAKE=${MAKE_PROGRAM}
@@ -47,14 +47,25 @@ JFFI_HOME = ${WRKDIST}/jffi
JFFI_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}-OpenBSD
FFI_ARCH = ${JFFI_ARCH:L}
RAKE_V = 0.8.7
-SUBST_VARS = JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V
+JRUBY_LAUNCHER_V = 1.0.7
+SUBST_VARS = JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V JRUBY_LAUNCHER_V
post-extract:
mv ${WRKDIR}/wmeissner-jffi-e0d10e9 ${JFFI_HOME}
+ cp
${WRKSRC}/build_lib/jruby-launcher-${JRUBY_LAUNCHER_V}-java{,-orig}.gem
+ cd ${WRKSRC} && mkdir jruby-launcher && tar xf \
+ build_lib/jruby-launcher-${JRUBY_LAUNCHER_V}-java.gem \
+ && cd jruby-launcher && tar zxf ../data.tar.gz
pre-configure:
# SUBST_CMD causes problems because $\( -> $(
- perl -pi -e 's,\$$\{LOCALBASE\},'${LOCALBASE}','
${WRKSRC}/lib/ruby/site_ruby/shared/mkmf.rb
+ cd ${WRKSRC}/jruby-launcher && find . -type f \! -name '*.orig' -print
| \
+ pax -wz -s '/^\.\///' -f ../data.tar.gz
+ cd ${WRKSRC} && tar cf \
+ build_lib/jruby-launcher-${JRUBY_LAUNCHER_V}-java.gem \
+ data.tar.gz metadata.gz
+ perl -pi -e 's,\$$\{LOCALBASE\},'${LOCALBASE}',' \
+ ${WRKSRC}/lib/ruby/site_ruby/shared/mkmf.rb
rm ${WRKSRC}/lib/ruby/site_ruby/shared/mkmf.rb.orig
do-build:
@@ -65,9 +76,6 @@ do-build:
${SETENV} ${MAKE_ENV} \
PATH=$$PATH:/usr/local/jdk-1.7.0/bin \
${MAKE_PROGRAM}
- cd ${WRKSRC}/tool/nailgun && \
- ${SETENV} ${CONFIGURE_ENV} ./configure && \
- ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
cd ${WRKSRC} && ${ANT_CMD} jar-complete
post-build:
@@ -91,13 +99,10 @@ do-install:
cd ${WRKBUILD} && tar -cf - share | \
tar -C ${JRUBY_HOME} -xf -
${SET_ENV} ${MAKE_ENV} PATH=${JRUBY_HOME}/bin:$$PATH HOME=${WRKBUILD} \
- make=${LOCALBASE}/bin/gmake \
- ${PREFIX}/jruby/bin/jruby ${PREFIX}/jruby/bin/gem install \
- --local --no-rdoc --no-ri ${WRKBUILD}/build_lib/rake*.gem
- ${INSTALL_DATA_DIR} ${JRUBY_HOME}/tool/nailgun
- ${INSTALL_PROGRAM} ${WRKSRC}/tool/nailgun/ng ${JRUBY_HOME}/tool/nailgun
- chown -R ${SHAREOWN}:${SHAREGRP} ${JRUBY_HOME}/lib ${JRUBY_HOME}/share \
- ${JRUBY_HOME}/tool
+ make=${LOCALBASE}/bin/gmake ${PREFIX}/jruby/bin/jruby \
+ ${PREFIX}/jruby/bin/gem install --local --no-rdoc --no-ri \
+ ${WRKBUILD}/build_lib/{rake*,jruby-launcher*-java}.gem
+ chown -R ${SHAREOWN}:${SHAREGRP} ${JRUBY_HOME}/lib ${JRUBY_HOME}/share
do-regress:
cd ${WRKSRC} && ${ANT_CMD} test
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 2 Jun 2011 00:11:50 -0000 1.10
+++ distinfo 7 Jul 2011 22:15:12 -0000
@@ -1,10 +1,10 @@
-MD5 (jruby-src-1.6.2.tar.gz) = kG9m3NdEvyTEPCs84MaNwg==
+MD5 (jruby-src-1.6.3.tar.gz) = D8XUM6SFN166YZLy7nikVw==
MD5 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = mOyRmYChedDeeXyUmTVBog==
-RMD160 (jruby-src-1.6.2.tar.gz) = pdU9q3Gq1MtH7dl+Qu2cap59AFI=
+RMD160 (jruby-src-1.6.3.tar.gz) = oK9wr3U251tllzhkAwNP0pKjGyk=
RMD160 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = lTBayILxwHuGltkNqDMvfjn0+kM=
-SHA1 (jruby-src-1.6.2.tar.gz) = mKBcnu9EtPOfd/TeHW8v+R67WcM=
+SHA1 (jruby-src-1.6.3.tar.gz) = iXRczi03yI4BmcQ3/g/EHKjpuy8=
SHA1 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = ocUg1SbvOliOtPrMEBIY0sOEK90=
-SHA256 (jruby-src-1.6.2.tar.gz) = lC9YzMpKJitJjcnVeWLR6A0NyYg6AbWLUTtLvaTMYws=
+SHA256 (jruby-src-1.6.3.tar.gz) = lVhDo23FkmYS8HyScQ8v5x0eLqU/WTPh7fQPKkGpJkE=
SHA256 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) =
ybtb8CunJ/jql9zzBZnz2eYWXc08etMsiuWso0nas1c=
-SIZE (jruby-src-1.6.2.tar.gz) = 13937224
+SIZE (jruby-src-1.6.3.tar.gz) = 13928177
SIZE (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = 1728176
Index: patches/patch-bin_jruby_bash
===================================================================
RCS file: /cvs/ports/lang/jruby/patches/patch-bin_jruby_bash,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bin_jruby_bash
--- patches/patch-bin_jruby_bash 18 Mar 2011 23:01:22 -0000 1.1
+++ patches/patch-bin_jruby_bash 12 Jul 2011 04:43:42 -0000
@@ -1,17 +1,9 @@
$OpenBSD: patch-bin_jruby_bash,v 1.1 2011/03/18 23:01:22 jeremy Exp $
---- bin/jruby.bash.orig Tue Feb 8 11:26:58 2011
-+++ bin/jruby.bash Tue Feb 8 11:28:11 2011
+--- bin/jruby.bash.orig Thu Jul 7 11:19:33 2011
++++ bin/jruby.bash Mon Jul 11 21:32:16 2011
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${TRUEPREFIX}/bin/bash
#
-----------------------------------------------------------------------------
# jruby.bash - Start Script for the JRuby interpreter
#
-@@ -20,6 +20,7 @@ case "`uname`" in
- esac
-
- # ----- Verify and Set Required Environment Variables
-------------------------
-+JAVA_HOME=$(javaPathHelper -h jruby)
- JAVA_VM=-client
-
- ## resolve links - $0 may be a link to home
Index: patches/patch-build_xml
===================================================================
RCS file: patches/patch-build_xml
diff -N patches/patch-build_xml
--- patches/patch-build_xml 18 Mar 2011 23:01:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-build_xml,v 1.1 2011/03/18 23:01:22 jeremy Exp $
---- build.xml.orig Fri Mar 18 12:24:56 2011
-+++ build.xml Fri Mar 18 12:25:15 2011
-@@ -192,8 +192,8 @@
- <attribute name="tzdata-version" default="${tzdata.distributed.version}"/>
- <sequential>
- <echo message="Updating constants with tzdata version
@{tzdata-version}"/>
-- <exec osfamily="unix" executable="git"
outputproperty="jruby.revision" failonerror="false"
failifexecutionfails="false">
-- <arg line="log -1 --format=format:%h"/>
-+ <exec osfamily="unix" executable="echo"
outputproperty="jruby.revision" failonerror="false"
failifexecutionfails="false">
-+ <arg line="-n"/>
- </exec>
- <exec osfamily="windows" executable="cmd"
outputproperty="jruby.revision" failonerror="false"
failifexecutionfails="false">
- <arg line="/c git log -1 --format=format:%h"/>
Index: patches/patch-jruby-launcher_unixlauncher_cpp
===================================================================
RCS file: patches/patch-jruby-launcher_unixlauncher_cpp
diff -N patches/patch-jruby-launcher_unixlauncher_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-jruby-launcher_unixlauncher_cpp 12 Jul 2011 05:54:48
-0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- jruby-launcher/unixlauncher.cpp.orig Wed Dec 31 16:00:00 1969
++++ jruby-launcher/unixlauncher.cpp Mon Jul 11 22:54:17 2011
+@@ -20,6 +20,8 @@ UnixLauncher::~UnixLauncher() {
+ }
+
+ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
++ FILE * java_home_pipe;
++ char java_home_path[256];
+ platformDir = argv[0];
+ if (!initPlatformDir() || !parseArgs(argc - 1, argv + 1)) {
+ return 255;
+@@ -38,6 +40,15 @@ int UnixLauncher::run(int argc, char* argv[], char* en
+
+ string java("");
+
++ if(java_home_pipe = popen("javaPathHelper -h jruby", "r")) {
++ size_t bytes_read;
++ bytes_read = fread(java_home_path, 1, 255, java_home_pipe);
++ if (bytes_read > 0) {
++ java_home_path[bytes_read-1] = '\0';
++ setenv("JAVA_HOME", java_home_path, 1);
++ }
++ pclose(java_home_pipe);
++ }
+ if (getenv("JAVACMD") != NULL) {
+ java = getenv("JAVACMD");
+ } else {
Index: patches/patch-lib_ruby_site_ruby_shared_ffi_library_rb
===================================================================
RCS file:
/cvs/ports/lang/jruby/patches/patch-lib_ruby_site_ruby_shared_ffi_library_rb,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_ruby_site_ruby_shared_ffi_library_rb
--- patches/patch-lib_ruby_site_ruby_shared_ffi_library_rb 7 Nov 2010
16:37:42 -0000 1.1
+++ patches/patch-lib_ruby_site_ruby_shared_ffi_library_rb 12 Jul 2011
04:43:42 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_ruby_site_ruby_shared_ffi_library_rb,v 1.1 2010/11/07
16:37:42 jeremy Exp $
---- lib/ruby/site_ruby/shared/ffi/library.rb.orig Sat Nov 6 12:37:39 2010
-+++ lib/ruby/site_ruby/shared/ffi/library.rb Sat Nov 6 12:41:53 2010
-@@ -7,6 +7,7 @@ module FFI
+--- lib/ruby/site_ruby/shared/ffi/library.rb.orig Thu Jul 7 11:19:34 2011
++++ lib/ruby/site_ruby/shared/ffi/library.rb Mon Jul 11 21:32:16 2011
+@@ -61,6 +61,7 @@ module FFI
def ffi_lib(*names)
lib_flags = defined?(@ffi_lib_flags) ? @ffi_lib_flags :
FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_LOCAL
@@ -9,7 +9,7 @@ $OpenBSD: patch-lib_ruby_site_ruby_share
ffi_libs = names.map do |name|
if name == FFI::CURRENT_PROCESS
FFI::DynamicLibrary.open(nil, FFI::DynamicLibrary::RTLD_LAZY |
FFI::DynamicLibrary::RTLD_LOCAL)
-@@ -32,7 +33,7 @@ module FFI
+@@ -86,7 +87,7 @@ module FFI
lib
end
end
Index: patches/patch-lib_ruby_site_ruby_shared_mkmf_rb
===================================================================
RCS file:
/cvs/ports/lang/jruby/patches/patch-lib_ruby_site_ruby_shared_mkmf_rb,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_ruby_site_ruby_shared_mkmf_rb
--- patches/patch-lib_ruby_site_ruby_shared_mkmf_rb 18 Mar 2011 23:01:22
-0000 1.1
+++ patches/patch-lib_ruby_site_ruby_shared_mkmf_rb 12 Jul 2011 04:43:42
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_ruby_site_ruby_shared_mkmf_rb,v 1.1 2011/03/18 23:01:22
jeremy Exp $
---- lib/ruby/site_ruby/shared/mkmf.rb.orig Fri Mar 18 14:26:30 2011
-+++ lib/ruby/site_ruby/shared/mkmf.rb Fri Mar 18 14:29:23 2011
-@@ -1362,11 +1362,11 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
+--- lib/ruby/site_ruby/shared/mkmf.rb.orig Thu Jul 7 11:19:34 2011
++++ lib/ruby/site_ruby/shared/mkmf.rb Mon Jul 11 21:32:16 2011
+@@ -1372,11 +1372,11 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
RUBY_EXTCONF_H = #{$extconf_h}
CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
Index: patches/patch-tool_nailgun_Makefile_in
===================================================================
RCS file: patches/patch-tool_nailgun_Makefile_in
diff -N patches/patch-tool_nailgun_Makefile_in
--- patches/patch-tool_nailgun_Makefile_in 18 Mar 2011 23:01:22 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-tool_nailgun_Makefile_in,v 1.2 2011/03/18 23:01:22 jeremy Exp $
---- tool/nailgun/Makefile.in.orig Tue Feb 8 09:30:25 2011
-+++ tool/nailgun/Makefile.in Tue Feb 8 11:24:22 2011
-@@ -2,7 +2,7 @@ SRC = src/c/ng.c
- CC = @CC@
- WIN32_CC = /usr/local/mingw32/bin/mingw32-gcc
-
--CFLAGS = @CFLAGS@ @LIBS@ -s -O3
-+CFLAGS = @CFLAGS@ @LIBS@ -s
-
- ng: Makefile $(SRC)
- @echo "Building ng client. To build a Windows binary, type 'make
ng.exe'"
-@@ -20,4 +20,4 @@ clean:
- rm -rf ng ng.dSYM config.status config.log Makefile
- # rm ng.exe
-
--Makefile: Makefile.in
-\ No newline at end of file
-+Makefile: Makefile.in
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 2 Jun 2011 00:11:50 -0000 1.9
+++ pkg/PLIST 12 Jul 2011 05:20:42 -0000
@@ -6,7 +6,7 @@ jruby/bin/gem
jruby/bin/jgem
jruby/bin/jirb
jruby/bin/jirb_swing
-jruby/bin/jruby
+@bin jruby/bin/jruby
jruby/bin/jrubyc
jruby/bin/rake
jruby/bin/rdoc
@@ -15,9 +15,6 @@ jruby/bin/testrb
jruby/lib/
jruby/lib/jruby-complete.jar
jruby/lib/native/
-jruby/lib/native/${JFFI_ARCH}/
-jruby/lib/native/${JFFI_ARCH}/libjffi-1.0.so
-jruby/lib/native/${JFFI_ARCH}/libjruby-cext.so
jruby/lib/native/include/
jruby/lib/native/include/config.h
jruby/lib/native/include/ruby/
@@ -34,6 +31,9 @@ jruby/lib/native/include/ruby/rubysig.h
jruby/lib/native/include/ruby/st.h
jruby/lib/native/include/ruby/st_sizes.h
jruby/lib/native/include/ruby/version.h
+jruby/lib/native/${JFFI_ARCH}/
+jruby/lib/native/${JFFI_ARCH}/libjffi-1.0.so
+jruby/lib/native/${JFFI_ARCH}/libjruby-cext.so
jruby/lib/ruby/
jruby/lib/ruby/1.8/
jruby/lib/ruby/1.8/.document
@@ -1252,9 +1252,68 @@ jruby/lib/ruby/1.9/yaml/syck.rb
jruby/lib/ruby/gems/
jruby/lib/ruby/gems/1.8/
jruby/lib/ruby/gems/1.8/cache/
+jruby/lib/ruby/gems/1.8/cache/jruby-launcher-${JRUBY_LAUNCHER_V}-java.gem
jruby/lib/ruby/gems/1.8/cache/rake-${RAKE_V}.gem
jruby/lib/ruby/gems/1.8/doc/
jruby/lib/ruby/gems/1.8/gems/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/.dep.inc
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/COPYING
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/Makefile
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/README.txt
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/Rakefile
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/argnames.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/argparser.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/argparser.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/argparser.o
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/argparser.o.d
+@bin
jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/jruby-launcher
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/jrubyexe.o
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/jrubyexe.o.d
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/ng.o
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/ng.o.d
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/strlcpy.o
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/strlcpy.o.d
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/unixlauncher.o
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/unixlauncher.o.d
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/utilsfuncs.o
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/build/unix/OpenBSD/utilsfuncs.o.d
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/extconf.rb
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/inc/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/inc/Makefile-conf.mk
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/inc/Makefile-impl.mk
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/inc/Makefile-rules.mk
+@bin jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/jruby
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/jruby.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/jrubyexe.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/jvmlauncher.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/jvmlauncher.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/lib/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/lib/jruby-launcher.rb
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/lib/rubygems/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/lib/rubygems/defaults/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/lib/rubygems/defaults/jruby_native.rb
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/nbexecloader.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/ng.c
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/platformlauncher.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/platformlauncher.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/rb_w32_cmdvector.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/resources/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/resources/jruby.ico
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/resources/jruby.rc
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/spec/
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/spec/launcher_spec.rb
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/spec/spec_helper.rb
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/strlcpy.c
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/unixlauncher.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/unixlauncher.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/utilsfuncs.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/utilsfuncs.h
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/utilsfuncswin.cpp
+jruby/lib/ruby/gems/1.8/gems/jruby-launcher-${JRUBY_LAUNCHER_V}-java/version.h
jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/
jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/CHANGES
jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/MIT-LICENSE
@@ -1391,6 +1450,7 @@ jruby/lib/ruby/gems/1.8/gems/sources-0.0
jruby/lib/ruby/gems/1.8/gems/sources-0.0.1/lib/
jruby/lib/ruby/gems/1.8/gems/sources-0.0.1/lib/sources.rb
jruby/lib/ruby/gems/1.8/specifications/
+jruby/lib/ruby/gems/1.8/specifications/jruby-launcher-${JRUBY_LAUNCHER_V}-java.gemspec
jruby/lib/ruby/gems/1.8/specifications/rake-${RAKE_V}.gemspec
jruby/lib/ruby/gems/1.8/specifications/sources-0.0.1.gemspec
jruby/lib/ruby/site_ruby/
@@ -1438,6 +1498,7 @@ jruby/lib/ruby/site_ruby/1.8/rubygems/cu
jruby/lib/ruby/site_ruby/1.8/rubygems/defaults/
jruby/lib/ruby/site_ruby/1.8/rubygems/defaults.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb
+jruby/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby_native.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/dependency.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/dependency_installer.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/dependency_list.rb
@@ -1542,6 +1603,10 @@ jruby/lib/ruby/site_ruby/shared/ffi/plat
jruby/lib/ruby/site_ruby/shared/ffi/platform/errno.rb.ffi
jruby/lib/ruby/site_ruby/shared/ffi/platform/etc.rb.ffi
jruby/lib/ruby/site_ruby/shared/ffi/platform/fcntl.rb.ffi
+jruby/lib/ruby/site_ruby/shared/ffi/platform/socket.rb.ffi
+jruby/lib/ruby/site_ruby/shared/ffi/platform/stat.rb.ffi
+jruby/lib/ruby/site_ruby/shared/ffi/platform/sysconf.rb.ffi
+jruby/lib/ruby/site_ruby/shared/ffi/platform/syslog.rb.ffi
jruby/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/
jruby/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/errno.rb
jruby/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/etc.rb
@@ -1553,10 +1618,6 @@ jruby/lib/ruby/site_ruby/shared/ffi/plat
jruby/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/syslog.rb
jruby/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/types.conf
jruby/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/zlib.rb
-jruby/lib/ruby/site_ruby/shared/ffi/platform/socket.rb.ffi
-jruby/lib/ruby/site_ruby/shared/ffi/platform/stat.rb.ffi
-jruby/lib/ruby/site_ruby/shared/ffi/platform/sysconf.rb.ffi
-jruby/lib/ruby/site_ruby/shared/ffi/platform/syslog.rb.ffi
jruby/lib/ruby/site_ruby/shared/ffi/platform/zlib.rb.ffi
jruby/lib/ruby/site_ruby/shared/ffi/pointer.rb
jruby/lib/ruby/site_ruby/shared/ffi/rbx.rb
@@ -12087,6 +12148,3 @@ jruby/share/ri/1.8/system/created.rid
jruby/share/ri/1.8/system/fatal/
jruby/share/ri/1.8/system/fatal/cdesc-fatal.yaml
jruby/share/ri_cache.bin.gz
-jruby/tool/
-jruby/tool/nailgun/
-@bin jruby/tool/nailgun/ng
