Fixes #5084.

First attempt at using newest install4j. This version we got an updated OSS license for and it works with Java 9+. After install4j updated our old file nearly everything works except that media type changed to 'windows' from 'win32'. This also changed the platform variable name so that had to be tweaked. I did a mock release and put ONLY java 9 on a windows machine and it installs. Huzzah
jruby · Apr 10, 2018 · c5ddf24 · c5ddf24
1 parent 232047b
commit c5ddf24
Showing 3 changed files with 930 additions and 113 deletions.
diff --git a/default.build.properties b/default.build.properties
@@ -31,7 +31,7 @@ release.dir=release
 test.results.dir=${build.dir}/test-results
 jruby.launch.memory=1024M
 rake.args=
-install4j.executable=/Applications/install4j 4/bin/install4jc
+install4j.executable=/Applications/install4j7/bin/install4jc
 
 # Ruby versions
 version.ruby=2.3.3

diff --git a/install/jruby.install4j b/install/jruby.install4j
diff --git a/rakelib/installer.rake b/rakelib/installer.rake
@@ -91,7 +91,7 @@ task :windows_installer => :init_release do
   if File.executable?(INSTALL4J_EXECUTABLE)
     root_dir = Dir.pwd
     Dir.chdir(unpacked_dir) do
-      sh %Q^"#{INSTALL4J_EXECUTABLE}" -m win32 -D jruby.dist.location=#{root_dir},jruby.location=#{unpacked_dir},ruby.version=#{VERSION_RUBY},jruby.version=#{version},ruby.patchlevel=0,ruby.buildplatform=i386-mingw32 #{INSTALL4J_CONFIG_FILE}^ do |ok, result|
+      sh %Q^"#{INSTALL4J_EXECUTABLE}" -m windows -D jruby.dist.location=#{root_dir},jruby.location=#{unpacked_dir},ruby.version=#{VERSION_RUBY},jruby.version=#{version},ruby.patchlevel=0,ruby.buildplatform=i386-mingw32 #{INSTALL4J_CONFIG_FILE}^ do |ok, result|
         $stderr.puts "** Something went wrong: #{result}" unless ok
       end
       mv Dir[File.join(root_dir, 'install', '*.exe')], File.join(root_dir, RELEASE_DIR)