From a63c2657c94913d72b3cd388730d61edcb09fc69 Mon Sep 17 00:00:00 2001 From: tromey Date: Sat, 16 Jul 2005 01:27:14 +0000 Subject: Major merge with Classpath. Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102082 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/scripts/classes.pl | 44 +----- libjava/scripts/makemake.tcl | 357 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 363 insertions(+), 38 deletions(-) create mode 100755 libjava/scripts/makemake.tcl (limited to 'libjava/scripts') diff --git a/libjava/scripts/classes.pl b/libjava/scripts/classes.pl index 7e77c59227e..d231ea4f7ba 100644 --- a/libjava/scripts/classes.pl +++ b/libjava/scripts/classes.pl @@ -1,17 +1,15 @@ # classes.pl - A perl program to generate most of the contents of # javaprims.h automatically. -# Copyright (C) 1998, 1999, 2000, 2002 Red Hat, Inc. +# Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation # -# This file is part of libjava. +# This file is part of libgcj. # # This software is copyrighted work licensed under the terms of the -# Libjava License. Please consult the file "LIBJAVA_LICENSE" for +# Libgcj License. Please consult the file "LIBGCJ_LICENSE" for # details. -# Usage: cd ; perl classes.pl. -# Can also be run from the `include' directory; this lets us -# more easily insert the output into javaprims.h (which is where it goes). +# Usage: cd /classpath/lib ; perl classes.pl. use DirHandle; @@ -62,38 +60,8 @@ sub scan push (@subdirs, $name); next; } - next unless $name =~ /\.java$/; - - open (FILE, "< $dir/$name"); - local ($outer, $classname); - while () - { - s,//.*$,,; - # NOTE: we don't skip `/*' comments. However, we do - # skip lines with a `*' with leading whitespace. This - # catches the most important cases. - s,^\s*\*.*$,,; - - # For now assume that class names start with upper - # case letter. - next unless /\b(class|interface) ([A-Z][A-Za-z0-9]+)/; - $classname = $2; - - # We assume the code is properly indented, so that we - # can print inner classes properly. - if (/^\s/) - { - die "no outer class for $classname in $dir/$name" - unless $outer; - $classes{$outer . "\$" . $classname} = 1; - } - else - { - $classes{$classname} = 1; - $outer = $classname; - } - } - close (FILE); + next unless $name =~ s/\.class$//; + $classes{$name} = 1; } undef $d; diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl new file mode 100755 index 00000000000..0a87fb56ee4 --- /dev/null +++ b/libjava/scripts/makemake.tcl @@ -0,0 +1,357 @@ +#!/usr/bin/tclsh + +# Helper to enforce array-ness. +proc makearray {name} { + upvar $name ary + set ary(_) 1 + unset ary(_) +} + +# Verbose printer. +proc verbose {text} { +# puts stderr $text +} + +# This maps a name to its style: +# * bc objects in this package and all its sub-packages +# are to be compiled with the BC ABI. It is an error +# for sub-packages to also appear in the map. +# * package +# objects in this package (and possibly sub-packages, +# if they do not appear in the map) will be compiled en masse +# from source into a single object, using the C++ ABI. +# * ordinary +# objects in this package (and possibly sub-packages +# if they do not appear in the map) will be compiled one at +# a time into separate .o files. +# * ignore +# objects in this package are not used. Note however that +# most ignored files are actually handled by listing them in +# 'standard.omit' +# +# If a package does not appear in the map, the default is 'package'. +global package_map +set package_map(.) package + +# These are ignored in Classpath. +set package_map(gnu/test) ignore +set package_map(gnu/javax/swing/plaf/gtk) ignore + +set package_map(gnu/xml) bc +set package_map(javax/imageio) bc +set package_map(javax/xml) bc +set package_map(gnu/java/beans) bc +set package_map(gnu/java/awt/peer/gtk) bc +set package_map(org/xml) bc +set package_map(org/w3c) bc + +# This is handled specially by the Makefile. +# We still want it byte-compiled so it isn't in the .omit file. +set package_map(gnu/gcj/tools/gcj_dbtool/Main.java) ignore + +# These are handled specially. If we list Class.java with other files +# in java.lang, we hit a compiler bug. +set package_map(java/lang/Class.java) ignore +set package_map(java/lang/Object.java) ignore + +# More special cases. These end up in their own library. +# Note that if we BC-compile AWT we must update these as well. +set package_map(gnu/gcj/xlib) ignore +set package_map(gnu/awt/xlib) ignore + +# Some BC ABI packages have classes which must not be compiled BC. +# This maps such packages to a grep expression for excluding such +# classes. +global exclusion_map +makearray exclusion_map +# set exclusion_map(java/awt) AWTPermission + +# This maps a package name to a list of corresponding .java file base +# names. The package name will either appear as a key in package_map, +# or it will be '.' for the default. +global name_map +makearray name_map + +# This maps a java file base name, like 'java/lang/Object.java', to +# the source directory in which it resides. We keep a layer of +# indirection here so that we can override sources in Classpath with +# our own sources. +global dir_map +makearray dir_map + +# List of all '@' files that we are going to compile. +set package_files {} + +# List of all header file variables. +set header_vars {} + +# List of all BC object files. +set bc_objects {} + +# List of regexps for matching ignored files. +set ignore_rx_list {} + + +# Return true if a given file should be ignored. +# The argument is the path name including the package part. +proc ignore_file_p {file} { + global ignore_rx_list + foreach rx $ignore_rx_list { + if {[regexp -- $rx $file]} { + verbose "ignoring $file for $rx" + return 1 + } + } + return 0 +} + +# Read a '.omit' file and update the internal data structures. +proc read_omit_file {name} { + global ignore_rx_list + set fd [open $name r] + while {! [eof $fd]} { + set line [gets $fd] + + # Classpath's entries bogusly start with "../". + if {[string match ../* $line]} { + set line [string range $line 3 end] + } + + if {$line != ""} { + lappend ignore_rx_list $line + } + } + close $fd +} + +# Classify a single source file. +proc classify_source_file {basedir file} { + global package_map name_map dir_map + + if {[ignore_file_p $file]} { + return + } + + set seen [info exists dir_map($file)] + set dir_map($file) $basedir + 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"} { + set pkg [file dirname $file] + set package_map($pkg) package + } + verbose "classify succeeded: $file -> $pkg" + if {! $seen} { + lappend name_map($pkg) $file + } + return + } + set pkg [file dirname $pkg] + } + error "can't happen" +} + +# Scan a directory and its subdirectories for .java source files. +# Note that we keep basedir and subdir separate so we can properly +# update our global data structures. +proc scan_directory {basedir subdir} { + global dir_map + + set subdirs {} + set files {} + set here [pwd] + cd $basedir/$subdir + foreach file [lsort [glob *]] { + if {[string match *.java $file]} { + lappend files $subdir/$file + } elseif {[file isdirectory $file]} { + lappend subdirs $subdir/$file + } + } + cd $here + + # Recurse first, so that we don't create new packages too eagerly. + foreach dir $subdirs { + scan_directory $basedir $dir + } + + foreach file $files { + classify_source_file $basedir $file + } +} + +# Scan known packages beneath the base directory for .java source +# files. +proc scan_packages {basedir} { + foreach subdir {gnu java javax org} { + if {[file exists $basedir/$subdir]} { + scan_directory $basedir $subdir + } + } +} + +# Emit a rule for a 'bc' package. +proc emit_bc_rule {package} { + global package_map exclusion_map bc_objects + + if {$package == "."} { + set pkgname ordinary + } else { + set pkgname $package + } + set varname [join [split $pkgname /] _]_source_files + set loname [join [split $pkgname /] -].lo + + puts "$loname: \$($varname)" + puts "\t\$(LTGCJCOMPILE) -fjni -findirect-dispatch -c -o $loname \\" + set omit "" + if {[info exists exclusion_map($package)]} { + set omit "| grep -v $exclusion_map($package)" + } + # classpath was built first, so the class files are to be found + # there. + puts "\t\t`find classpath/lib/$package -name '*.class' | sort -r$omit`" + puts "" + + # We skip this one because it is built into its own library and is + # handled specially in Makefile.am. + if {$loname != "gnu-java-awt-peer-gtk.lo"} { + lappend bc_objects $loname + } +} + +# Emit a rule for a 'package' package. +proc emit_package_rule {package} { + global package_map exclusion_map package_files + + if {$package == "."} { + set pkgname ordinary + } else { + set pkgname $package + } + set varname [join [split $pkgname /] _]_source_files + set base $pkgname + set lname $base.list + set dname $base.deps + + # A rule to make the phony file we are going to compile. + puts "$lname: \$($varname)" + puts "\t@for file in \$($varname); do \\" + puts "\t if test -f \$(srcdir)/\$\$file; then \\" + puts "\t echo \$(srcdir)/\$\$file; \\" + puts "\t else echo \$\$file; fi; \\" + puts "\tdone > $lname" + puts "" + puts "-include $dname" + puts "" + puts "" + + lappend package_files $lname +} + +# Emit a source file variable for a package, and corresponding header +# file variable, if needed. +proc emit_source_var {package} { + global package_map name_map dir_map header_vars + + if {$package == "."} { + set pkgname ordinary + } else { + set pkgname $package + } + set uname [join [split $pkgname /] _] + set varname ${uname}_source_files + puts -nonewline "$varname =" + + makearray dirs + foreach base [lsort $name_map($package)] { + # Terminate previous line. + puts " \\" + # Having files start with './' is ugly and confuses the automake + # "dirstamp" code; see automake PR 461. + set ndir $dir_map($base)/ + if {$ndir == "./"} { + set ndir "" + } + puts -nonewline "${ndir}${base}" + set dirs($dir_map($base)) 1 + } + puts "" + puts "" + + if {$package_map($package) != "bc"} { + # Ugly code to build up the appropriate patsubst. + set result "\$(patsubst %.java,%.h,\$($varname))" + foreach dir [lsort [array names dirs]] { + set result "\$(patsubst $dir/%,%,$result)" + } + + if {$package == "." || $package == "java/lang"} { + # Ugly hack. + set result "\$(filter-out java/lang/Object.h java/lang/Class.h,$result)" + } + + puts "${uname}_header_files = $result" + lappend header_vars "${uname}_header_files" + puts "" + } +} + +# Pretty-print a Makefile variable. +proc pp_var {name valueList {pre ""} {post ""}} { + puts "" + puts -nonewline "$name =" + foreach val $valueList { + puts " \\" + puts -nonewline " ${pre}${val}${post}" + } + puts "" +} + +# Read the proper .omit files. +read_omit_file standard.omit +read_omit_file classpath/lib/standard.omit + +# Scan classpath first. +scan_packages classpath +scan_packages classpath/external/sax +scan_packages classpath/external/w3c_dom +# Now scan our own files; this will correctly override decisions made +# when scanning classpath. +scan_packages . +# Files created by the build. +classify_source_file . java/lang/ConcreteProcess.java +classify_source_file classpath java/util/LocaleData.java +classify_source_file classpath gnu/classpath/Configuration.java + +puts "## This file was automatically generated by scripts/makemake.tcl" +puts "## Do not edit!" +puts "" + +foreach package [lsort [array names package_map]] { + if {$package_map($package) == "ignore"} { + continue + } + if {! [info exists name_map($package)]} { + continue + } + + emit_source_var $package + + if {$package_map($package) == "bc"} { + emit_bc_rule $package + } elseif {$package_map($package) == "ordinary"} { + # Nothing in particular to do here. + } elseif {$package_map($package) == "package"} { + emit_package_rule $package + } else { + error "unrecognized type: $package_map($package)" + } +} + +pp_var all_packages_source_files $package_files +pp_var ordinary_header_files $header_vars "\$(" ")" +pp_var bc_objects $bc_objects -- cgit v1.2.3