[cairo-commit] rcairo ChangeLog,1.27,1.28 setup.rb,1.2,1.3

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory gabe:/tmp/cvs-serv27263

Modified Files:
	ChangeLog setup.rb 
Log Message:
* setup.rb: update to 3.4.0.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	30 Sep 2005 02:43:30 -0000	1.27
+++ ChangeLog	30 Sep 2005 15:46:15 -0000	1.28
@@ -1,3 +1,7 @@
+2005-10-01  Kouhei Sutou  <kou at cozmixng.org>
+
+	* setup.rb: update to 3.4.0.
+
 2005-09-30  Kouhei Sutou  <kou at cozmixng.org>
 
 	* packages/cairo/lib/cairo.rb: change indentation style to

Index: setup.rb
===================================================================
RCS file: /cvs/cairo/rcairo/setup.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.rb	30 Sep 2005 02:20:33 -0000	1.2
+++ setup.rb	30 Sep 2005 15:46:15 -0000	1.3
@@ -1,7 +1,7 @@
 #
 # setup.rb
 #
-# Copyright (c) 2000-2004 Minero Aoki
+# Copyright (c) 2000-2005 Minero Aoki
 #
 # This program is free software.
 # You can distribute/modify this program under the terms of
@@ -22,176 +22,71 @@
   end
 end
[...1781 lines suppressed...]
+end   # class Installer
 
 
+class SetupError < StandardError; end
+
+def setup_rb_error(msg)
+  raise SetupError, msg
+end
+
 if $0 == __FILE__
   begin
-    if multipackage_install?
-      ToplevelInstallerMulti.invoke
-    else
-      ToplevelInstaller.invoke
-    end
+    ToplevelInstaller.invoke
   rescue SetupError
     raise if $DEBUG
     $stderr.puts $!.message