This patch:
- Adds a hopefully helpful comment on how to fix a startup problem with
running the Oracle client setup utility;
- Renames the `dvl'' target to `devel'' as that''s what
the FreeBSD ports
collection uses for -devel ports;
- Updates the URLs of some of the packages, pointing to newer versions. Note
that I have not yet checked if anything in the Package.new block needs to be
done differently for these ports.
- ruby-opengl: updated the download URL but disabled the entry as it triggers
an error in the builder script here.
--
Jos Backus _/ _/_/_/ Sunnyvale, CA
_/ _/ _/
_/ _/_/_/
_/ _/ _/ _/
jos at catnook.com _/_/ _/_/_/ require
''std/disclaimer''
-------------- next part --------------
Index: ReadMe.txt
==================================================================RCS file:
/var/cvs/rubyinstaller/installer/ReadMe.txt,v
retrieving revision 1.4
diff -u -r1.4 ReadMe.txt
--- ReadMe.txt 8 May 2004 06:55:41 -0000 1.4
+++ ReadMe.txt 21 May 2004 16:58:24 -0000
@@ -57,6 +57,10 @@
- Add "...\oci\include" to the include path.
- Add "...\oci\lib\msvc" to the lib path.
+ If setup.exe fails to start, try searching for and renaming symcjit.dll
+ in the stage\ subdirectory. According to Google This problem is known and
+ under investigation.
+
* Info UnZip
(http://www.info-zip.org/pub/infozip/UnZip.html)
Index: builder/Makefile
==================================================================RCS file:
/var/cvs/rubyinstaller/installer/builder/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- builder/Makefile 31 Jan 2004 07:45:28 -0000 1.1
+++ builder/Makefile 21 May 2004 17:30:27 -0000
@@ -5,7 +5,7 @@
stable:
ruby.exe -w builder.rb stable
-dvl:
- ruby.exe -w builder.rb dvl
+devel:
+ ruby.exe -w builder.rb devel
-both: stable dvl
+both: stable devel
Index: builder/builder.rb
==================================================================RCS file:
/var/cvs/rubyinstaller/installer/builder/builder.rb,v
retrieving revision 1.7
diff -u -r1.7 builder.rb
--- builder/builder.rb 2 May 2004 04:57:13 -0000 1.7
+++ builder/builder.rb 21 May 2004 17:31:40 -0000
@@ -16,14 +16,14 @@
case ARGV[0]
when "stable"
$is_stable = true
- $is_dvl = false
+ $is_devel = false
$version="181-#{$installer_release}"
Dir.chdir("stable")
-when "dvl"
+when "devel"
$is_stable = false
- $is_dvl = true
+ $is_devel = true
$version="190-#{$installer_release}"
- Dir.chdir("dvl")
+ Dir.chdir("devel")
else
puts "Don''t know how to make a #{ARGV[0]} version"
exit 1
@@ -149,23 +149,25 @@
Package.new("FXRuby",
"1.0.28",
-
"http://www.knology.net/~lyle/FXRuby-1.0.28-ruby1.8.1.tar.gz",
- NO_DIRECTORY) do
+
"http://unc.dl.sourceforge.net/sourceforge/fxruby/FXRuby-1.0.28-ruby181.exe",
+ "fxruby-1.0.28") do
safe_mkdir $release_dir + "/Fox"
copy "lib", "Fox"
copy "doc", "Fox"
copy "samples", "Fox"
end
+=begin
Package.new("OpenGL",
"0.32B",
-
"http://www.knology.net/~lyle/ruby-opengl-0.32b-ruby1.8.1.tar.gz",
+ "http://www2.giganet.net/~yoshi/rbogl-0.32d.tar.gz",
NO_DIRECTORY) do
safe_mkdir $release_dir + "/Fox"
copy "lib", "Fox"
copy "doc", "Fox"
copy "samples", "Fox"
end
+=end
Package.new("GLUT",
"3.7.6",
@@ -184,10 +186,10 @@
#
Package.new("Expat",
- "1.95.5",
-
"http://unc.dl.sourceforge.net/sourceforge/expat/expat_win32bin_1_95_5.exe",
- "Expat-1.95.5") do
- puts "(Install expat_win32bin_1_95_5.exe to #{@directory})"
+ "1.95.7",
+
"http://unc.dl.sourceforge.net/sourceforge/expat/expat_win32bin_1_95_7.exe",
+ "Expat-1.95.7") do
+ puts "(Install expat_win32bin_1_95_7.exe to #{@directory})"
export_includes("Source/lib")
export_libs("Libs")
run "cd Libs"
@@ -197,8 +199,8 @@
end
Package.new("XMLParser",
- "0.6.5",
- "http://www.yoshidam.net/xmlparser-0.6.5.tar.gz",
+ "0.6.8",
+ "http://www.yoshidam.net/xmlparser-0.6.8.tar.gz",
"xmlparser") do
set_include include_for(''Expat'')
set_lib lib_for(''Expat'')
@@ -306,8 +308,8 @@
#
Package.new("RubyDBI",
- "0.0.18",
-
"http://unc.dl.sourceforge.net/sourceforge/ruby-dbi/ruby-dbi-all-0.0.18.tar.gz",
+ "0.0.23",
+
"http://rubyforge.org/frs/download.php/655/ruby-dbi-all-0.0.23.tar.gz",
"ruby-dbi-all") do
FileUtils.rm_f($release_dir + "/bin/sqlsh.rb")
setup "--with=dbi,dbd_proxy,dbd_oracle,dbd_odbc"
@@ -318,8 +320,8 @@
end
Package.new("DBD/ODBC",
- "0.96",
- "http://www.ch-werner.de/rubyodbc/ruby-odbc-0.96.tar.gz")
do
+ "0.992",
+
"http://www.ch-werner.de/rubyodbc/ruby-odbc-0.992.tar.gz") do
editFile "odbc.c" do |line|
if line =~ /rb_cvar_set.*[^0-9]\);/
line.sub(/\);/, ",0);") # Patch new argument into call
@@ -382,15 +384,15 @@
mk_download_dir("tests");
Package.new("SWin",
- "030421",
-
"http://www.osk.3web.ne.jp/~nyasu/vruby/raa/vrswin030421.zip",
+ "040314",
+
"http://www.osk.3web.ne.jp/~nyasu/vruby/raa/vrswin040314.zip",
"swin") do
extconf
end
Package.new("VRuby",
- "030421",
-
"http://www.osk.3web.ne.jp/~nyasu/vruby/raa/vruby030421.zip",
+ "040306",
+
"http://www.osk.3web.ne.jp/~nyasu/vruby/raa/vruby040306.zip",
NO_DIRECTORY) do
run "echo # >> vrinstall.rb"
editFile "vrinstall.rb" do |line|
@@ -404,8 +406,8 @@
end
Package.new("log4r",
- "1.0.2",
-
"http://unc.dl.sourceforge.net/sourceforge/log4r/log4r-1.0.2.tgz") do
+ "1.0.5",
+
"http://unc.dl.sourceforge.net/sourceforge/log4r/log4r-1.0.5.tgz") do
install
doc("doc", "examples", "README",
"LICENSE")
end
Index: stable/ruby.nsi
==================================================================RCS file:
/var/cvs/rubyinstaller/installer/stable/ruby.nsi,v
retrieving revision 1.11
diff -u -r1.11 ruby.nsi
--- stable/ruby.nsi 8 May 2004 06:31:40 -0000 1.11
+++ stable/ruby.nsi 21 May 2004 17:00:30 -0000
@@ -12,7 +12,7 @@
!define RUBY_INSTALL_VERSION 13
-!define DATE "May 07, 2004"
+!define DATE "May 21, 2004"
; --- path to custom modified NSIS data files (images, etc)
!define BUILD_DATA_PATH "installer"
I will create a "bug report" for this that includes your comments and attaches you patch file. That way whoever on the team can get to it first can verify and integrate our changes. Thanks, Curt> -----Original Message----- > From: rubyinstaller-users-bounces@rubyforge.org > [mailto:rubyinstaller-users-bounces@rubyforge.org]On Behalf Of Jos > Backus > Sent: Friday, May 21, 2004 1:11 PM > To: rubyinstaller-users@rubyforge.org > Subject: [Rubyinstaller-users] Patch for installer version 13 > > > This patch: > - Adds a hopefully helpful comment on how to fix a startup problem with > running the Oracle client setup utility; > - Renames the `dvl'' target to `devel'' as that''s what the FreeBSD ports > collection uses for -devel ports; > - Updates the URLs of some of the packages, pointing to newer > versions. Note > that I have not yet checked if anything in the Package.new > block needs to be > done differently for these ports. > - ruby-opengl: updated the download URL but disabled the entry as > it triggers > an error in the builder script here. > > -- > Jos Backus _/ _/_/_/ Sunnyvale, CA > _/ _/ _/ > _/ _/_/_/ > _/ _/ _/ _/ > jos at catnook.com _/_/ _/_/_/ require ''std/disclaimer'' > > --- > Incoming mail is certified Virus Free. > Checked by AVG anti-virus system (http://www.grisoft.com). > Version: 6.0.682 / Virus Database: 444 - Release Date: 5/11/2004 >
Hello Curt, On Fri, May 21, 2004 at 01:22:27PM -0500, Curt Hibbs wrote:> I will create a "bug report" for this that includes your comments and > attaches you patch file. That way whoever on the team can get to it first > can verify and integrate our changes.I''m sorry, I could have done that. I just thought I''d send out this patch for review first. My goal is to get a HEAD (i.e. devel) version of Ruby to work using the installer, as 1.8.1 has several problems such as I have reported in the past, making it unusable for production work. It appears that HEAD is much better, so I''m going to try that next. This means I have to figure out what needs to go into the `devel'' directory so `builder devel'' works... (Microsoft is now actually using at least one Ruby utility in production. Yay.) Thank you, Jos> Thanks, > Curt > > > -----Original Message----- > > From: rubyinstaller-users-bounces@rubyforge.org > > [mailto:rubyinstaller-users-bounces@rubyforge.org]On Behalf Of Jos > > Backus > > Sent: Friday, May 21, 2004 1:11 PM > > To: rubyinstaller-users@rubyforge.org > > Subject: [Rubyinstaller-users] Patch for installer version 13 > > > > > > This patch: > > - Adds a hopefully helpful comment on how to fix a startup problem with > > running the Oracle client setup utility; > > - Renames the `dvl'' target to `devel'' as that''s what the FreeBSD ports > > collection uses for -devel ports; > > - Updates the URLs of some of the packages, pointing to newer > > versions. Note > > that I have not yet checked if anything in the Package.new > > block needs to be > > done differently for these ports. > > - ruby-opengl: updated the download URL but disabled the entry as > > it triggers > > an error in the builder script here. > > > > -- > > Jos Backus _/ _/_/_/ Sunnyvale, CA > > _/ _/ _/ > > _/ _/_/_/ > > _/ _/ _/ _/ > > jos at catnook.com _/_/ _/_/_/ require ''std/disclaimer'' > > > > --- > > Incoming mail is certified Virus Free. > > Checked by AVG anti-virus system (http://www.grisoft.com). > > Version: 6.0.682 / Virus Database: 444 - Release Date: 5/11/2004 > > > > _______________________________________________ > Rubyinstaller-users mailing list > Rubyinstaller-users@rubyforge.org > http://rubyforge.org/mailman/listinfo/rubyinstaller-users >-- Jos Backus _/ _/_/_/ Sunnyvale, CA _/ _/ _/ _/ _/_/_/ _/ _/ _/ _/ jos at catnook.com _/_/ _/_/_/ require ''std/disclaimer''
Jos Backus wrote:> > Hello Curt, > > On Fri, May 21, 2004 at 01:22:27PM -0500, Curt Hibbs wrote: > > I will create a "bug report" for this that includes your comments and > > attaches you patch file. That way whoever on the team can get > to it first > > can verify and integrate our changes. > > I''m sorry, I could have done that. I just thought I''d send out > this patch for > review first.Oops I misunderstood.> My goal is to get a HEAD (i.e. devel) version of Ruby to work using the > installer, as 1.8.1 has several problems such as I have reported > in the past, > making it unusable for production work. It appears that HEAD is > much better, > so I''m going to try that next. This means I have to figure out > what needs to > go into the `devel'' directory so `builder devel'' works...Great! We really need this. I completely ignored the development version of the build since my goal was to get to get a working release out door. Since you are taking on the task of getting the devel version working, I think it would make more sense if you joined the rubyinstaller team and I gave you CVS access so you can directly commit your changes to CVS instead of going through me or someone else with patch files (easier for both you and me). In about fifteen minutes I''m going to be out of touch until Monday (I might be able to get online, but I can''t count on it). So, I''m going to go ahead and add you as a developer on the rubyinstaller project on the assumption that this is ok with you. If you have any object to this, let me know and I''ll remove you the next time I get back online. I''ll also remove the "bug report" I just created.> (Microsoft is now actually using at least one Ruby utility in production. > Yay.)Cool! Curt
On Fri, May 21, 2004 at 02:07:16PM -0500, Curt Hibbs wrote:> Jos Backus wrote: > > My goal is to get a HEAD (i.e. devel) version of Ruby to work using the > > installer, as 1.8.1 has several problems such as I have reported > > in the past, > > making it unusable for production work. It appears that HEAD is > > much better, > > so I''m going to try that next. This means I have to figure out > > what needs to > > go into the `devel'' directory so `builder devel'' works... > > Great! We really need this.I''m thinking about the following: it would seem that the `stable'' and `devel'' targets are indicating two different types of builds. The `stable'' build is based on a downloadable tarball; the `devel'' build is based on a CVS snapshot. So I have hacked builder.rb to support this notion. The part I am uncertain about is how this affects files that need to be copied to the release area for each type, as the source retrieval process (tarball vs. CVS checkout) is orthogonal to the particular Ruby version being built. One way of handling this would be to abstract the Ruby version specific bits (like the manifest perhaps) and have the installer scripts use that interface. It''s also not completely clear to me what the roles of the various subdirectories are in the build process.> Since you are taking on the task of getting the devel version working, I > think it would make more sense if you joined the rubyinstaller team and I > gave you CVS access so you can directly commit your changes to CVS instead > of going through me or someone else with patch files (easier for both you > and me).Thanks. I''ll check in what I have once I am happy with the changes. Stay tuned. -- Jos Backus _/ _/_/_/ Sunnyvale, CA _/ _/ _/ _/ _/_/_/ _/ _/ _/ _/ jos at catnook.com _/_/ _/_/_/ require ''std/disclaimer''
Curt Hibbs
2004-May-22 01:32 UTC
[Rubyinstaller-devel] RE: [Rubyinstaller-users] Patch for installer version 13
Jos Backus wrote:> > On Fri, May 21, 2004 at 02:07:16PM -0500, Curt Hibbs wrote: > > Jos Backus wrote: > > > My goal is to get a HEAD (i.e. devel) version of Ruby to work > using the > > > installer, as 1.8.1 has several problems such as I have reported > > > in the past, > > > making it unusable for production work. It appears that HEAD is > > > much better, > > > so I''m going to try that next. This means I have to figure out > > > what needs to > > > go into the `devel'' directory so `builder devel'' works... > > > > Great! We really need this. > > I''m thinking about the following: it would seem that the `stable'' > and `devel'' > targets are indicating two different types of builds. The > `stable'' build is > based on a downloadable tarball; the `devel'' build is based on a > CVS snapshot. > So I have hacked builder.rb to support this notion. The part I am > uncertain > about is how this affects files that need to be copied to the > release area for > each type, as the source retrieval process (tarball vs. CVS checkout) is > orthogonal to the particular Ruby version being built. One way of handling > this would be to abstract the Ruby version specific bits (like > the manifest > perhaps) and have the installer scripts use that interface. > > It''s also not completely clear to me what the roles of the various > subdirectories are in the build process.I think the directory structure has simply grown somewhat haphazardly over time and someday could use a bit of refactoring. I was really tempted to do this myself when working on the last couple releases, but I knew that I didn''t have enough tome to do that and still get out a stable release before summer.> > Since you are taking on the task of getting the devel version working, I > > think it would make more sense if you joined the rubyinstaller > team and I > > gave you CVS access so you can directly commit your changes to > CVS instead > > of going through me or someone else with patch files (easier > for both you > > and me). > > Thanks. I''ll check in what I have once I am happy with the changes. Stay > tuned.Excellent! Curt