diff -ur allinoneruby-0.2.1.tar.gz/allinoneruby/CHANGELOG allinoneruby-0.2.2.tar.gz/allinoneruby/CHANGELOG
--- allinoneruby-0.2.1.tar.gz/allinoneruby/CHANGELOG 2005-05-22 18:53:45.111079744 +0200
+++ allinoneruby-0.2.2.tar.gz/allinoneruby/CHANGELOG 2005-05-22 18:50:55.000000000 +0200
@@ -0,0 +1,63 @@
+----------------------------------------------------------------
+
+0.2.2 - 22.05.2005
+
+* Fixed a bug concerning program arguments with spaces on
+ Linux/Darwin (was OK on Windows).
+
+* Added $stdin handling on Linux/Darwin (was OK on Windows).
+
+* Added handling of the -e argument, the one of Ruby itself.
+
+* Added a search for EEE.
+
+----------------------------------------------------------------
+
+0.2.1 - 23.03.2005
+
+* newlocation is an absolute path.
+
+* ENV["TEMP"] is an absolute path.
+
+* Added --verbose.
+
+* Added --quiet.
+
+* Added --nostrip.
+
+* Added ALLINONERUBY.
+
+* Fixed the non-SH-compatible shell (e.g. TCSH) bug.
+
+* Changed the name of the generated executable on Linux from
+ allinoneruby.bin to allinoneruby_linux.
+
+* Added (experimental) support for Mac OS X (Darwin).
+
+* Added support for .dll extensions and .o extensions.
+
+----------------------------------------------------------------
+
+0.2.0 - 27.12.2004
+
+* Added support for Linux.
+
+* Added compression.
+
+* Added sitelib support.
+
+* Added --eee-list.
+
+----------------------------------------------------------------
+
+0.1.1 - 04.08.2004
+
+* Added the handling of dll´s, needed by the so´s.
+
+----------------------------------------------------------------
+
+0.1 - 30.07.2004
+
+* First release.
+
+----------------------------------------------------------------
diff -ur allinoneruby-0.2.1.tar.gz/allinoneruby/ev/oldandnewlocation.rb allinoneruby-0.2.2.tar.gz/allinoneruby/ev/oldandnewlocation.rb
--- allinoneruby-0.2.1.tar.gz/allinoneruby/ev/oldandnewlocation.rb 2005-03-26 18:12:23.000000000 +0100
+++ allinoneruby-0.2.2.tar.gz/allinoneruby/ev/oldandnewlocation.rb 2005-05-22 18:53:42.000000000 +0200
@@ -1,9 +1,10 @@
temp = File.expand_path((ENV["TMPDIR"] or ENV["TMP"] or ENV["TEMP"] or "/tmp").gsub(/\\/, "/"))
dir = "#{temp}/oldandnewlocation.#{Process.pid}"
-ENV["OLDDIR"] = Dir.pwd unless ENV.include?("OLDDIR")
-ENV["NEWDIR"] = File.expand_path(File.dirname($0)) unless ENV.include?("NEWDIR")
-ENV["TEMPDIR"] = dir unless ENV.include?("TEMPDIR")
+ENV["OLDDIR"] = Dir.pwd unless ENV.include?("OLDDIR")
+ENV["NEWDIR"] = File.expand_path(File.dirname($0)) unless ENV.include?("NEWDIR")
+ENV["OWNDIR"] = File.expand_path(File.dirname((caller[-1] or $0).gsub(/:\d+$/, ""))) unless ENV.include?("OWNDIR")
+ENV["TEMPDIR"] = dir unless ENV.include?("TEMPDIR")
class Dir
def self.rm_rf(entry)
@@ -76,6 +77,27 @@
end
begin
+ ownlocation
+rescue NameError
+ def ownlocation(file="")
+ dir = ENV["OWNDIR"]
+ res = nil
+
+ if block_given?
+ pdir = Dir.pwd
+
+ Dir.chdir(dir)
+ res = yield
+ Dir.chdir(pdir)
+ else
+ res = File.expand_path(file, dir) unless file.nil?
+ end
+
+ res
+ end
+end
+
+begin
tmplocation
rescue NameError
dir = ENV["TEMPDIR"]
diff -ur allinoneruby-0.2.1.tar.gz/allinoneruby/init.rb allinoneruby-0.2.2.tar.gz/allinoneruby/init.rb
--- allinoneruby-0.2.1.tar.gz/allinoneruby/init.rb 2005-03-23 22:49:16.000000000 +0100
+++ allinoneruby-0.2.2.tar.gz/allinoneruby/init.rb 2005-05-22 18:18:37.000000000 +0200
@@ -51,7 +51,7 @@
VERBOSE = (ARGV.include?("-v") or ARGV.include?("--verbose"))
QUIET = ((ARGV.include?("-q") or ARGV.include?("--quiet")) and not VERBOSE)
-ARGV.delete_if{|s| s =~ /^-/}
+ARGV.delete_if{|s| s =~ /^-/}
exefile = ARGV.shift
exefile = (exefile or "allinoneruby.exe") if windows? or cygwin?
@@ -75,6 +75,8 @@
rubywexe = "#{bindir1}/rubyw.exe"
end
+$stderr.puts "Copying files..." unless QUIET
+
begin
file = rubylibdir1[libdir1.length..-1].gsub(/^[\/\\]*/, "")
s1 = rubylibdir1
@@ -122,32 +124,30 @@
$stderr.puts "Creating #{appexe} ..." unless QUIET
-if linux? or darwin?
- File.open(tmplocation("eee.sh"), "w") do |f|
- f.puts "PDIR=$1;shift"
- f.puts "DIR=$(pwd)"
- f.puts "cd $PDIR"
- f.puts " chmod +x bin/ruby"
- f.puts " export PATH=$(pwd)/bin:$PATH"
- f.puts " export LD_LIBRARY_PATH=$(pwd)/bin:LD_LIBRARY_PATH" if linux?
- f.puts " export DYLD_LIBRARY_PATH=$(pwd)/bin:DYLD_LIBRARY_PATH" if darwin?
- f.puts "cd $DIR"
- f.puts "$*"
- end
-end
-
File.open(tmplocation("eee.rb"), "w") do |f|
f.puts "lib = File.expand_path(File.dirname(__FILE__)) + ´/lib´"
f.puts "lib.sub!(/^.:/, ´/cygdrive/%s´ % $&[0..0].downcase) if lib =~ /^.:/" if cygwin?
f.puts "$:.clear"
$:.each do |s|
- f.puts "$: << \"%s\"" % s.sub(libdir1, ´#{lib}´)
+ f.puts "$: << \"%s\"" % s.sub(libdir1, ´#{lib}´) unless s.include?(newlocation)
end
end
File.open(tmplocation("bootstrap.rb"), "w") do |f|
f.puts "ALLINONERUBY = ´#{rubyexe}´"
- f.puts "load($0 = ARGV.shift)"
+ f.puts "script = ARGV.shift"
+ f.puts "if script == ´-e´"
+ f.puts " command = ARGV.shift"
+ f.puts " eval(command)"
+ f.puts "else"
+ f.puts " if script.nil? or script == ´-´"
+ f.puts " command = $stdin.read"
+ f.puts " eval(command)"
+ f.puts " else"
+ f.puts " $0 = script"
+ f.puts " load(script)"
+ f.puts " end"
+ f.puts "end"
end
File.open(tmplocation("empty.rb"), "w") do |f|
@@ -156,12 +156,14 @@
File.open(tmplocation("app.eee"), "w") do |f|
f.puts "r bin"
f.puts "r lib"
- f.puts "f eee.sh" if linux? or darwin?
f.puts "f eee.rb"
f.puts "f bootstrap.rb"
f.puts "f empty.rb"
- if linux? or darwin?
- f.puts "c echo source %tempdir%/eee.sh %tempdir% %tempdir%/bin/#{rubyexe} -r %tempdir%/eee.rb -r %tempdir1%/bootstrap.rb -T1 %tempdir1%/empty.rb %quotedparms% | sh -s"
+
+ if linux?
+ f.puts "c PATH=%tempdir%/bin:$PATH ; export LD_LIBRARY_PATH=%tempdir%/bin:$LD_LIBRARY_PATH ; chmod +x %tempdir%/bin/* ; %tempdir%/bin/#{rubyexe} -r %tempdir%/eee.rb -r %tempdir%/bootstrap.rb -T %tempdir%/empty.rb %quotedparms%"
+ elsif darwin?
+ f.puts "c PATH=%tempdir%/bin:$PATH ; export DYLD_LIBRARY_PATH=%tempdir%/bin:$DYLD_LIBRARY_PATH ; chmod +x %tempdir%/bin/* ; %tempdir%/bin/#{rubyexe} -r %tempdir%/eee.rb -r %tempdir%/bootstrap.rb -T %tempdir%/empty.rb %quotedparms%"
elsif cygwin?
f.puts "c %tempdir%\\bin\\#{rubyexe} -r %tempdir1%/eee.rb -r %tempdir1%/bootstrap.rb -T1 %tempdir1%/empty.rb %quotedparms%"
else
@@ -170,6 +172,8 @@
end
from = newlocation(eeeexe)
+from = ownlocation(eeeexe) unless File.file?(from)
+from = oldlocation(eeeexe) unless File.file?(from)
to = tmplocation(eeeexe)
File.copy(from, to) unless from == to
@@ -183,6 +187,18 @@
eeebin1 = newlocation("eee_linux") if linux?
eeebin1 = newlocation("eee_darwin") if darwin?
+ unless File.file?(eeebin1)
+ eeebin1 = ownlocation("eee.exe")
+ eeebin1 = ownlocation("eee_linux") if linux?
+ eeebin1 = ownlocation("eee_darwin") if darwin?
+ end
+
+ unless File.file?(eeebin1)
+ eeebin1 = oldlocation("eee.exe")
+ eeebin1 = oldlocation("eee_linux") if linux?
+ eeebin1 = oldlocation("eee_darwin") if darwin?
+ end
+
eeebin2 = tmplocation("eee.exe")
eeebin2 = tmplocation("eee_linux") if linux?
eeebin2 = tmplocation("eee_darwin") if darwin?
@@ -200,4 +216,3 @@
to = oldlocation(appexe)
File.copy(from, to) unless from == to
-#File.chmod(0755, to) if linux? or darwin?
diff -ur allinoneruby-0.2.1.tar.gz/allinoneruby/README allinoneruby-0.2.2.tar.gz/allinoneruby/README
--- allinoneruby-0.2.1.tar.gz/allinoneruby/README 2005-03-24 10:13:09.000000000 +0100
+++ allinoneruby-0.2.2.tar.gz/allinoneruby/README 2005-05-22 18:09:04.000000000 +0200
@@ -2,7 +2,11 @@
The latter is just for playing with the internals. Both are
available on the site.
- Usage: ruby init.rb [allinoneruby.exe] [-d|-w|--ruby|--rubyw] [-s|--site] [-ns|--nostrip] [-v|-q|--verbose|--quite]
+ Usage: ruby init.rb [allinoneruby.exe]
+ [-d|-w|--ruby|--rubyw]
+ [-s|--site]
+ [-ns|--nostrip]
+ [-v|-q|--verbose|--quite]
On Linux and Darwin, there´s no difference between ruby and
rubyw.
diff -ur allinoneruby-0.2.1.tar.gz/allinoneruby/VERSION allinoneruby-0.2.2.tar.gz/allinoneruby/VERSION
--- allinoneruby-0.2.1.tar.gz/allinoneruby/VERSION 2005-03-26 18:12:22.000000000 +0100
+++ allinoneruby-0.2.2.tar.gz/allinoneruby/VERSION 2005-05-22 18:53:42.000000000 +0200
@@ -1 +1 @@
-0.2.1
+0.2.2
Binary files allinoneruby-0.2.1.tar.gz/allinoneruby/eee.exe and allinoneruby-0.2.2.tar.gz/allinoneruby/eee.exe differ
Binary files allinoneruby-0.2.1.tar.gz/allinoneruby/eee_linux and allinoneruby-0.2.2.tar.gz/allinoneruby/eee_linux differ
Binary files allinoneruby-0.2.1.tar.gz/allinoneruby/eeew.exe and allinoneruby-0.2.2.tar.gz/allinoneruby/eeew.exe differ