Updates to the *.erb template files

doap.rdf.erb

@@ -78,7 +78,7 @@
       <doap:Version>
         <doap:branch>fox16</doap:branch>
         <doap:created><%= Date.today %></doap:created>
-        <doap:revision><%= FXRUBY_VERSION %></doap:revision>
+        <doap:revision><%= PKG_VERSION %></doap:revision>
       </doap:Version>
     </doap:release>
 

pre-config.rb.erb

@@ -95,7 +95,7 @@ if expecting_stable_fox_release
   if (instMinor != thisMinor)
     puts ""
     puts "   ********************************************************"
-    puts "   * This version of FXRuby (<%= FXRUBY_VERSION %>) must be built against"
+    puts "   * This version of FXRuby (<%= PKG_VERSION %>) must be built against"
     puts "   * one of the stable releases of FOX, but it appears that"
     puts "   * you have a development version of FOX (version #{installed_fox_version})"
     puts "   * installed instead. Please download and install one of"

scripts/FXRuby.iss.erb

@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=FXRuby
-AppVerName=FXRuby <%= FXRUBY_VERSION %>
+AppVerName=FXRuby <%= PKG_VERSION %>
 AppPublisherURL=<%= FXRUBY_HOME_URL %>
 AppSupportURL=<%= FXRUBY_HOME_URL %>
 AppUpdatesURL=<%= FXRUBY_HOME_URL %>
@@ -13,7 +13,7 @@ AllowNoIcons=no
 LicenseFile=LICENSE
 InfoBeforeFile=README.win32.txt
 OutputDir=.
-OutputBaseFilename=FXRuby-<%= FXRUBY_VERSION %>-<%= RUBYVER %>
+OutputBaseFilename=FXRuby-<%= PKG_VERSION %>-<%= info[1] %>
 
 [Files]
 ; readme files
@@ -28,9 +28,9 @@ Source: "tests\README"; DestDir: "{app}\doc\FXRuby\tests"; Flags: ignoreversion
 Source: "tests\*.rb"; DestDir: "{app}\doc\FXRuby\tests"; Flags: ignoreversion
 Source: "tests\*.ps"; DestDir: "{app}\doc\FXRuby\tests"; Flags: ignoreversion
 ; main extension shared library
-Source: "ext\fox16\fox16.so"; DestDir: "{app}\lib\ruby\site_ruby\<%= RUBY_VERSION %>\<%= TARGET %>; Flags: ignoreversion
+Source: "ext\fox16\fox16.so"; DestDir: "{app}\lib\ruby\site_ruby\<%= info[0] %>\<%= info[2] %>; Flags: ignoreversion
 ; library files
-Source: "lib\fox16\*.rb"; DestDir: "{app}\lib\ruby\site_ruby\<%= RUBY_VERSION %>\fox16"; Flags: ignoreversion
+Source: "lib\fox16\*.rb"; DestDir: "{app}\lib\ruby\site_ruby\<%= info[0] %>\fox16"; Flags: ignoreversion
 ; samples
 Source: "examples\README"; DestDir: "{app}\samples\FXRuby"; Flags: ignoreversion
 Source: "examples\babelfish.rb"; DestDir: "{app}\samples\FXRuby"; DestName: "babelfish.rbw"; Flags: ignoreversion

scripts/make-installers.rb.erb

@@ -73,7 +73,7 @@ def do_upload(fxruby_version)
 end
 
 if __FILE__ == $0
-  fxruby_version = "<%= FXRUBY_VERSION %>"
+  fxruby_version = "<%= PKG_VERSION %>"
   untar(fxruby_version)
   iss_filename, dir = copy_installer_script(fxruby_version)
   Dir.chdir(dir)