diff -ur rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/eee.pas rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/eee.pas
--- rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/eee.pas 2004-12-08 14:07:51.000000000 +0100
+++ rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/eee.pas 2004-12-18 18:02:07.000000000 +0100
@@ -51,6 +51,7 @@
parms : string;
quotedparms : string;
justextract : boolean;
+ list : boolean;
currentdir : string[255];
@@ -595,7 +596,7 @@
begin
- assign(infile, paramstr(0));
+ assign(infile, paramstr(0));
reset(infile, 1);
assign(outfile, t.exename);
@@ -641,6 +642,39 @@
end;
+procedure tooninhoud;
+
+begin
+
+ assign(infile, paramstr(0));
+ reset(infile, 1);
+
+ blockeat(infile, filesize(infile)-t.length);
+
+ try
+
+ for teller := 1 to t.number do begin
+ blockread(infile, h, sizeof(h));
+
+ if (h.klasse = ´f´) then begin
+ writeln(h.klasse, ´ ´, h.tekst, ´ (´, h.length, ´)´);
+ blockeat(infile, h.length);
+ end
+ else begin
+ writeln(h.klasse, ´ ´, h.tekst);
+ end;
+
+ end;
+
+ finally
+
+ close(infile);
+
+ end;
+
+end;
+
+
begin
tempdir := getenv(´TEMP´);
@@ -651,6 +685,7 @@
me := ´EEE: Dit is mijn herkennigsstring voor het herkennen van pakin of pakuit mode.´;
justextract := false;
+ list := false;
parms := ´´;
quotedparms := ´´;
@@ -659,6 +694,10 @@
justextract := true;
end;
+ if (paramstr(teller) = ´--eee-list´) then begin
+ list := true;
+ end;
+
if ((parms = ´´) and (quotedparms = ´´)) then begin
parms := paramstr(teller);
quotedparms := ´´´´ + paramstr(teller) + ´´´´;
@@ -685,7 +724,12 @@
pakhieruit;
end
else begin
- pakuit;
+ if (list) then begin
+ tooninhoud;
+ end
+ else begin
+ pakuit;
+ end;
end;
end;
diff -ur rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/require2lib.rb rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/require2lib.rb
--- rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/require2lib.rb 2004-12-08 14:07:51.000000000 +0100
+++ rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/require2lib.rb 2004-12-18 18:02:07.000000000 +0100
@@ -14,7 +14,8 @@
module Require
JUSTEV = ARGV.include?("--require2lib-justev")
- JUSTSITE = ARGV.include?("--require2lib-justsite")
+ JUSTRUBYLIB = ARGV.include?("--require2lib-justrubylib")
+ JUSTSITELIB = ARGV.include?("--require2lib-justsitelib")
VERBOSE = ARGV.include?("--require2lib-verbose")
ARGV.delete_if do |arg|
@@ -24,7 +25,8 @@
ORGDIR = Dir.pwd
THISFILE = File.expand_path(__FILE__)
LIBDIR = File.expand_path(ARGV.shift)
- SITEDIR = Config::CONFIG["sitedir"]
+ RUBYLIBDIR = Config::CONFIG["rubylibdir"]
+ SITELIBDIR = Config::CONFIG["sitelibdir"]
at_exit do
Dir.chdir(ORGDIR)
@@ -39,30 +41,73 @@
($" + $require2lib_loaded).each do |req|
if not JUSTEV or req =~ /^ev\//
- catch :found do
- $:.each do |lib|
- fromfile = File.expand_path(req, lib)
- tofile = File.expand_path(req, LIBDIR)
-
- if File.file?(fromfile)
- unless fromfile == tofile or fromfile == THISFILE
- if JUSTSITE and not fromfile.include?(SITEDIR)
- $stderr.puts "Skipped #{fromfile} ." if VERBOSE
- else
+ unless req =~ /^rubygems[\.\/]/
+ catch :found do
+ $:.each do |lib|
+ fromfile = File.expand_path(req, lib)
+ tofile = File.expand_path(req, LIBDIR)
+
+ if File.file?(fromfile)
+ unless fromfile == tofile or fromfile == THISFILE
+ if (not JUSTRUBYLIB and not JUSTSITELIB) or
+ (JUSTRUBYLIB and fromfile.include?(RUBYLIBDIR)) or
+ (JUSTSITELIB and fromfile.include?(SITELIBDIR))
+ $stderr.puts "Found #{fromfile} ." if VERBOSE
+
+ File.makedirs(File.dirname(tofile))
+ File.copy(fromfile, tofile)
+ else
+ $stderr.puts "Skipped #{fromfile} ." if VERBOSE
+ end
+ end
+
+ throw :found
+ end
+ end
+
+ $stderr.puts "Can´t find #{req} ." unless req =~ /^ev\//
+ end
+ end
+ end
+ end
+
+ if $".include?("rubygems.rb") or $".include?("rubygems.so")
+ autorequire = {}
+
+ Gem::Specification.list.each do |gem|
+
+ unless gem.autorequire.nil?
+ unless $".collect{|s| (s =~ /^#{gem.autorequire}\.\w+$/)}.compact.empty?
+ autorequire[gem.name] = gem.autorequire
+
+ gem.require_paths.flatten.each do |lib|
+ lib = File.expand_path(lib, gem.full_gem_path)
+
+ gem.files.each do |file|
+ fromfile = File.expand_path(file, gem.full_gem_path)
+ tofile = File.expand_path(file, File.dirname(LIBDIR))
+
+ if fromfile.include?(lib) and File.file?(fromfile)
$stderr.puts "Found #{fromfile} ." if VERBOSE
File.makedirs(File.dirname(tofile))
File.copy(fromfile, tofile)
end
end
-
- throw :found
end
end
-
- $stderr.puts "Can´t find #{req} ." unless req =~ /^ev\//
end
end
+
+ File.open(File.expand_path("rubygems.rb", LIBDIR), "w") do |f|
+ f.puts "module Kernel"
+ f.puts " def require_gem(file, version=nil)"
+ f.puts " autorequire = %s" % autorequire.inspect
+ f.puts " file = autorequire[file] if autorequire.include?(file)"
+ f.puts " require(file)"
+ f.puts " end"
+ f.puts "end"
+ end
end
end
end
Binary files rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/eee.bin and rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/eee.bin differ
Binary files rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/eee.exe and rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/eee.exe differ
Binary files rubyscript2exe-0.2.0.tar.gz/rubyscript2exe/eeew.exe and rubyscript2exe-0.2.1.tar.gz/rubyscript2exe/eeew.exe differ