Permalink
Browse files

2.0.0 merge

  • Loading branch information...
2 parents fb64b34 + e287f16 commit e4b1d12e9e43c62d7db4ec27199d6c1589f810b9 @wayneeseguin wayneeseguin committed Sep 5, 2011
View
@@ -1 +1 @@
-1.3.0
+2.0.0
@@ -6,13 +6,13 @@
:list:
-
:name: rake
- :version: "0.8.7"
+ :version: "0.9.2"
-
:name: rails
- :version: "~> 3.0.0"
+ :version: "3.1.0"
-
:name: activerecord-sqlserver-adapter
- :version: "~> 3.0.0"
+ :version: "3.1.0"
- tiny_tds
- sqlite3
- sqlite3-ruby
@@ -49,14 +49,14 @@
:title: Ruby 1.9.2
:name: Ruby192
:regex: '^.*$'
- :url: "http://files.rubyforge.vm.bytemark.co.uk/rubyinstaller/ruby-1.9.2-p136-i386-mingw32.7z"
+ :url: "http://rubyforge.org/frs/download.php/75128/ruby-1.9.2-p290-i386-mingw32.7z"
:rename: Ruby1.9.2
:git:
:category: component
:title: Git 1.7.3.1
:name: Git
- :url: "http://msysgit.googlecode.com/files/PortableGit-1.7.3.1-preview20101002.7z"
+ :url: "http://msysgit.googlecode.com/files/PortableGit-1.7.6-preview20110709.7z"
:target: "Git"
:regex: '^.*$'
@@ -3,7 +3,7 @@ module RailsInstaller
def self.build!
components = [
- BSDTar, SevenZip, DevKit, Git, Ruby187,
+ BSDTar, SevenZip, DevKit, Git, Ruby192,
PostgresServer, Sqlite3, Sqlite3Dll
]
@@ -52,7 +52,7 @@ def self.package!
iscc "\"#{File.join(RailsInstaller::Root, "resources", "railsinstaller", "railsinstaller.iss")}\"",
"/dInstallerVersion=#{railsinstaller_version}",
"/dStagePath=\"#{RailsInstaller::Stage}\"",
- "/dRubyPath=\"#{RailsInstaller::Ruby187.rename}\"",
+ "/dRubyPath=\"#{RailsInstaller::Ruby192.rename}\"",
"/dResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
"/o\"#{RailsInstaller::PackageDir}\"",
"/frailsinstaller-#{railsinstaller_version}"
@@ -193,7 +193,7 @@ def self.stage_sqlite
if File.exist?(File.join(Stage, file))
FileUtils.mv(
File.join(Stage, file),
- File.join(Stage, Ruby187.rename, "bin", file)
+ File.join(Stage, Ruby192.rename, "bin", file)
)
end
end
@@ -207,7 +207,7 @@ def self.stage_postgresql
if File.exist?(File.join(Stage, file))
FileUtils.cp(
File.join(Stage, PostgresServer.target, "bin", file),
- File.join(Stage, Ruby187.rename, "bin", file)
+ File.join(Stage, Ruby192.rename, "bin", file)
)
end
end
@@ -218,7 +218,7 @@ def self.stage_postgresql
#
def self.link_devkit_with_ruby
devkit_path = File.join(Stage, DevKit.target)
- ruby_path = File.join(Stage, Ruby187.rename)
+ ruby_path = File.join(Stage, Ruby192.rename)
FileUtils.mkdir_p(devkit_path) unless File.directory?(devkit_path)
Dir.chdir(devkit_path) do
File.open("config.yml", 'w') do |file|
@@ -239,8 +239,8 @@ def self.stage_git
def self.stage_gems
section Gems
- build_gems(File.join(Stage, Ruby187.rename), Gems.list)
- build_gem(File.join(Stage, Ruby187.rename), "pg", {
+ build_gems(File.join(Stage, Ruby192.rename), Gems.list)
+ build_gem(File.join(Stage, Ruby192.rename), "pg", {
:args => [
"--",
"--with-pg-include=#{File.join(Stage, "pgsql", "include")}",
@@ -255,7 +255,7 @@ def self.stage_rails_sample_application
section Rails
sample = File.join(Stage, "Sites", "sample")
FileUtils.rm_rf(sample) if File.exist?(sample)
- ruby_binary("rails", "new", "sample", File.join(Stage, Ruby187.rename))
+ ruby_binary("rails", "new", "sample", File.join(Stage, Ruby192.rename))
end
# Renders setup scripts to be used post-installation
@@ -275,7 +275,7 @@ def self.stage_setup_scripts
%w( publickey.bat ).each do |file|
FileUtils.cp(
File.join(RailsInstaller::Scripts, file),
- File.join(Stage, Ruby187.rename, "bin", file)
+ File.join(Stage, Ruby192.rename, "bin", file)
)
end
end
@@ -324,9 +324,9 @@ def self.gem_install(ruby_path,gem,options={})
printf " => Staging gem #{gem}\n" if $Flags[:verbose]
%w(GEM_HOME GEM_PATH).each { |variable| ENV.delete(variable)}
line = %Q(#{File.join(ruby_path, "bin", "gem")} install #{gem} )
- line += %Q( -v"#{options[:version]}" ) if options[:version]
- line += %Q( --env-shebang --no-rdoc --no-ri )
- line += options[:args] if options[:args]
+ line << %Q( -v"#{options[:version]}" ) if options[:version]
+ line << %Q( --env-shebang --no-rdoc --no-ri --source http://rubygems.org )
+ line << options[:args] if options[:args]
sh line
end
@@ -88,7 +88,7 @@ Name: en; MessagesFile: compiler:Default.isl
[Messages]
en.InstallingLabel=Installing [name], this will take a few minutes...
en.WelcomeLabel1=Welcome to [name]!
-en.WelcomeLabel2=This will install [name/ver] on your computer which includes Ruby 1.8.7, Git, Sqlite3, DevKit, Rails 3 and TinyTDS with FreeTDS. Please close any console applications before continuing.
+en.WelcomeLabel2=This will install [name/ver] on your computer which includes Ruby 1.9.2, Rails 3.1, Git, Sqlite3, DevKit, and TinyTDS with FreeTDS. Please close any console applications before continuing.
en.WizardLicense={#InstallerName} License Agreement
en.LicenseLabel=
en.LicenseLabel3=Please read the following License Agreements and accept the terms before continuing the installation.

0 comments on commit e4b1d12

Please sign in to comment.