This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch: FYI: minor makemake.tcl fixes


I'm checking this in.

This fixes a small makemake.tcl bug with the 'package' setting that I
noticed during my ecj work.  This only affects a few files in a couple
of packages, moving them into their own .lo files.

This also adds a -verbose option to makemake.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* sources.am, Makefile.in: Rebuilt.
	* scripts/makemake.tcl: Accept -verbose command-line option.
	(is_verbose): New global.
	(verbose): Use it.
	(classify_source_file): Don't special case '.' for 'package'
	type.

Index: scripts/makemake.tcl
===================================================================
--- scripts/makemake.tcl	(revision 114043)
+++ scripts/makemake.tcl	(working copy)
@@ -7,9 +7,15 @@
   unset ary(_)
 }
 
+global is_verbose
+set is_verbose 0
+
 # Verbose printer.
 proc verbose {text} {
-# puts stderr $text
+  global is_verbose
+  if {$is_verbose} {
+    puts stderr $text
+  }
 }
 
 # This maps a name to its style:
@@ -160,9 +166,9 @@
   set pkg $file
   while {1} {
     if {[info exists package_map($pkg)]} {
-      # If the entry for '.' is 'package', then set up a new entry for
-      # the file's package.
-      if {$pkg == "." && $package_map($pkg) == "package"} {
+      # If the entry is 'package', then set up a new entry for the
+      # file's package.
+      if {$package_map($pkg) == "package"} {
 	set pkg [file dirname $file]
 	set package_map($pkg) package
       }
@@ -353,6 +359,11 @@
   puts ""
 }
 
+global argv
+if {[llength $argv] > 0 && [lindex $argv 0] == "-verbose"} {
+  set is_verbose 1
+}
+
 # Read the proper .omit files.
 read_omit_file standard.omit.in
 read_omit_file classpath/lib/standard.omit


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]