Add package release version in addition to the Ruby version.

Author: larskanis

README.md

@@ -66,7 +66,7 @@ The DLL search paths of Ruby processes are extended as soon as rubygems is used,
 - Then compile and package ruby:
     rake ruby-2.4.0:installer
 
-- If everything works well, you will find: `installer/rubyinstaller-2.4.0-x64.exe`
+- If everything works well, you will find: `installer/rubyinstaller-2.4.0-1-x64.exe`
 
 ##Known Issues
 

Rakefile

@@ -30,7 +30,8 @@ rubies.each do |rubyver|
     desc "Build pacman package for ruby-#{rubyver}"
     task "compile" => [:devkit, packagefile]
 
-    file packagefile => [File.join(packdir, "PKGBUILD")] do
+    pkgbuild = File.join(packdir, "PKGBUILD")
+    file packagefile => [pkgbuild] do
       chdir(packdir) do
         rm_rf(["pkg", "src"])
         sh "sh", "makepkg-mingw", "-sf"
@@ -63,8 +64,11 @@ rubies.each do |rubyver|
       touch ruby_exe
     end
 
-    installer_exe = "installer/rubyinstaller-#{rubyver}-x64.exe"
-    installerfile_listfile = "installer/#{File.basename(installer_exe, ".exe")}.files"
+    File.read(pkgbuild) =~ /^pkgrel=(\d+)$/
+    pkgrel = $1 or raise("'pkgrel' not defined in #{pkgbuild}")
+
+    installer_exe = "installer/rubyinstaller-#{rubyver}-#{pkgrel}-x64.exe"
+    installerfile_listfile = "installer/rubyinstaller-#{rubyver}-x64.files"
     installerfile_list = File.readlines(installerfile_listfile)
     installerfile_list = installerfile_list.map{|path| File.join(sandboxdirmgw, path.chomp)}
     installerfiles = installerfile_list.map do |path|
@@ -119,7 +123,7 @@ rubies.each do |rubyver|
     default_inst_dir = "C:\\Ruby#{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=#{rubyver}", "/dRubyPatch=0", "/dRubyBuildPlatform=x64-mingw32", "/dRubyShortPlatform=-x64", "/dDefaultDirName=#{default_inst_dir}", "/O#{File.dirname(installer_exe)}", "/F#{File.basename(installer_exe, ".exe")}"
+      sh "cmd", "/c", "iscc", "installer/rubyinstaller.iss", "/Q", "/dRubyVersion=#{rubyver}", "/dRubyPatch=0", "/dRubyBuildPlatform=x64-mingw32", "/dRubyShortPlatform=-x64", "/dDefaultDirName=#{default_inst_dir}", "/dPackageRelease=#{pkgrel}", "/O#{File.dirname(installer_exe)}", "/F#{File.basename(installer_exe, ".exe")}"
     end
   end
 end

installer/rubyinstaller.iss

@@ -13,7 +13,7 @@
 ;
 ; Usage:
 ;  iscc rubyinstaller.iss /dRubyVersion=X.Y.Z \
-;                         /dRubyPatch=123; \
+;                         /dPackageRelease=3 \
 ;                         /dRubyBuildPlatform=x64-mingw32 \
 ;                         /dRubyShortPlatform=-x64 \
 ;                         [/dInstVersion=26-OCT-2009] \
@@ -23,8 +23,8 @@
   #error Please provide a RubyVersion definition using a /d parameter.
 #endif
 
-#if Defined(RubyPatch) == 0
-  #error Please provide a RubyPatch level definition using a /d parameter.
+#if Defined(PackageRelease) == 0
+  #error Please provide a PackageRelease level definition using a /d parameter.
 #endif
 
 #if Defined(RubyBuildPlatform) == 0
@@ -41,7 +41,7 @@
 
 ; Grab MAJOR.MINOR info from RubyVersion (1.8)
 #define RubyMajorMinor Copy(RubyVersion, 1, 3)
-#define RubyFullVersion RubyVersion + '-p' + RubyPatch
+#define RubyFullVersion RubyVersion + '-' + PackageRelease
 
 ; Build Installer details using above values
 #define InstallerName "Ruby " + RubyFullVersion + RubyShortPlatform
@@ -81,7 +81,7 @@ VersionInfoCompany={#InstallerPublisher}
 VersionInfoCopyright=(c) {#CurrentYear} {#InstallerPublisher}
 VersionInfoDescription=Ruby Programming Language for Windows
 VersionInfoTextVersion={#RubyFullVersion}
-VersionInfoVersion={#RubyVersion}.{#RubyPatch}
+VersionInfoVersion={#RubyVersion}.{#PackageRelease}
 UninstallDisplayIcon={app}\bin\ruby.exe
 WizardImageFile={#SourcePath}\images\wizard-large.bmp
 WizardSmallImageFile={#SourcePath}\images\wizard-logo.bmp
@@ -163,7 +163,7 @@ Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}; ValueType: st
 Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: ; ValueData: ; Flags: uninsdeletekey; Check: IsAdmin
 Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: InstallLocation ; ValueData: {app}; Check: IsAdmin
 Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: InstallDate ; ValueData: {code:GetInstallDate}; Check: IsAdmin
-Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: PatchLevel ; ValueData: {#RubyPatch}; Check: IsAdmin
+Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: PackageRelease ; ValueData: {#PackageRelease}; Check: IsAdmin
 Root: HKLM; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: BuildPlatform ; ValueData: {#RubyBuildPlatform}; Check: IsAdmin
 
 ; RubyInstaller identification for non-admin
@@ -172,7 +172,7 @@ Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}; ValueType: st
 Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: ; ValueData: ; Flags: uninsdeletekey; Check: IsNotAdmin
 Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: InstallLocation ; ValueData: {app}; Check: IsNotAdmin
 Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: InstallDate ; ValueData: {code:GetInstallDate}; Check: IsNotAdmin
-Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: PatchLevel ; ValueData: {#RubyPatch}; Check: IsNotAdmin
+Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: PackageRelease ; ValueData: {#PackageRelease}; Check: IsNotAdmin
 Root: HKCU; Subkey: Software\RubyInstaller\{#RubyInstallerBaseId}\{#RubyVersion}; ValueType: string; ValueName: BuildPlatform ; ValueData: {#RubyBuildPlatform}; Check: IsNotAdmin
 
 [Icons]