Add x86 32-bit architecture.

Author: larskanis

Rakefile

@@ -10,17 +10,17 @@ end
 
 rubies = Dir["compile/ruby-*"]
 
-ENV['RI_ARCHS'] ||= 'x64'
+ENV['RI_ARCHS'] ||= 'x64:x86'
 ENV['RI_ARCHS'].split(":").each do |arch|
 
   rubies.each do |compiledir|
     pack = RubyPackage.new( compiledir: compiledir, arch: arch, rootdir: __dir__ ).freeze
 
     namespace pack.rake_namespace do
 
-      compile = CompileTask.new( package: pack ).freeze
-      sandbox = SandboxTask.new( package: pack, compile_task: compile ).freeze
-      InstallerTask.new( package: pack, sandbox_task: sandbox ).freeze
+      compile = CompileTask.new( package: pack )
+      sandbox = SandboxTask.new( package: pack, compile_task: compile )
+      InstallerTask.new( package: pack, sandbox_task: sandbox )
     end
   end
 end

compile/task.rake

@@ -1,31 +1,26 @@
-require "ostruct"
-require "rake"
-require "build_utils"
-
-class CompileTask < OpenStruct
-  include Rake::DSL
-  include BuildUtils
+require "base_task"
 
+class CompileTask < BaseTask
   def initialize(*args)
     super
-    self.pkgfile = File.join(package.compiledir, "mingw-w64-x86_64-ruby-#{package.rubyver_pkgrel}-any.pkg.tar.xz")
+    self.pkgfile = File.join(package.compiledir, "#{package.pacman_arch}-ruby-#{package.rubyver_pkgrel}-any.pkg.tar.xz")
 
-    desc "Build pacman package for ruby-#{package.rubyver}"
+    desc "Build pacman package for ruby-#{package.rubyver}-#{package.arch}"
     task "compile" => [:devkit, pkgfile]
 
-    self.readline_pkgfile = File.join("compile", "mingw-w64-readline", "mingw-w64-x86_64-readline-6.3.008-1-any.pkg.tar.xz")
+    self.readline_pkgfile = File.join("compile", "mingw-w64-readline", "#{package.pacman_arch}-readline-6.3.008-1-any.pkg.tar.xz")
     file readline_pkgfile => [package.pkgbuild] do |t|
       chdir(File.dirname(t.name)) do
         pkgfile = File.basename(readline_pkgfile)
-        msys_sh "MINGW_INSTALLS=mingw64 makepkg-mingw -sf &&
+        msys_sh "MINGW_INSTALLS=#{package.mingwdir} makepkg-mingw -sf &&
         (pacman --noconfirm -U #{pkgfile.inspect} || rm -f #{pkgfile.inspect})"
       end
     end
 
     file pkgfile => [package.pkgbuild, readline_pkgfile] do
       chdir(package.compiledir) do
-        cp Dir[File.join(rootdir, "resources/icons/*.ico")], "."
-        msys_sh "MINGW_INSTALLS=mingw64 makepkg-mingw -sf"
+        cp Dir[File.join(package.rootdir, "resources/icons/*.ico")], "."
+        msys_sh "MINGW_INSTALLS=#{package.mingwdir} makepkg-mingw -sf"
       end
     end
   end

installer/rubyinstaller-2.4.0-x86.files

@@ -0,0 +1,75 @@
+bin/erb
+bin/erb.cmd
+bin/gem
+bin/gem.cmd
+bin/irb
+bin/irb.cmd
+bin/libasprintf-0.dll
+bin/libatomic-1.dll
+bin/libbz2-1.dll
+bin/libcharset-1.dll
+bin/libeay32.dll
+bin/libexpat-1.dll
+bin/libffi-6.dll
+bin/libgcc_s_dw2-1.dll
+bin/libgdbm-4.dll
+bin/libgettextlib-0-19-7.dll
+bin/libgettextpo-0.dll
+bin/libgettextsrc-0-19-7.dll
+bin/libgfortran-3.dll
+bin/libgmp-10.dll
+bin/libgmpxx-4.dll
+bin/libgomp-1.dll
+bin/libhistory6.dll
+bin/libiconv-2.dll
+bin/libintl-8.dll
+bin/libminizip-1.dll
+bin/libp11-kit-0.dll
+bin/libquadmath-0.dll
+bin/libreadline6.dll
+bin/libssp-0.dll
+bin/libstdc++-6.dll
+bin/libtasn1-6.dll
+bin/libtermcap-0.dll
+bin/libwinpthread-1.dll
+bin/libyaml-0-2.dll
+bin/rubydevkit.cmd
+bin/rake
+bin/rake.cmd
+bin/rdoc
+bin/rdoc.cmd
+bin/ri
+bin/ri.cmd
+bin/ruby.exe
+bin/rubyw.exe
+bin/setrbvars.cmd
+bin/ssleay32.dll
+bin/msvcrt-ruby240.dll
+bin/zlib1.dll
+include/ruby-2.4.0
+lib/engines/4758ccaeay32.dll
+lib/engines/aepeay32.dll
+lib/engines/atallaeay32.dll
+lib/engines/capieay32.dll
+lib/engines/chileay32.dll
+lib/engines/cswifteay32.dll
+lib/engines/gmpeay32.dll
+lib/engines/gosteay32.dll
+lib/engines/nuroneay32.dll
+lib/engines/padlockeay32.dll
+lib/engines/surewareeay32.dll
+lib/engines/ubseceay32.dll
+lib/libmsvcrt-ruby240.dll.a
+lib/pkgconfig/ruby-2.4.pc
+lib/ruby/2.4.0
+lib/ruby/gems/2.4.0
+lib/ruby/site_ruby/2.4.0
+lib/ruby/vendor_ruby/2.4.0
+share/doc/ruby/html/images/ruby-doc.ico
+ssl/cert.pem
+ssl/certs/ca-bundle.crt
+ssl/certs/ca-bundle.trust.crt
+ssl/openssl.cnf
+lib/ruby/site_ruby/devkit.rb
+lib/ruby/site_ruby/ruby_installer.rb
+lib/ruby/2.4.0/rubygems/defaults/operating_system.rb

installer/rubyinstaller.iss

@@ -63,7 +63,7 @@ DefaultDirName={#DefaultDirName}
 
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications!
-AppId=RubyInstaller-{#RubyMajorMinor}
+AppId=RubyInstaller-{#RubyMajorMinor}-{#RubyBuildPlatform}
 AppName={#InstallerName}
 AppVerName={#InstallerName}
 AppPublisher={#InstallerPublisher}

installer/task.rake

@@ -1,25 +1,22 @@
-require "ostruct"
-require "rake"
-
-class InstallerTask < OpenStruct
-  include Rake::DSL
+require "base_task"
 
+class InstallerTask < BaseTask
   def initialize(*args)
     super
     sandboxdirmgw = sandbox_task.sandboxdirmgw
-    self.installer_exe = "installer/rubyinstaller-#{package.rubyver_pkgrel}-x64.exe"
-    installerfile_listfile = "installer/rubyinstaller-#{package.rubyver}-x64.files"
+    self.installer_exe = "installer/rubyinstaller-#{package.rubyver_pkgrel}-#{package.arch}.exe"
+    installerfile_listfile = "installer/rubyinstaller-#{package.rubyver}-#{package.arch}.files"
     installerfiles = File.readlines(installerfile_listfile).map{|path| File.join(sandboxdirmgw, path.chomp)}
     installerfiles.each do |path|
       file path
     end
 
-    desc "Build installer for ruby-#{package.rubyver}"
+    desc "Build installer for ruby-#{package.rubyver}-#{package.arch}"
     task "installer" => [:devkit, "sandbox", installer_exe]
 
     file File.join(sandboxdirmgw, "bin/rake.cmd") => File.join(sandboxdirmgw, "bin/rake.bat") do |t|
       out = File.read(t.prerequisites.first)
-        .gsub("\\mingw64\\bin\\", "%~dp0")
+        .gsub("\\#{package.mingwdir}\\bin\\", "%~dp0")
         .gsub(/"[^"]*\/bin\/rake"/, "\"%~dp0rake\"")
       File.write(t.name, out)
     end
@@ -39,7 +36,7 @@ class InstallerTask < OpenStruct
       end
     end
 
-    filelist_iss = "installer/filelist-ruby-#{package.rubyver}-x64-mingw32.iss"
+    filelist_iss = "installer/filelist-ruby-#{package.rubyver}-#{package.ruby_arch}.iss"
     file filelist_iss => [__FILE__, installerfile_listfile] do
       puts "generate #{filelist_iss}"
       out = installerfiles.map do |path|
@@ -52,10 +49,9 @@ class InstallerTask < OpenStruct
       File.write(filelist_iss, out)
     end
 
-    default_inst_dir = "C:\\Ruby#{package.rubyver2.gsub(".","")}-x64"
     iss_files = Dir["installer/*.iss"]
     file installer_exe => (installerfiles + iss_files + [filelist_iss]) do
-      sh "cmd", "/c", "iscc", "installer/rubyinstaller.iss", "/Q", "/dRubyVersion=#{package.rubyver}", "/dRubyBuildPlatform=x64-mingw32", "/dRubyShortPlatform=-x64", "/dDefaultDirName=#{default_inst_dir}", "/dPackageRelease=#{package.pkgrel}", "/O#{File.dirname(installer_exe)}", "/F#{File.basename(installer_exe, ".exe")}"
+      sh "cmd", "/c", "iscc", "installer/rubyinstaller.iss", "/Q", "/dRubyVersion=#{package.rubyver}", "/dRubyBuildPlatform=#{package.ruby_arch}", "/dRubyShortPlatform=-#{package.arch}", "/dDefaultDirName=#{package.default_instdir}", "/dPackageRelease=#{package.pkgrel}", "/O#{File.dirname(installer_exe)}", "/F#{File.basename(installer_exe, ".exe")}"
     end
   end
 end

lib/base_task.rb

@@ -0,0 +1,31 @@
+require "rake"
+require "build_utils"
+
+class BaseTask
+  include Rake::DSL
+  include BuildUtils
+
+  def initialize(hash={})
+    @__attrs = {}
+    hash.each do |k,v|
+      send("#{k}=", v)
+    end
+  end
+
+  def method_missing(meth, *args)
+    if meth=~/\A(.*)=\z/ && args.length == 1
+      attr = $1
+      self.class.class_eval do
+        define_method(attr) do
+          @__attrs[attr]
+        end
+        define_method(meth) do |val|
+          @__attrs[attr] = val
+        end
+      end
+      @__attrs[attr] = args.first
+    else
+      super
+    end
+  end
+end

lib/ruby_package.rb

@@ -1,6 +1,6 @@
-require "ostruct"
+require "base_task"
 
-class RubyPackage < OpenStruct
+class RubyPackage < BaseTask
   def initialize(*args)
     super
     self.rubyver = File.basename(compiledir).gsub("ruby-", "")
@@ -12,5 +12,20 @@ def initialize(*args)
 
     self.rake_namespace = "ruby-#{rubyver}-#{arch}"
     self.rubyver2 = rubyver[/^\d+\.\d+/]
+
+    case arch
+    when 'x64'
+      self.pacman_arch = "mingw-w64-x86_64"
+      self.ruby_arch = "x64-mingw32"
+      self.mingwdir = "mingw64"
+      self.default_instdir = "C:\\Ruby#{rubyver2.gsub(".","")}-x64"
+    when 'x86'
+      self.pacman_arch = "mingw-w64-i686"
+      self.ruby_arch = "i386-mingw32"
+      self.mingwdir = "mingw32"
+      self.default_instdir = "C:\\Ruby#{rubyver2.gsub(".","")}"
+    else
+      raise "invalid arch #{arch}"
+    end
   end
 end