Permalink
Browse files

fixed conflicts

  • Loading branch information...
luigidr committed Jan 10, 2013
2 parents 9697731 + 0369ade commit f06af8ace751bd296e075fc3ddd15992684025d6
View
3 .gems
@@ -1,3 +1,2 @@
-rubyzip2 -v2.0.1
-win32-open3
+rubyzip2 -v2.0.2
POpen4
View
@@ -1,3 +1,10 @@
+2.2.0 - Updated main components to the latest version (Ruby 1.9.3-p362,
+ Rails 3.2.11, git 1.8.0).
+ Users can now exclude Git from the setup process (maybe it is already installed).
+
+2.0.0 - Ruby 1.9.2-p290, Rails 3.1, Active Record SQLServer Adapter, TinyTDS,
+ git 1.7.6, bundler 1.0.18.
+
1.1.0 - Automatic help for user git configuration on console start.
Automatic ssh key configuration on console start.
Configuration summary output on console start.
View
@@ -18,23 +18,21 @@ built and packaged via rake tasks.
1. Download and install latest
[Inno Setup Quick Start Pack](http://www.jrsoftware.org/isdl.php#qsp),
- ensure iscc.exe is in your PATH.
+ add iscc.exe is in your PATH
1. [Fork](http://help.github.com/fork-a-repo/)
the [RailsInstaller project on github](https://github.com/railsinstaller/railsinstaller-windows.git)
into your own github account.
-1. Open the RailsInstaller Command prompt from the start menu RailsInstaller
- group and change directories to where you like to keep your projects.
+1. Open the the command prompt from the start menu and change directory to where you like to keep your projects.
1. Clone your fork of the project.
> git clone git@github.com:{{your github user name}}/railsinstaller-windows
> cd railsinstaller-windows
-1. Update from origin master branch and checkout a new topic branch for
- your feature/bugfix.
+1. Update from origin master (or 2.0.0) branch and checkout a new topic branch for your feature/bugfix.
> git checkout master
@@ -48,27 +46,23 @@ built and packaged via rake tasks.
1. Implement your new feature and/or fix your bug in your newly forked Railsinstaller project code.
- * The configuration file for specifying required packages can be found at
- config/railsinstaller.yml.
+ * The configuration file for specifying required packages can be found at config/railsinstaller.yml.
- * Building of the installer into the stage path for packaging is implemented by Ruby
- code in the lib/ directory, starting with the file lib/railsinstaller/actions.rb.
+ * Building of the installer into the stage path for packaging is implemented by Ruby code in the lib/ directory, starting with the file lib/railsinstaller/actions.rb.
* Methods called by the actions.rb file are implemented by lib/railsinstaller/methods.rb.
-1. Next build all components onto the stage (into the stage/ directory).
+1. Next build all components onto the stage (into the stage/ directory)
> rake build
-1. We are now ready to use Inno Setup to package the installer into an executable (.exe) for testing/distribution.
+1. Use Inno Setup to package the installer into an executable (.exe) for testing/distribution.
> rake package
- * This creates the executable (.exe) package file in the pkg/ directory from the files staged
- during the build process in the stage/ directory.
+ * This creates the executable (.exe) package file in the pkg/ directory from the files staged during the build process in the stage/ directory.
- * NOTE - You can run the package task with --trace for debugging output if the package
- fails to build or if you simply want to see what is being done as it is done).
+ * NOTE - You can run the package task with --trace for debugging output if the package fails to build or if you simply want to see what is being done as it is done).
1. Once you have verified your new feature/bug-fix, push your branch up to GitHub.
@@ -82,17 +76,13 @@ built and packaged via rake tasks.
The next few sections detail the core components that make up RailsInstaller.
-### Ruby 1.8.7/1.9.2 on Windows
+### Ruby 1.9.3 on Windows
-RubyInstaller is a self contained package installer which installs Ruby and
-RubyGems on a windows system, head over to http://rubyinstaller.org/ for more
-information.
+RubyInstaller is a self contained package installer which installs Ruby and RubyGems on a windows system, head over to [http://rubyinstaller.org/](http://rubyinstaller.org/) for more information.
### Development Kit (DevKit)
-A MSYS/MinGW based toolkit that enables RailsInstaller to build native C/C++
-packages, both for Ruby and gems. DevKit is built and maintained by the
-wonderful folks over at the RubyInstaller (http://rubyinstaller.org/) project.
+A MSYS/MinGW based toolkit that enables RailsInstaller to build native C/C++ packages, both for Ruby and gems. DevKit is built and maintained by the wonderful folks over at the RubyInstaller project.
### Git
@@ -101,5 +91,4 @@ The git version that is bundled into RailsInstaller is
### Packaging/Installer
-We are using [Inno Setup](http://www.jrsoftware.org/isinfo.php "Inno Setup"),
-a free installer for Windows programs.
+We are using [Inno Setup](http://www.jrsoftware.org/isinfo.php "Inno Setup"), a free installer for Windows programs.
View
@@ -1 +1 @@
-2.0.0
+2.2.0
View
@@ -4,22 +4,21 @@
:title: Ruby Gems
:category: gems
:list:
- -
- :name: rake
- :version: "0.9.2"
+ - rake
-
:name: rails
- :version: "3.1.0"
+ :version: "3.2.11"
-
:name: activerecord-sqlserver-adapter
- :version: "3.1.0"
+ :version: "3.2.11"
- tiny_tds
- sqlite3
- sqlite3-ruby
- - rubyzip2
- - win32-open3
- - POpen4
+ - rubyzip
- rb-readline
+ - coffee-rails
+ - jquery-rails
+ - sass-rails
:msvc_runtime:
:name: MsvcRuntime
@@ -34,15 +33,7 @@
:category: component
:regex: '^.*$'
:target: 'DevKit'
- :url: "http://cloud.github.com/downloads/oneclick/rubyinstaller/DevKit-tdm-32-4.5.1-20101214-1400-sfx.exe"
-
-:ruby187:
- :category: component
- :title: Ruby 1.8.7
- :name: Ruby187
- :regex: '^.*$'
- :url: "http://rubyforge.org/frs/download.php/75108/ruby-1.8.7-p352-i386-mingw32.7z"
- :rename: Ruby1.8.7
+ :url: "http://cloud.github.com/downloads/oneclick/rubyinstaller/DevKit-tdm-32-4.5.2-20111229-1559-sfx.exe"
:ruby192:
:category: component
@@ -52,11 +43,19 @@
:url: "http://rubyforge.org/frs/download.php/75128/ruby-1.9.2-p290-i386-mingw32.7z"
:rename: Ruby1.9.2
+:ruby193:
+ :category: component
+ :title: Ruby 1.9.3
+ :name: Ruby193
+ :regex: '^.*$'
+ :url: "http://rubyforge.org/frs/download.php/76643/ruby-1.9.3-p362-i386-mingw32.7z"
+ :rename: Ruby1.9.3
+
:git:
:category: component
- :title: Git 1.7.3.1
+ :title: Git 1.8.0
:name: Git
- :url: "http://msysgit.googlecode.com/files/PortableGit-1.7.6-preview20110709.7z"
+ :url: "http://msysgit.googlecode.com/files/PortableGit-1.8.0-preview20121022.7z"
:target: "Git"
:regex: '^.*$'
@@ -87,6 +86,11 @@
:title: Rails 3 sample application
:category: gem
+:rails_todo:
+ :name: RailsTodo
+ :title: Rails 3 Todo Sample application
+ :category: gem
+
:rails_docs:
:name: RailsDocs
:title: Rails 3 Documentation
View
@@ -6,12 +6,12 @@ module RailsInstaller # Ensure that the RailsInstaller project root is defined.
PackageDir = File.expand_path(File.join(Root, "pkg"))
end
-%w[ rubygems fileutils ostruct yaml erb uri open-uri win32/open3 popen4 zip/zip ].each do |name|
+%w[ rubygems fileutils ostruct yaml erb uri open-uri open3 zip/zip ].each do |name|
printf "Loading #{name}...\n" if $Flags[:verbose]
require name
end
-gem "rubyzip2", "~> 2.0.1"
+gem "rubyzip"
%w[ globals ].each do |name|
printf "Loading #{name}...\n" if $Flags[:verbose]
@@ -3,7 +3,7 @@ module RailsInstaller
def self.build!
components = [
- BSDTar, SevenZip, DevKit, Git, Ruby192,
+ BSDTar, SevenZip, DevKit, Git, Ruby193,
PostgresServer, Sqlite3, Sqlite3Dll
]
@@ -23,7 +23,7 @@ def self.build!
stage_gems
- stage_rails_sample_application
+ stage_todo_application
stage_setup_scripts
@@ -38,7 +38,7 @@ def self.build!
#
def self.package!
- unless %x{iscc --version}.grep("Inno Setup 5")
+ unless %x{iscc --version}.scan("Inno Setup 5")
printf "ERROR: Inno Setup 5 is required in order to package RailsInstaller.\n"
printf " http://www.jrsoftware.org/isdl.php#qsp\n"
printf "Please see README for full RailsInstaller instructions.\n"
@@ -52,7 +52,7 @@ def self.package!
iscc "\"#{File.join(RailsInstaller::Root, "resources", "railsinstaller", "railsinstaller.iss")}\"",
"/dInstallerVersion=#{railsinstaller_version}",
"/dStagePath=\"#{RailsInstaller::Stage}\"",
- "/dRubyPath=\"#{RailsInstaller::Ruby192.rename}\"",
+ "/dRubyPath=\"#{RailsInstaller::Ruby193.rename}\"",
"/dResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
"/o\"#{RailsInstaller::PackageDir}\"",
"/frailsinstaller-#{railsinstaller_version}"
@@ -21,7 +21,7 @@ def self.download(package, count = 3)
end
uri = URI.parse(package.url)
-
+
print "Downloading from #{package.url} to #{RailsInstaller::Archives}\n" if $Flags[:verbose]
http.get_response(uri) do |response|
@@ -37,7 +37,7 @@ def self.download(package, count = 3)
when Net::HTTPRedirection
raise "Too many redirections for the original url, halting." if count <= 0
- print "Redirected to #{response["Location"]}\n" if verbose
+ print "Redirected to #{response["Location"]}\n" if $Flags[:verbose]
package.url = response["location"]
return download(package, count - 1)
Oops, something went wrong.

0 comments on commit f06af8a

Please sign in to comment.