diff -ur rubyscript2exe-0.3.3.tar.gz rubyscript2exe-0.3.4.tar.gz

diff -ur rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/CHANGELOG rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/CHANGELOG
--- rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/CHANGELOG	2005年05月21日 17:06:14.434061656 +0200
+++ rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/CHANGELOG	2005年05月21日 17:03:13.000000000 +0200
@@ -0,0 +1,262 @@
+----------------------------------------------------------------
+
+0.3.4 - 21.05.2005
+
+* Added --rubyscript2exe-tk (experimental).
+
+* Added a check for the existence of
+ Config::CONFIG["bindir"]/ruby (RubyScript2Exe doesn´t work
+ without it...).
+
+* 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).
+
+* Made all files in RUBYSCRIPT2EXE_BIN available via
+ ENV["PATH"].
+
+* Added a search for EEE.
+
+----------------------------------------------------------------
+
+0.3.3 - 23.03.2005
+
+* newlocation is an absolute path.
+
+* ENV["TEMP"] is an absolute path.
+
+* Added REQUIRE2LIB.
+
+* Added RUBYSCRIPT2EXE.
+
+* Added --rubyscript2exe-nostrip.
+
+* Added RUBYSCRIPT2EXE_BIN.
+
+* Added RUBYSCRIPT2EXE_LIB.
+
+* Fixed the non-SH-compatible shell (e.g. TCSH) bug.
+
+* Changed the name of the generated executable on Linux from
+ application.bin to application_linux.
+
+* Added (experimental) support for Mac OS X (Darwin).
+
+----------------------------------------------------------------
+
+0.3.2 - 18.01.2005
+
+* Updated to FreePascal 1.9.6 .
+
+* Added --rubyscript2exe-verbose and --rubyscript2exe-quiet.
+
+* Fixed a bug concerning ENV["RUBYOPT"] on the machine of the
+ customer.
+
+* Fixed a bug concerning spaces in the path to ruby.exe (e.g.
+ "C:\Program Files\ruby\ruby.exe).
+
+* Fixed a bug concerning read-only files.
+
+----------------------------------------------------------------
+
+0.3.1 - 13.01.2005
+
+* Enhanced the support for RubyGems. (Not yet considered
+ stable.)
+
+* Added support for .dll extensions and .o extensions.
+
+* Added RUBYSCRIPT2EXE_DLLS.
+
+* Fixed a bug concerning backslashes in the tracing part.
+
+----------------------------------------------------------------
+
+0.3.0 - 27.12.2004
+
+* Added compression.
+
+* Fixed the broken call to ResHacker.
+
+* Fixed a bug concerning --eee-list in combination with rubyw.
+
+----------------------------------------------------------------
+
+0.2.1 - 18.12.2004
+
+* Added (experimental) support for detecting and embedding Ruby
+ gems.
+
+* Added --eee-list .
+
+----------------------------------------------------------------
+
+0.2.0 - 08.12.2004
+
+* Added support for Linux.
+
+* Added handling of load-ed files, besides require-d files.
+
+----------------------------------------------------------------
+
+0.1.21 - 04.08.2004
+
+* Corrected a bug concerning the length of the command line
+ (again...).
+
+* Added the handling of dll´s, needed by the so´s.
+
+* Corrected the copying of the resulting exe when using the
+ tar.gz download.
+
+----------------------------------------------------------------
+
+0.1.20 - 30.07.2004
+
+* Added support for Cygwin (Big executables!).
+
+* Corrected the handling of -I (load-path).
+
+----------------------------------------------------------------
+
+0.1.19 - 26.07.2004
+
+* Rewrite of EEE.
+
+* Added recursion to EEE, so tar.exe can be thrown away.
+
+* msvcr71.dll is always added (if it exists). Microsoft tells
+ us to do so. This makes --rubyscript2exe-msvcr71 useless.
+
+----------------------------------------------------------------
+
+0.1.18 - 27.06.2004
+
+* Added application.ico .
+
+----------------------------------------------------------------
+
+0.1.17 - 23.06.2004
+
+* Added the icon.
+
+----------------------------------------------------------------
+
+0.1.16 - 11.06.2004
+
+* Packed both ruby.exe and rubyw.exe for debugging on location.
+
+* Corrected the name of eeew.exe after unpacking.
+
+* Updated to FreePascal 1.9.4 .
+
+----------------------------------------------------------------
+
+0.1.15 - 15.05.2004
+
+* Corrected a bug in --eee-justextract.
+
+* Changed the behavior of --eee-justextract.
+
+----------------------------------------------------------------
+
+0.1.14 - 04.05.2004
+
+* Corrected a shortcoming concerning the length of the command
+ line.
+
+* Updated to FreePascal 1.9.2 .
+
+----------------------------------------------------------------
+
+0.1.13 - 28.04.2004
+
+* Added --rubyscript2exe-msvcr71.
+
+----------------------------------------------------------------
+
+0.1.12 - 24.04.2004
+
+* Added --eee-justextract.
+
+----------------------------------------------------------------
+
+0.1.11 - 26.03.2004
+
+* Got rid of an upper limit of 10M for the executable.
+
+----------------------------------------------------------------
+
+0.1.10 - 16.03.2004
+
+* Fixed a bug concerning paths with spaces. (Whose idea was
+ that?...)
+
+----------------------------------------------------------------
+
+0.1.9 - 16.02.2004
+
+* Fixed a serious bug concerning ftools. (Sorry...)
+
+----------------------------------------------------------------
+
+0.1.8 - 30.01.2004
+
+* Fixed a bug concerning the handling of chdir.
+
+----------------------------------------------------------------
+
+0.1.7 - 08.11.2003
+
+* Handling of rbw files added.
+
+* --rubyscript2exe-ruby added.
+
+----------------------------------------------------------------
+
+0.1.6 - 31.10.2003
+
+* Fixed a bug concerning quoted parameters.
+
+----------------------------------------------------------------
+
+0.1.5 - 29.10.2003
+
+* --rubyscript2exe-rubyw added.
+
+----------------------------------------------------------------
+
+0.1.4 - 20.10.2003
+
+* A problem with file locking under Windows NT has been solved.
+
+----------------------------------------------------------------
+
+0.1.3 - 19.10.2003
+
+* I tested with the latest Pascal program myself, but I
+ distributed an old one. Oops!
+
+----------------------------------------------------------------
+
+0.1.2 - 18.10.2003
+
+* Replaced the call to the external deltree by a call to an
+ internal recursive delete, because in XP (NT?) it´s not
+ called deltree but rd.
+
+----------------------------------------------------------------
+
+0.1.1 - 17.10.2003
+
+* Just removed an error message, which was not an error.
+
+----------------------------------------------------------------
+
+0.1 - 17.10.2003
+
+* First release.
+
+----------------------------------------------------------------
diff -ur rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/eee.pas rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee.pas
--- rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/eee.pas	2005年03月26日 18:10:43.000000000 +0100
+++ rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee.pas	2005年05月21日 17:06:07.000000000 +0200
@@ -32,23 +32,18 @@
 		end;
 
 var
-
 tempdir	: string[255];
 workdir	: string[255];
 workdir1	: string[255];
 workdir2	: string[255];
 workfile	: string[255];
- exename	: string[255];
 me		: string[255];
- infile	: file of byte;
- outfile	: file of byte;
- zfile		: gzFile;
+ ownfile	: file of byte;
 eeefile	: Text;
 klasse	: string[1];
 tekst1	: string[255];
 tekst2	: string;
- s		: string[255];
- i		: longint;
+ workdirnumber	: string[255];
 dir		: string[255];
 h		: header;
 t		: tail;
@@ -57,11 +52,13 @@
 quotedparms	: string;
 justextract	: boolean;
 list		: boolean;
+
 {$IFDEF WIN32}
 {$ELSE}
 currentdir	: string[255];
 {$ENDIF}
 
+{**********************************************************************}
 
 procedure getdir2(drivenr: byte; var dir: string[255]);
 
@@ -82,6 +79,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure chdir2(dir: string[255]);
 
@@ -101,6 +99,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure recursivedelete(var path: string[255]);
 
@@ -156,6 +155,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure blockeat(var infile: file; inlength: longint);
 
@@ -179,6 +179,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure blockeatfromgz(var zfile: gzFile; inlength: longint);
 
@@ -202,6 +203,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure blockcopy(var infile: file; var outfile: file; inlength: longint);
 
@@ -227,6 +229,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure blockcopytogz(var infile: file; var zfile: gzFile; inlength: longint);
 
@@ -252,6 +255,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure blockcopyfromgz(var zfile: gzFile; var outfile: file; inlength: longint);
 
@@ -277,6 +281,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakin_f(var zfile: gzFile; klasse: string[1]; tekst: string[255]; entry: string[255]; var t: tail);
 
@@ -300,6 +305,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakin_d(var zfile: gzFile; klasse: string[1]; tekst: string[255]; entry: string[255]; var t: tail);
 
@@ -320,6 +326,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakin_r(var zfile: gzFile; klasse: string[1]; tekst: string[255]; entry: string[255]; var t: tail);
 
@@ -364,6 +371,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakin_c(var zfile: gzFile; klasse: string[1]; tekst: string[255]; entry: string[255]; var t: tail);
 
@@ -384,6 +392,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakin_t(var zfile: gzFile; klasse: string[1]; tekst: string[255]; entry: string[255]; var t: tail);
 
@@ -404,15 +413,23 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakin;
 
-{$IFDEF WIN32}
-{$ELSE}
- var
+var
+ zfile		: gzFile;
+ infile	: file of byte;
+ outfile	: file of byte;
+ s		: string;
+ i		: longint;
+ exename	: string[255];
+
+ {$IFDEF WIN32}
+ {$ELSE}
 c		: string;
 p		: string;
-{$ENDIF}
+ {$ENDIF}
 
 begin
 
@@ -485,6 +502,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakuit_f(var zfile: gzFile; var outfile: file; tekst: string; var h: header);
 
@@ -499,6 +517,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakuit_d(var zfile: gzFile; var outfile: file; tekst: string; var h: header);
 
@@ -512,16 +531,17 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakuit_c(var zfile: gzFile; var outfile: file; tekst: string; var h: header);
 
 var
 c		: string;
 p		: string;
+
 {$IFDEF WIN32}
 i		: longint;
 {$ELSE}
- sr		: searchrec;
 {$ENDIF}
 
 begin
@@ -531,16 +551,6 @@
 h		:= h;
 
 {$IFDEF WIN32}
- {$ELSE}
- findfirst(workdir + ´/eee.sh´, archive, sr);
- if (doserror = 0) then begin
- c	:= ´/bin/sh´;
- p	:= ´-c "chmod +x ´ + workdir + ´/eee.sh"´;
- executeprocess(c, p);
- end;
- {$ENDIF}
-
- {$IFDEF WIN32}
 i	:= posex(´ ´, tekst);
 if (i = 0) then begin
 c	:= tekst;
@@ -551,8 +561,7 @@
 p	:= AnsiMidStr(tekst, i+1, length(tekst)-i);
 end;
 {$ELSE}
- i	:= 0;
- c	:= getenv(´SHELL´);
+ c	:= ´/bin/sh´;
 p	:= ´-c "´ + tekst + ´"´;
 {$ENDIF}
 
@@ -560,6 +569,7 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakuit_t(var zfile: gzFile; var outfile: file; tekst: string; var h: header);
 
@@ -567,10 +577,9 @@
 c		: string;
 p		: string;
 dir		: string[255];
+
 {$IFDEF WIN32}
 i		: longint;
- {$ELSE}
- sr		: searchrec;
 {$ENDIF}
 
 begin
@@ -580,16 +589,6 @@
 h		:= h;
 
 {$IFDEF WIN32}
- {$ELSE}
- findfirst(workdir + ´/eee.sh´, archive, sr);
- if (doserror = 0) then begin
- c	:= ´/bin/sh´;
- p	:= ´-c "chmod +x ´ + workdir + ´/eee.sh"´;
- executeprocess(c, p);
- end;
- {$ENDIF}
-
- {$IFDEF WIN32}
 i	:= posex(´ ´, tekst);
 if (i = 0) then begin
 c	:= tekst;
@@ -600,7 +599,7 @@
 p	:= AnsiMidStr(tekst, i+1, length(tekst)-i);
 end;
 {$ELSE}
- c	:= getenv(´SHELL´);
+ c	:= ´/bin/sh´;
 p	:= ´-c "´ + tekst + ´"´;
 {$ENDIF}
 
@@ -611,9 +610,16 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakuit;
 
+var
+ zfile		: gzFile;
+ infile	: file of byte;
+ outfile	: file of byte;
+ i		: longint;
+
 begin
 
 assign(infile, paramstr(0));
@@ -630,7 +636,7 @@
 
 zfile	:= gzopen(workfile, ´r´);
 
- for teller := 1 to t.number do begin
+ for i := 1 to t.number do begin
 gzread(zfile, addr(h), sizeof(h));
 
 klasse	:= h.klasse;
@@ -654,15 +660,21 @@
 
 end;
 
+{**********************************************************************}
 
 procedure pakhieruit;
 
-{$IFDEF WIN32}
-{$ELSE}
- var
+var
+ zfile		: gzFile;
+ infile	: file of byte;
+ outfile	: file of byte;
+ i		: longint;
+
+ {$IFDEF WIN32}
+ {$ELSE}
 c		: string;
 p		: string;
-{$ENDIF}
+ {$ENDIF}
 
 begin
 
@@ -693,7 +705,7 @@
 assign(eeefile, ´app.eee´);
 rewrite(eeefile);
 
- for teller := 1 to t.number do begin
+ for i := 1 to t.number do begin
 gzread(zfile, addr(h), sizeof(h));
 
 writeln(eeefile, h.klasse, ´ ´, h.tekst);
@@ -721,9 +733,16 @@
 
 end;
 
+{**********************************************************************}
 
 procedure tooninhoud;
 
+var
+ zfile		: gzFile;
+ infile	: file of byte;
+ outfile	: file of byte;
+ i		: longint;
+
 begin
 
 assign(infile, paramstr(0));
@@ -740,7 +759,7 @@
 
 zfile	:= gzopen(workfile, ´r´);
 
- for teller := 1 to t.number do begin
+ for i := 1 to t.number do begin
 gzread(zfile, addr(h), sizeof(h));
 
 if (h.klasse = ´f´) then begin
@@ -757,9 +776,15 @@
 
 end;
 
+{**********************************************************************}
 
 begin
 
+ {$IFDEF WIN32}
+ {$ELSE}
+ currentdir	:= ´´;
+ {$ENDIF}
+
 tempdir	:= getenv(´TEMP´);
 if (tempdir = ´´) then begin
 tempdir	:= ´/tmp´
@@ -796,9 +821,10 @@
 getdir2(0, dir);
 chdir2(tempdir);
 {$I-}
+ workdirnumber	:= ´´;
 repeat
- str(random(1000), s);
- workdir	:= ´eee.´ + s;
+ str(random(1000), workdirnumber);
+ workdir	:= ´eee.´ + workdirnumber;
 mkdir(workdir);
 until (ioresult = 0);
 {$I+}
@@ -811,11 +837,11 @@
 
 filemode	:= 0;
 
- assign(infile, paramstr(0));
- reset(infile, 1);
- blockeat(infile, filesize(infile)-sizeof(t));
- blockread(infile, t, sizeof(t));
- close(infile);
+ assign(ownfile, paramstr(0));
+ reset(ownfile, 1);
+ blockeat(ownfile, filesize(ownfile)-sizeof(t));
+ blockread(ownfile, t, sizeof(t));
+ close(ownfile);
 
 if (posex(´eeew´, lowercase(t.exename)) > 0) then begin
 list	:= false;
diff -ur rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/ev/oldandnewlocation.rb rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/ev/oldandnewlocation.rb
--- rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/ev/oldandnewlocation.rb	2005年03月26日 18:10:43.000000000 +0100
+++ rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/ev/oldandnewlocation.rb	2005年05月21日 17:06:06.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 rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/init.rb rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/init.rb
--- rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/init.rb	2005年03月23日 22:51:19.000000000 +0100
+++ rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/init.rb	2005年05月21日 16:52:12.000000000 +0200
@@ -46,6 +46,7 @@
 RUBY	= ARGV.include?("--rubyscript2exe-ruby")
 RUBYW	= ARGV.include?("--rubyscript2exe-rubyw")
 STRIP	= (not ARGV.include?("--rubyscript2exe-nostrip"))
+TK	= ARGV.include?("--rubyscript2exe-tk")
 VERBOSE	= ARGV.include?("--rubyscript2exe-verbose")
 QUIET	= (ARGV.include?("--rubyscript2exe-quiet") and not VERBOSE)
 
@@ -54,9 +55,11 @@
 script	= ARGV.shift
 
 if script.nil?
+ usagescript	= "init.rb"
+ usagescript	= "rubyscript2exe.rb"	if defined?(TAR2RUBYSCRIPT)
 $stderr.puts <<-EOF
 
-	Usage: ruby init.rb application[.rb[w]] [--rubyscript2exe-rubyw|--rubyscript2exe-ruby] [--rubyscript2exe-nostrip]
+	Usage: ruby #{usagescript} application[.rb[w]] [--rubyscript2exe-rubyw|--rubyscript2exe-ruby] [--rubyscript2exe-nostrip]
 
 	On Linux and Darwin, there´s no difference between ruby and rubyw.
 
@@ -93,10 +96,12 @@
 ENV["REQUIRE2LIB_LOADSCRIPT"]	= loadscript
 
 oldlocation do
- system(backslashes("#{bindir1}/ruby") + " #{required.join(" ")} #{libs.join(" ")} -r ´#{newlocation("require2lib.rb")}´ ´#{script}´ #{verbose} #{quiet} #{argv.join(" ")}")
+ command	= backslashes("#{bindir1}/ruby") + " #{required.join(" ")} #{libs.join(" ")} -r ´#{newlocation("require2lib.rb")}´ ´#{script}´ #{verbose} #{quiet} #{argv.join(" ")}"
+
+ system(command) or ($stderr.puts "Couldn´t execute this command:\n#{command}" ; exit 16)
 end
 
-load(loadscript)
+load(loadscript)	if File.file?(loadscript)
 
 Dir.mkdir(bindir2)	unless File.directory?(bindir2)
 Dir.mkdir(libdir2)	unless File.directory?(libdir2)
@@ -127,17 +132,19 @@
 copyto(Dir.find(libdir2, /\.(so|o|dll)$/i).collect{|file| ldds(file)}, bindir2)			if linux? or darwin?
 copyto(Dir.find(libdir2, /\.(so|o|dll)$/i).collect{|file| dlls(file, bindir1)}, bindir2)	if windows? or cygwin?
 
-#if File.file?("#{libdir2}/tk.rb")
-# $stderr.puts "Copying TCL/TK..."	unless QUIET
-#
-# require "tk"
-#
-# tcllib	= Tk::TCL_LIBRARY
-# tklib		= Tk::TK_LIBRARY
-#
-# Dir.copy(tcllib, File.expand_path(File.basename(tcllib), libdir2))
-# Dir.copy(tklib, File.expand_path(File.basename(tklib), libdir2))
-#end
+if TK or defined?(RUBYSCRIPT2EXE_TK)
+ if File.file?("#{libdir2}/tk.rb")
+ $stderr.puts "Copying TCL/TK..."	unless QUIET
+
+ require "tk"
+
+ tcllib	= Tk::TCL_LIBRARY
+ tklib	= Tk::TK_LIBRARY
+
+ Dir.copy(tcllib, File.expand_path(File.basename(tcllib), libdir2))
+ Dir.copy(tklib, File.expand_path(File.basename(tklib), libdir2))
+ end
+end
 
 if STRIP and (linux? or darwin?)
 $stderr.puts "Stripping..."	unless QUIET
@@ -161,23 +168,20 @@
 
 $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 "dir	= File.expand_path(File.dirname(__FILE__))"
+ f.puts "dir.sub!(/^.:/, ´/cygdrive/%s´ % $&[0..0].downcase)	if dir =~ /^.:/"	if cygwin?
+ f.puts "bin	= dir + ´/bin´"
+ f.puts "lib	= dir + ´/lib´"
+
+ f.puts "s	= ENV[´PATH´].dup"
+ f.puts "if Dir.pwd[1..2] == ´:/´"
+ f.puts " s << (´;´+bin.gsub(/\\//, ´\\\\´))"
+ f.puts "else"
+ f.puts " s << (´:´+bin)"
+ f.puts "end"
+ f.puts "ENV[´PATH´] = s"
+
 f.puts "$:.clear"
 f.puts "$: << lib"
 end
@@ -194,7 +198,6 @@
 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"
@@ -202,8 +205,10 @@
 
 apprb	= File.basename(script)
 
- 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 %tempdir%/app/#{apprb} %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 %tempdir%/app/#{apprb} %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 %tempdir%/app/#{apprb} %quotedparms%"
 elsif cygwin?
 f.puts "c %tempdir%\\bin\\#{rubyexe} -r %tempdir1%/eee.rb -r %tempdir1%/bootstrap.rb -T1 %tempdir1%/empty.rb %tempdir1%/app/#{apprb} %quotedparms%"
 else
@@ -212,6 +217,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
@@ -225,6 +232,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?
@@ -242,7 +261,6 @@
 to	= oldlocation(appexe)
 
 File.copy(from, to)	unless from == to
-#File.chmod(0755, to)	if linux? or darwin?
 
 oldlocation do
 system(backslashes("reshacker -modify #{tmplocation(appexe)}, #{appexe}, #{appico}, icon,appicon,"))	if File.file?(appico) and (windows? or cygwin?)
diff -ur rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/README rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/README
--- rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/README	2005年03月23日 22:33:17.000000000 +0100
+++ rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/README	2005年05月06日 17:52:21.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 application[.rb[w]] [--rubyscript2exe-rubyw|--rubyscript2exe-ruby] [--rubyscript2exe-nostrip]
+ Usage: ruby init.rb application[.rb[w]]
+ [--rubyscript2exe-ruby|--rubyscript2exe-rubyw]
+ [--rubyscript2exe-verbose|--rubyscript2exe-quiet]
+ [--rubyscript2exe-nostrip]
+ [--rubyscript2exe-tk]
 
 On Linux and Darwin, there´s no difference between ruby and rubyw.
 
diff -ur rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/VERSION rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/VERSION
--- rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/VERSION	2005年03月26日 18:10:43.000000000 +0100
+++ rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/VERSION	2005年05月21日 17:06:06.000000000 +0200
@@ -1 +1 @@
-0.3.3
+0.3.4
Binary files rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/eee.exe and rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee.exe differ
Binary files rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/eee_linux and rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee_linux differ
Binary files rubyscript2exe-0.3.3.tar.gz/rubyscript2exe/eeew.exe and rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eeew.exe differ

AltStyle によって変換されたページ (->オリジナル) /