diff -ur rubyscript2exe-0.3.4.tar.gz rubyscript2exe-0.3.5.tar.gz
diff -ur rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/CHANGELOG rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/CHANGELOG
--- rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/CHANGELOG 2005年05月21日 17:03:13.000000000 +0200
+++ rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/CHANGELOG 2005年06月03日 13:08:46.000000000 +0200
@@ -1,5 +1,18 @@
----------------------------------------------------------------
+0.3.5 - 03.06.2005
+
+* Updated to FreePascal 1.9.8 on Windows, 2.0.0 on Linux and
+ 1.9.5 on Darwin.
+
+* The exit code of your script is returned to the calling
+ application/shell.
+
+* Made some information about the environment EEE sets up
+ available to the application, e.g. executable name.
+
+----------------------------------------------------------------
+
0.3.4 - 21.05.2005
* Added --rubyscript2exe-tk (experimental).
diff -ur rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee.pas rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/eee.pas
--- rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee.pas 2005年05月21日 17:06:07.000000000 +0200
+++ rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/eee.pas 2005年06月03日 13:16:46.000000000 +0200
@@ -1,3 +1,5 @@
+program eee;
+
{$mode DELPHI}
{$IFDEF WIN32}
@@ -52,6 +54,7 @@
quotedparms : string;
justextract : boolean;
list : boolean;
+ returncode : integer;
{$IFDEF WIN32}
{$ELSE}
@@ -415,6 +418,27 @@
{**********************************************************************}
+procedure pakin_i(var zfile: gzFile; klasse: string[1]; tekst: string[255]; entry: string[255]; var t: tail);
+
+var
+ h : header;
+
+begin
+
+ entry := entry;
+
+ h.klasse := klasse;
+ h.tekst := tekst;
+ h.datalength := 0;
+
+ gzwrite(zfile, addr(h), sizeof(h));
+
+ t.number := t.number + 1;
+
+end;
+
+{**********************************************************************}
+
procedure pakin;
var
@@ -467,6 +491,7 @@
´r´: pakin_r(zfile, klasse, tekst1, tekst1, t);
´c´: pakin_c(zfile, klasse, tekst1, tekst1, t);
´t´: pakin_t(zfile, klasse, tekst1, tekst1, t);
+ ´i´: pakin_i(zfile, klasse, tekst1, tekst1, t);
end;
end;
until eof(eeefile);
@@ -565,7 +590,7 @@
p := ´-c "´ + tekst + ´"´;
{$ENDIF}
- executeprocess(c, p);
+ returncode := executeprocess(c, p);
end;
@@ -605,13 +630,35 @@
getdir2(0, dir);
chdir2(workdir);
- executeprocess(c, p);
+ returncode := executeprocess(c, p);
chdir2(dir);
end;
{**********************************************************************}
+procedure pakuit_i(var zfile: gzFile; var outfile: file; tekst: string; var h: header);
+
+var
+ infofile : Text;
+
+begin
+
+ assign(infofile, workdir + slash + tekst);
+ rewrite(infofile);
+
+ writeln(infofile, ´EEE_APPEXE=´ + paramstr(0));
+ writeln(infofile, ´EEE_EEEEXE=´ + t.exename);
+ writeln(infofile, ´EEE_TEMPDIR=´ + workdir);
+ writeln(infofile, ´EEE_PARMS=´ + parms);
+ writeln(infofile, ´EEE_QUOTEDPARMS=´ + quotedparms);
+
+ close(infofile);
+
+end;
+
+{**********************************************************************}
+
procedure pakuit;
var
@@ -653,6 +700,7 @@
´d´: pakuit_d(zfile, outfile, tekst2, h);
´c´: pakuit_c(zfile, outfile, tekst2, h);
´t´: pakuit_t(zfile, outfile, tekst2, h);
+ ´i´: pakuit_i(zfile, outfile, tekst2, h);
end;
end;
@@ -795,6 +843,8 @@
justextract := false;
list := false;
+ returncode := 0;
+
parms := ´´;
quotedparms := ´´;
for teller := 1 to paramcount do begin
@@ -866,4 +916,6 @@
recursivedelete(workdir);
+ halt(returncode);
+
end.
diff -ur rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/init.rb rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/init.rb
--- rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/init.rb 2005年05月21日 16:52:12.000000000 +0200
+++ rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/init.rb 2005年06月03日 13:16:39.000000000 +0200
@@ -98,10 +98,15 @@
oldlocation do
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)
+ system(command)
end
-load(loadscript) if File.file?(loadscript)
+unless File.file?(loadscript)
+ $stderr.puts "Couldn´t execute this command (rc=#{$?}):\n#{command}"
+ exit 16
+end
+
+load(loadscript)
Dir.mkdir(bindir2) unless File.directory?(bindir2)
Dir.mkdir(libdir2) unless File.directory?(libdir2)
@@ -168,7 +173,9 @@
$stderr.puts "Creating #{appexe} ..." unless QUIET
-File.open(tmplocation("eee.rb"), "w") do |f|
+File.open(tmplocation("bootstrap.rb"), "w") do |f|
+ f.puts "# Set up the environment"
+
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´"
@@ -184,10 +191,28 @@
f.puts "$:.clear"
f.puts "$: << lib"
-end
-File.open(tmplocation("bootstrap.rb"), "w") do |f|
+ f.puts "# Load eee.info"
+
+ f.puts "eeedir = File.dirname(__FILE__)"
+ f.puts "eeeinfo = File.expand_path(´eee.info´, eeedir)"
+ f.puts "if File.file?(eeeinfo)"
+ f.puts " File.open(eeeinfo) do |f|"
+ f.puts " while line = f.gets"
+ f.puts " k, v = line.strip.split(/\s*=\s*/, 2)"
+ f.puts " k.gsub!(/^EEE_/, ´RUBYSCRIPT2EXE_´)"
+ f.puts " v = File.expand_path(v) if k == ´RUBYSCRIPT2EXE_APPEXE´"
+ f.puts " eval(´%s=%s´ % [k, v.inspect])"
+ f.puts " end"
+ f.puts " end"
+ f.puts "end"
+
+ f.puts "# Requirements"
+
f.puts "require ´rubygems´" if RUBYSCRIPT2EXE_RUBYGEMS
+
+ f.puts "# Start the application"
+
f.puts "RUBYSCRIPT2EXE = ´#{rubyexe}´"
f.puts "load(0ドル = ARGV.shift)"
end
@@ -198,21 +223,21 @@
File.open(tmplocation("app.eee"), "w") do |f|
f.puts "r bin"
f.puts "r lib"
- f.puts "f eee.rb"
f.puts "f bootstrap.rb"
f.puts "f empty.rb"
f.puts "r app"
+ f.puts "i eee.info"
apprb = File.basename(script)
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%"
+ 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%/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%"
+ 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%/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%"
+ f.puts "c %tempdir%\\bin\\#{rubyexe} -r %tempdir1%/bootstrap.rb -T1 %tempdir1%/empty.rb %tempdir1%/app/#{apprb} %quotedparms%"
else
- f.puts "c %tempdir%\\bin\\#{rubyexe} -r %tempdir%\\eee.rb -r %tempdir%\\bootstrap.rb -T1 %tempdir%\\empty.rb %tempdir%\\app\\#{apprb} %quotedparms%"
+ f.puts "c %tempdir%\\bin\\#{rubyexe} -r %tempdir%\\bootstrap.rb -T1 %tempdir%\\empty.rb %tempdir%\\app\\#{apprb} %quotedparms%"
end
end
diff -ur rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/README rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/README
--- rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/README 2005年05月06日 17:52:21.000000000 +0200
+++ rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/README 2005年05月22日 18:09:36.000000000 +0200
@@ -8,7 +8,8 @@
[--rubyscript2exe-nostrip]
[--rubyscript2exe-tk]
-On Linux and Darwin, there´s no difference between ruby and rubyw.
+On Linux and Darwin, there´s no difference between ruby and
+rubyw.
For more information, see
http://www.erikveen.dds.nl/rubyscript2exe/index.html .
diff -ur rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/VERSION rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/VERSION
--- rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/VERSION 2005年05月21日 17:06:06.000000000 +0200
+++ rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/VERSION 2005年06月03日 13:16:46.000000000 +0200
@@ -1 +1 @@
-0.3.4
+0.3.5
Binary files rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee.exe and rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/eee.exe differ
Binary files rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eee_linux and rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/eee_linux differ
Binary files rubyscript2exe-0.3.4.tar.gz/rubyscript2exe/eeew.exe and rubyscript2exe-0.3.5.tar.gz/rubyscript2exe/eeew.exe differ