jruby-launcher 1.1.1-java → 1.1.2-java

data/Makefile

@@ -1,122 +1,122 @@
-# These line gets substituted with the actual Config::CONFIG items location by extconf.rb
-PREFIX = notspecified
-BINDIR = $(PREFIX)/bin
-INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
-INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/rubygems/defaults
-OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults
-
-ifeq (true,$(shell test -x $(BINDIR)/jruby && echo true))
-RAKE=$(BINDIR)/jruby -S rake
-else
-RAKE=rake
-endif
-
-build: .build-post
-
-.build-pre:
-
-.build-post: .build-impl build-exe
-
-build-exe:
-	@if [ "$(findstring mingw, $(CONF))" ]; then											\
-	${MAKE} -f ${SUB_CONFMK} SUBPROJECTS=${SUBPROJECTS} jruby.exe jrubyw.exe;					\
-	if [ -d ../jruby ]; then cp jruby.exe jrubyw.exe jruby.dll ../jruby/bin/; fi;					\
-	if [ -d D:/work/jruby-dev/jruby ]; then cp jruby.exe jrubyw.exe jruby.dll D:/work/jruby-dev/jruby/bin/; fi;	\
-	fi
-
-jruby.res: resources/jruby.rc
-	windres $^ -O coff -o $@
-
-jruby.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
-
-jrubyw.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
-
-install:
-	@if [ ! -f ./jruby ]; then echo "Please run 'make' first."; exit 1; fi
-	@if [ x$(BINDIR) = xnotspecified/bin ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
-	@if [ ! -w $(BINDIR) ]; then echo "'$(BINDIR)' does not exist or cannot write to '$(BINDIR)'."; exit 1; fi
-	@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
-	cp ./jruby $(BINDIR)/jruby
-	@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
-	@if [ ! -w $(INSTALLDIR) ]; then \
-		if [ ! -w $(OLDINSTALLDIR) ]; then \
-			if [ ! -w $(INSTALLDIR9000) ]; then \
-				echo "Neither '$(INSTALLDIR9000)' nor '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
-			else \
-				echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000)"; \
-				cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000); \
-			fi; \
-		else \
-			echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
-			cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
-		fi; \
-	else \
-		echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR)"; \
-		cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR); \
-	fi;
-
-test:
-	$(RAKE)
-
-# Universal binary on OSX
-FAT_ARCHES=i386 ppc x86_64
-
-fat: $(FAT_ARCHES)
-	lipo -create $(foreach arch,$(FAT_ARCHES),build/unix/Darwin-$(arch)/jruby-launcher) -output jruby
-	$(RAKE)
-
-$(FAT_ARCHES):
-	$(MAKE) -f $(SUB_CONFMK) CND_PLATFORM=Darwin-$@ CFLAGS="-arch $@" build/unix/Darwin-$@/jruby-launcher
-
-clean: .clean-post
-
-.clean-pre:
-	-rm -rf build/*
-
-.clean-post: .clean-impl
-	rm -f *.exe *.res
-
-clobber: .clobber-post
-
-.clobber-pre:
-
-.clobber-post: .clobber-impl
-
-all: .all-post
-
-.all-pre:
-
-.all-post: .all-impl
-
-help: .help-post
-
-.help-pre:
-
-.help-post: .help-impl
-
-# Use the manually-maintained inc/*.mk makefiles.
-# Pass NETBEANS=true on the command-line to use NB's generated
-# nbproject/*.mk
-
-ifdef NETBEANS
-SUB_IMPLMK=nbproject/Makefile-impl.mk
-else
-SUB_IMPLMK=inc/Makefile-impl.mk
-SUB_CONFMK=inc/Makefile-rules.mk
-endif
-
-# include project implementation makefile
-include $(SUB_IMPLMK)
-
-# Pick conf based on OS. for mingw64, must manually override for now.
-ifeq ($(OS),Windows_NT)
-CONF=mingw
-else
-CONF=unix
-endif
-
-ifdef NETBEANS
-SUB_CONFMK=nbproject/Makefile-${CONF}.mk
-endif
+# These line gets substituted with the actual Config::CONFIG items location by extconf.rb
+PREFIX = notspecified
+BINDIR = $(PREFIX)/bin
+INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
+INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/rubygems/defaults
+OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults
+
+ifeq (true,$(shell test -x $(BINDIR)/jruby && echo true))
+RAKE=$(BINDIR)/jruby -S rake
+else
+RAKE=rake
+endif
+
+build: .build-post
+
+.build-pre:
+
+.build-post: .build-impl build-exe
+
+build-exe:
+	@if [ "$(findstring mingw, $(CONF))" ]; then											\
+	${MAKE} -f ${SUB_CONFMK} SUBPROJECTS=${SUBPROJECTS} jruby.exe jrubyw.exe;					\
+	if [ -d ../jruby ]; then cp jruby.exe jrubyw.exe jruby.dll ../jruby/bin/; fi;					\
+	if [ -d D:/work/jruby-dev/jruby ]; then cp jruby.exe jrubyw.exe jruby.dll D:/work/jruby-dev/jruby/bin/; fi;	\
+	fi
+
+jruby.res: resources/jruby.rc
+	windres $^ -O coff -o $@
+
+jruby.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
+	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
+
+jrubyw.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
+	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
+
+install:
+	@if [ ! -f ./jruby ]; then echo "Please run 'make' first."; exit 1; fi
+	@if [ x$(BINDIR) = xnotspecified/bin ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
+	@if [ ! -w $(BINDIR) ]; then echo "'$(BINDIR)' does not exist or cannot write to '$(BINDIR)'."; exit 1; fi
+	@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
+	cp ./jruby $(BINDIR)/jruby
+	@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
+	@if [ ! -w $(INSTALLDIR) ]; then \
+		if [ ! -w $(OLDINSTALLDIR) ]; then \
+			if [ ! -w $(INSTALLDIR9000) ]; then \
+				echo "Neither '$(INSTALLDIR9000)' nor '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
+			else \
+				echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000)"; \
+				cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000); \
+			fi; \
+		else \
+			echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
+			cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
+		fi; \
+	else \
+		echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR)"; \
+		cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR); \
+	fi;
+
+test:
+	$(RAKE)
+
+# Universal binary on OSX
+FAT_ARCHES=i386 ppc x86_64
+
+fat: $(FAT_ARCHES)
+	lipo -create $(foreach arch,$(FAT_ARCHES),build/unix/Darwin-$(arch)/jruby-launcher) -output jruby
+	$(RAKE)
+
+$(FAT_ARCHES):
+	$(MAKE) -f $(SUB_CONFMK) CND_PLATFORM=Darwin-$@ CFLAGS="-arch $@" build/unix/Darwin-$@/jruby-launcher
+
+clean: .clean-post
+
+.clean-pre:
+	-rm -rf build/*
+
+.clean-post: .clean-impl
+	rm -f *.exe *.res
+
+clobber: .clobber-post
+
+.clobber-pre:
+
+.clobber-post: .clobber-impl
+
+all: .all-post
+
+.all-pre:
+
+.all-post: .all-impl
+
+help: .help-post
+
+.help-pre:
+
+.help-post: .help-impl
+
+# Use the manually-maintained inc/*.mk makefiles.
+# Pass NETBEANS=true on the command-line to use NB's generated
+# nbproject/*.mk
+
+ifdef NETBEANS
+SUB_IMPLMK=nbproject/Makefile-impl.mk
+else
+SUB_IMPLMK=inc/Makefile-impl.mk
+SUB_CONFMK=inc/Makefile-rules.mk
+endif
+
+# include project implementation makefile
+include $(SUB_IMPLMK)
+
+# Pick conf based on OS. for mingw64, must manually override for now.
+ifeq ($(OS),Windows_NT)
+CONF=mingw
+else
+CONF=unix
+endif
+
+ifdef NETBEANS
+SUB_CONFMK=nbproject/Makefile-${CONF}.mk
+endif

data/README.md

@@ -1,64 +1,64 @@
-# JRuby Native Launcher
-
-## Motivation
-
-Maintaning `JRuby.BAT` was, well, to put it mildly, unpleasant. We had
-tens of bugs due to BAT limitations, we had weird behaviors depending
-on the version of Windows, we had a bunch of regressions.
-
-See http://jira.codehaus.org/browse/JRUBY-4100 for more details.
-
-On UNIX platforms, we had problems because a shell-script can't be put
-as a path in the shebang and couldn't take arguments. (`#!/usr/bin/env
-jruby -w`)
-
-We also wanted to DRY up argument handling, even if it meant ditching
-shell script and writing in lowest-common-denominator C++ (!).
-
-## Compile
-
-On UNIX, you should be able to just type `make` and a `jruby` binary
-will be created in the project directory. Copy this to
-`$JRUBY_HOME/bin` (or wherever your `jruby` executable is installed). On
-Windows, you should also be able to type `make` if
-you have the MinGW compiler toolkit installed.
-
-Or, open the project in Netbeans 6.8 (with C/C++ plugin installed). If
-Netbeans warns that no compilers found, follow the instructions and
-install the required compilers. Currenty, we support MinGW. More info
-here:
-
-http://netbeans.org/community/releases/68/cpp-setup-instructions.html
-
-Then, just build it, and you're ready to go. `jruby.exe`, `jrubyw.exe`
-and
-`jruby.dll` will be created, they need to be copied into
-`$JRUBY_HOME/bin`
-directory.
-
-Both, 32-bit and 64-bit compilers are supported. Great version of
-64-bit mingw can be found here: http://www.cadforte.com/system64.html
-
-To build 64-bit version of the launcher, use the following from the
-command line:
-
-    make CONF=mingw64
-
-## Run
-
-The launcher provides a great logger, use it like this:
-
-    jruby -Xtrace LOG_FILE.log ....
-
-## TODO
-
-See `TODO.txt` file for things that need to be done before this launcher
-could replace `jruby.bat`.
-
-##  Thanks
-
-The original code is by Netbeans project.
-
-## License
-
-Read the `COPYING` file.
+# JRuby Native Launcher
+
+## Motivation
+
+Maintaning `JRuby.BAT` was, well, to put it mildly, unpleasant. We had
+tens of bugs due to BAT limitations, we had weird behaviors depending
+on the version of Windows, we had a bunch of regressions.
+
+See http://jira.codehaus.org/browse/JRUBY-4100 for more details.
+
+On UNIX platforms, we had problems because a shell-script can't be put
+as a path in the shebang and couldn't take arguments. (`#!/usr/bin/env
+jruby -w`)
+
+We also wanted to DRY up argument handling, even if it meant ditching
+shell script and writing in lowest-common-denominator C++ (!).
+
+## Compile
+
+On UNIX, you should be able to just type `make` and a `jruby` binary
+will be created in the project directory. Copy this to
+`$JRUBY_HOME/bin` (or wherever your `jruby` executable is installed). On
+Windows, you should also be able to type `make` if
+you have the MinGW compiler toolkit installed.
+
+Or, open the project in Netbeans 6.8 (with C/C++ plugin installed). If
+Netbeans warns that no compilers found, follow the instructions and
+install the required compilers. Currenty, we support MinGW. More info
+here:
+
+http://netbeans.org/community/releases/68/cpp-setup-instructions.html
+
+Then, just build it, and you're ready to go. `jruby.exe`, `jrubyw.exe`
+and
+`jruby.dll` will be created, they need to be copied into
+`$JRUBY_HOME/bin`
+directory.
+
+Both, 32-bit and 64-bit compilers are supported. Great version of
+64-bit mingw can be found here: http://www.cadforte.com/system64.html
+
+To build 64-bit version of the launcher, use the following from the
+command line:
+
+    make CONF=mingw64
+
+## Run
+
+The launcher provides a great logger, use it like this:
+
+    jruby -Xtrace LOG_FILE.log ....
+
+## TODO
+
+See `TODO.txt` file for things that need to be done before this launcher
+could replace `jruby.bat`.
+
+##  Thanks
+
+The original code is by Netbeans project.
+
+## License
+
+Read the `COPYING` file.

data/Rakefile

@@ -1,51 +1,51 @@
-require 'rubygems/package_task'
-require 'date'
-
-begin
-  gem 'rspec'
-  require 'rspec/core/rake_task'
-  desc "Runs Java Integration Specs"
-  RSpec::Core::RakeTask.new
-  task :default => :spec
-rescue LoadError
-  task :default do
-    puts "rspec 2.0.0 or higher is not installed; skipping jruby-launcher specs"
-  end
-end
-
-desc "Generate gemspec file"
-task :gemspec => './lib/jruby-launcher.rb' do
-  @gemspec ||= Gem::Specification.new do |s|
-    load './lib/jruby-launcher.rb'
-    s.name = %q{jruby-launcher}
-    s.platform = Gem::Platform.new("java")
-    s.version = JRubyLauncher::VERSION
-    s.authors = ["Nick Sieger", "Vladimir Sizikov"]
-    s.date = Date.today.to_s
-    s.description = %q{Builds and installs a native launcher for JRuby on your system}
-    s.summary = %q{Native launcher for JRuby}
-    s.email = ["nick@nicksieger.com", "vsizikov@gmail.com"]
-    s.extensions = ["extconf.rb"]
-    s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
-    s.homepage = %q{http://jruby.org}
-    s.rubyforge_project = %q{jruby-extras}
-  end
-end
-
-desc "Create gem file"
-task :package => [:update_version, :gemspec, :spec] do
-  Gem::PackageTask.new(@gemspec) do |pkg|
-  end
-  Rake::Task['gem'].invoke
-end
-
-desc "Update version.h based on information in lib/jruby-launcher.rb"
-task :update_version do
-  load File.join(File.dirname(__FILE__), "lib", "jruby-launcher.rb")
-  version_file = File.join(File.dirname(__FILE__), "version.h")
-  version_file_content = File.read(version_file)
-  version_file_content.gsub! /JRUBY_LAUNCHER_VERSION\s+"[^"]+"/, "JRUBY_LAUNCHER_VERSION \"#{JRubyLauncher::VERSION}\""
-  File.open(version_file, "w") do |f|
-    f.puts version_file_content
-  end
-end
+require 'rubygems/package_task'
+require 'date'
+
+begin
+  gem 'rspec'
+  require 'rspec/core/rake_task'
+  desc "Runs Java Integration Specs"
+  RSpec::Core::RakeTask.new
+  task :default => :spec
+rescue LoadError
+  task :default do
+    puts "rspec 2.0.0 or higher is not installed; skipping jruby-launcher specs"
+  end
+end
+
+desc "Generate gemspec file"
+task :gemspec => './lib/jruby-launcher.rb' do
+  @gemspec ||= Gem::Specification.new do |s|
+    load './lib/jruby-launcher.rb'
+    s.name = %q{jruby-launcher}
+    s.platform = Gem::Platform.new("java")
+    s.version = JRubyLauncher::VERSION
+    s.authors = ["Nick Sieger", "Vladimir Sizikov"]
+    s.date = Date.today.to_s
+    s.description = %q{Builds and installs a native launcher for JRuby on your system}
+    s.summary = %q{Native launcher for JRuby}
+    s.email = ["nick@nicksieger.com", "vsizikov@gmail.com"]
+    s.extensions = ["extconf.rb"]
+    s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
+    s.homepage = %q{http://jruby.org}
+    s.rubyforge_project = %q{jruby-extras}
+  end
+end
+
+desc "Create gem file"
+task :package => [:update_version, :gemspec, :spec] do
+  Gem::PackageTask.new(@gemspec) do |pkg|
+  end
+  Rake::Task['gem'].invoke
+end
+
+desc "Update version.h based on information in lib/jruby-launcher.rb"
+task :update_version do
+  load File.join(File.dirname(__FILE__), "lib", "jruby-launcher.rb")
+  version_file = File.join(File.dirname(__FILE__), "version.h")
+  version_file_content = File.read(version_file)
+  version_file_content.gsub! /JRUBY_LAUNCHER_VERSION\s+"[^"]+"/, "JRUBY_LAUNCHER_VERSION \"#{JRubyLauncher::VERSION}\""
+  File.open(version_file, "w") do |f|
+    f.puts version_file_content
+  end
+end