diff options
Diffstat (limited to 'libjava/classpath/lib')
| -rw-r--r-- | libjava/classpath/lib/Makefile.am | 25 | ||||
| -rw-r--r-- | libjava/classpath/lib/Makefile.in | 52 | ||||
| -rwxr-xr-x | libjava/classpath/lib/gen-classlist.sh.in | 4 | ||||
| -rw-r--r-- | libjava/classpath/lib/jazzlib/index.html | 47 | ||||
| -rwxr-xr-x | libjava/classpath/lib/jazzlib/makeJazzlibDist.sh | 121 | ||||
| -rwxr-xr-x | libjava/classpath/lib/mkdep.pl.in | 336 |
6 files changed, 52 insertions, 533 deletions
diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am index a075837..004a766 100644 --- a/libjava/classpath/lib/Makefile.am +++ b/libjava/classpath/lib/Makefile.am @@ -6,8 +6,8 @@ JAVA_DEPEND = java.dep sinclude $(JAVA_DEPEND) ## GCJ LOCAL: prune .svn directories -propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print | fgrep -v .svn) -propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print) +propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print | fgrep -v .svn) +propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print | fgrep -v .svn) ## END GCJ LOCAL iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) @@ -91,10 +91,19 @@ endif # INSTALL_CLASS_FILES .PHONY: genclasses +if USE_PREBUILT_GLIBJ_ZIP + +glibj.zip: + cp $(PATH_TO_GLIBJ_ZIP) . + +else + glibj.zip: classes compile-classes resources if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org META-INF; fi +endif # USE_PREBUILT_GLIBJ_ZIP + resources: copy-vmresources.sh if ! [ -e gnu ]; then mkdir gnu; fi if ! [ -e gnu/java ]; then mkdir gnu/java; fi @@ -117,11 +126,11 @@ resources: copy-vmresources.sh classes: genclasses -$(top_builddir)/java/util/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh - mkdir -p $(top_builddir)/java/util - $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/java/util/LocaleData.java +$(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh + mkdir -p $(top_builddir)/gnu/java/locale + $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java -genclasses: gen-classlist.sh standard.omit $(top_builddir)/java/util/LocaleData.java gen-xpath-parser +genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh standard # Only rebuild parsers when explicitly asked to. @@ -161,7 +170,7 @@ endif EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ glibj.zip classes.1 classes.2 \ - $(top_builddir)/java/util/LocaleData.java \ + $(top_builddir)/gnu/java/locale/LocaleData.java \ $(JAVA_DEPEND) clean-local: @@ -182,4 +191,4 @@ dist-hook: $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f rm -f $(distdir)/../gnu/classpath/Configuration.java - rm -f $(distdir)/../java/util/LocaleData.java + rm -f $(distdir)/../gnu/java/locale/LocaleData.java diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 1fe90d3..f4867f6 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -42,11 +42,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \ $(srcdir)/mkcollections.pl.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ - $(top_srcdir)/../../config/lead-dot.m4 \ - $(top_srcdir)/../../config/no-executables.m4 \ - $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \ - $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ + $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ + $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ @@ -76,6 +74,7 @@ CAIRO_LIBS = @CAIRO_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLASSPATH_CONVENIENCE = @CLASSPATH_CONVENIENCE@ CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@ CLASSPATH_MODULE = @CLASSPATH_MODULE@ COLLECTIONS_PREFIX = @COLLECTIONS_PREFIX@ @@ -115,6 +114,8 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ ECJ = @ECJ@ EGREP = @EGREP@ +ENABLE_LOCAL_SOCKETS_FALSE = @ENABLE_LOCAL_SOCKETS_FALSE@ +ENABLE_LOCAL_SOCKETS_TRUE = @ENABLE_LOCAL_SOCKETS_TRUE@ ERROR_CFLAGS = @ERROR_CFLAGS@ EXAMPLESDIR = @EXAMPLESDIR@ EXEEXT = @EXEEXT@ @@ -135,6 +136,7 @@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ GCJ = @GCJ@ GCJX = @GCJX@ GJDOC = @GJDOC@ +GREP = @GREP@ GTK_CAIRO_ENABLED = @GTK_CAIRO_ENABLED@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ @@ -182,6 +184,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@ PANGOFT2_LIBS = @PANGOFT2_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PATH_TO_GLIBJ_ZIP = @PATH_TO_GLIBJ_ZIP@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ QT_CFLAGS = @QT_CFLAGS@ @@ -200,8 +203,11 @@ USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@ USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@ USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@ USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@ +USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@ +USE_PREBUILT_GLIBJ_ZIP_TRUE = @USE_PREBUILT_GLIBJ_ZIP_TRUE@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +XMKMF = @XMKMF@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ XSLT_CFLAGS = @XSLT_CFLAGS@ @@ -213,8 +219,6 @@ X_PRE_LIBS = @X_PRE_LIBS@ ZIP = @ZIP@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -231,7 +235,10 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ default_toolkit = @default_toolkit@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ glibjdir = @glibjdir@ host = @host@ @@ -239,18 +246,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ -nativelibdir = @nativelibdir@ +nativeexeclibdir = @nativeexeclibdir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -261,8 +272,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ vm_classes = @vm_classes@ JAVA_DEPEND = java.dep -propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print | fgrep -v .svn) -propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print) +propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print | fgrep -v .svn) +propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print | fgrep -v .svn) iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB) @@ -279,7 +290,7 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB) EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ glibj.zip classes.1 classes.2 \ - $(top_builddir)/java/util/LocaleData.java \ + $(top_builddir)/gnu/java/locale/LocaleData.java \ $(JAVA_DEPEND) all: all-am @@ -486,9 +497,12 @@ sinclude $(JAVA_DEPEND) .PHONY: genclasses -glibj.zip: classes compile-classes resources - if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi - if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org META-INF; fi +@USE_PREBUILT_GLIBJ_ZIP_TRUE@glibj.zip: +@USE_PREBUILT_GLIBJ_ZIP_TRUE@ cp $(PATH_TO_GLIBJ_ZIP) . + +@USE_PREBUILT_GLIBJ_ZIP_FALSE@glibj.zip: classes compile-classes resources +@USE_PREBUILT_GLIBJ_ZIP_FALSE@ if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi +@USE_PREBUILT_GLIBJ_ZIP_FALSE@ if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org META-INF; fi resources: copy-vmresources.sh if ! [ -e gnu ]; then mkdir gnu; fi @@ -512,11 +526,11 @@ resources: copy-vmresources.sh classes: genclasses -$(top_builddir)/java/util/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh - mkdir -p $(top_builddir)/java/util - $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/java/util/LocaleData.java +$(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh + mkdir -p $(top_builddir)/gnu/java/locale + $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java -genclasses: gen-classlist.sh standard.omit $(top_builddir)/java/util/LocaleData.java gen-xpath-parser +genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh standard # Only rebuild parsers when explicitly asked to. @@ -560,7 +574,7 @@ dist-hook: $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f rm -f $(distdir)/../gnu/classpath/Configuration.java - rm -f $(distdir)/../java/util/LocaleData.java + rm -f $(distdir)/../gnu/java/locale/LocaleData.java # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libjava/classpath/lib/gen-classlist.sh.in b/libjava/classpath/lib/gen-classlist.sh.in index 795d7be..aeba9bf 100755 --- a/libjava/classpath/lib/gen-classlist.sh.in +++ b/libjava/classpath/lib/gen-classlist.sh.in @@ -57,8 +57,8 @@ done # Only include generated files once. if test ! "${top_builddir}" -ef "@top_srcdir@"; then echo "Adding generated files in builddir '${top_builddir}'." - # Currently the only generated files are in gnu and java. - (cd ${top_builddir}; @FIND@ gnu java -follow -name '*.java' -print) | + # Currently the only generated files are in gnu.*. + (cd ${top_builddir}; @FIND@ gnu -follow -name '*.java' -print) | sort | sed -e 's,/\([^/]*\)$, \1,' | while read pkg file; do echo $pkg $top_builddir $pkg/$file diff --git a/libjava/classpath/lib/jazzlib/index.html b/libjava/classpath/lib/jazzlib/index.html deleted file mode 100644 index 72ac816..0000000 --- a/libjava/classpath/lib/jazzlib/index.html +++ /dev/null @@ -1,47 +0,0 @@ -<html> -<head> -<title>A pure java implementation of java.util.zip library</title> -</head> -<body> -<h1>A pure java implementation of the java.util.zip library</h1> - -This project provides an implementation of the java.util.zip classes. -<br><br> -The code is pure java (no native code is used), and we aim to be compatible with existing java.util.zip implementations. Some code was borrowed from libgcj, almost all the rest was written by Jochen Hoenicke. -<br><br> -There is very similar project at <a href="http://www.jcraft.com/jzlib/index.html">http://www.jcraft.com/jzlib/index.html</a>.<br> -Another project to implement bzip2 is at <a href="http://www.aftexsw.com/aftex/products/java/bzip/">http://www.aftexsw.com/aftex/products/java/bzip/</a>. -<p> -For the latest source, see the classpath CVS repository. On this page you'll find source and binary releases of the code in both the <strong>net.sf.jazzlib</strong> and <strong>java.util.zip</strong> namespaces. -<p> -The <strong>net.sf.jazzlib</strong> namespace is useful for situations where native code isn't allowed (such as in applets) and you need to use zip files. Builds in the <strong>java.util.zip</strong> namespace have a -juz suffix. -<br> -<h3>License</h3> -This code is released under the GPL license with a special exception: -<pre> -As a special exception, if you link this library with other files to -produce an executable, this library does not by itself cause the -resulting executable to be covered by the GNU General Public License. -This exception does not however invalidate any other reasons why the -executable file might be covered by the GNU General Public License. -</pre> -<h3>Latest release is 0.07</h3> -Download source or binary packages for all releases <a href="http://sourceforge.net/project/showfiles.php?group_id=16807">here</a>. -<p> -There is a md5sums file in each release that you can use to check the integrity of the files. The md5sums is also signed with my public key (finger jewel at debian.org), the signature is in md5sums.asc. -<p> -<h3>Contact information and bug notification</h3> -You should post a message to the jazzlib-developers list (<a href="http://lists.sourceforge.net/mailman/listinfo/jazzlib-developers">subscribe</a>, <a href="http://sourceforge.net/mailarchive/forum.php?forum=jazzlib-developers">archives</a>) to report a bug or contact the developers. - -<br> -The <a href="http://savannah.gnu.org/cvs/?group_id=85">CVS repository</a> for this project is part of the <a href="http://www.gnu.org/software/classpath/">classpath</a> project. -<p> -The files in the SourceForge CVS repository should be considered to be of historical interest only. -<p> -John Leuner (jewel at pixie.co.za) <br> -13 May 2004 - -<hr> -<A href="http://sourceforge.net"> <IMG src="http://sourceforge.net/sflogo.php?group_id=16807" width="88" height="31" border="0" alt="SourceForge Logo"></A> -</body> -</html>
\ No newline at end of file diff --git a/libjava/classpath/lib/jazzlib/makeJazzlibDist.sh b/libjava/classpath/lib/jazzlib/makeJazzlibDist.sh deleted file mode 100755 index 5c75960..0000000 --- a/libjava/classpath/lib/jazzlib/makeJazzlibDist.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/zsh - -echo "----- Run this from the classpath/java/util/zip directory -----" -echo "----- -----" -echo "----- Options: -----" -echo "----- -----" -echo "----- juz -- build .tar.gz and .zip archives in java.util.zip namespace" -echo "----- jar -- build .jar file in java.util.zip and java.util.jar namespaces" -echo "----- -- build .tar.gz. and .zip archive for net.sf.jazzlib namespace" -echo "----- -----" -echo "----- Edit this script to change the release number -----" -echo "----- Do rm -rf dist when you're finished -----" -echo "----- 30 May 2002 John Leuner <jewel@debian.org> -----" - -RELEASE_NUMBER=07 - -# $1 is the archive command, eg "tar czvf" or "zip" or "jar cf" -# $2 is the archive suffix, eg ".zip" or ".tar.gz" -# $3 is the "-binary" flag, which may be empty -# $4 is the "-juz" suffix, which may be empty -# $5 is the set of files that need to be md5-summed -# $6 is the set of files in addition to $5 that are to be archived - -function create_archive { - md5sum ${=5} > md5sums - gpg --clearsign md5sums - ${=1} jazzlib${3}-0.$RELEASE_NUMBER${4}${2} ${=5} ${=6} - rm -f md5sums - rm -f md5sums.asc -} - -# $1 is the package name, ie java.util.zip or net.sf.jazzlib - -function make_javadoc { - rm -rf javadoc - mkdir javadoc - javadoc -sourcepath . -d javadoc/ $1 -} - -case "$1" in - juz) - mkdir -p dist/java/util/zip - - #make source archive - cp *.java dist/java/util/zip - pushd dist - - make_javadoc java.util.zip - - cp ../../../../COPYING . - - foo=(java/util/zip/*.java) - create_archive "tar czvf" ".tar.gz" "" "-juz" "$foo" "javadoc md5sums md5sums.asc COPYING" - create_archive "zip" ".zip" "" "-juz" "$foo" "javadoc md5sums md5sums.asc COPYING" - - popd - - #make binary distro second - cp ../../../lib/java/util/zip/*.class dist/java/util/zip - pushd dist - - foo=(java/util/zip/*.class) - create_archive "tar czvf" ".tar.gz" "-binary" "-juz" "$foo" "javadoc md5sums md5sums.asc COPYING" - create_archive "zip" ".zip" "-binary" "-juz" "$foo" "javadoc md5sums md5sums.asc COPYING" - - popd - ;; - jar) - mkdir -p dist/java/util/zip - mkdir -p dist/java/util/jar - - #make binary distro second - cp ../../../lib/java/util/zip/*.class dist/java/util/zip - cp ../../../lib/java/util/zip/../jar/*.class dist/java/util/jar - pushd dist - - cp ../../../../COPYING . - foo=(java/util/zip/*.class) - foo=($foo java/util/jar/*.class) - - create_archive "fastjar cf" ".jar" "-binary" "-juz" "$foo" "md5sums md5sums.asc COPYING" - - popd - ;; - *) - #copy files to dist directory and make net.sf.jazzlib the package name - - mkdir -p dist/net/sf/jazzlib - cp *.java dist/net/sf/jazzlib - for i in dist/net/sf/jazzlib/*.java ; do - sed -e "s/java\.util\.zip/net.sf.jazzlib/" < $i > $i.tmp ; - mv $i.tmp $i; - done - - pushd dist - - make_javadoc "net.sf.jazzlib" - - cp ../../../../COPYING . - - foo=(net/sf/jazzlib/*.java) - create_archive "tar czvf" ".tar.gz" "" "" "$foo" "javadoc md5sums md5sums.asc COPYING" - create_archive "zip" ".zip" "" "" "$foo" "javadoc md5sums md5sums.asc COPYING" - - #compile the source - javac net/sf/jazzlib/*.java - - foo=(net/sf/jazzlib/*.class) - create_archive "tar czvf" ".tar.gz" "-binary" "" "$foo" "javadoc md5sums md5sums.asc COPYING" - create_archive "zip" ".zip" "-binary" "" "$foo" "javadoc md5sums md5sums.asc COPYING" - - #back to dir - popd - - ;; -esac -ls -la dist/{*.tar.gz,*.jar,*.zip} - - - - diff --git a/libjava/classpath/lib/mkdep.pl.in b/libjava/classpath/lib/mkdep.pl.in deleted file mode 100755 index b30fd7a..0000000 --- a/libjava/classpath/lib/mkdep.pl.in +++ /dev/null @@ -1,336 +0,0 @@ -#!@PERL@ -# -# Create a dependency file for use with make that will -# a) not have duplicate entries -# b) not include the source of a file as a dependency to separate file, -# just the class of the file -# c) use jikes .u files -# d) includes classes which need native compilation via simple parsing -# to find native methods requiring use of javah - -use strict; - -my ( $dir, $dep ) = ""; -my @dirs = ( 'java', 'javax', 'gnu' ); -my ( $depout ) = "makefile.dep"; -my ( $classout ) = "classes.dep"; -my ( $headerout ) = "headers.dep"; -my ( $javaout ) = "java.dep"; -my @deps = (); -my @natives = (); -use vars qw ( $classout $headerout @dirs @deps @natives $dir $dep $depout ); - -# main -{ - if ($#ARGV == 0) - { - if ($ARGV[0] =~ /^-h/) - { - findNativeFiles(); - writeNativeFile(); - } - elsif ($ARGV[0] =~ /^-d/) - { - foreach $dir (@dirs) - { - # find all .u files recursively and parse'm - findDepFiles($dir); - } - writeDepFile(); - } - elsif ($ARGV[0] =~ /^-c/) - { - findClassFiles(); - writeClassFile(); - } - elsif ($ARGV[0] =~ /^-j/) - { - findJavaFiles(); - writeJavaFile(); - } - } - else - { - print "Usage:\n"; - print "mkdep.pl -h \tfor header files\n"; - print "mkdep.pl -c \tfor a list of classes\n"; - print "mkdep.pl -j \tfor a list of java files\n"; - print "mkdep.pl -d \tfor dependency generation from jikes .u files\n"; - } -} - -sub writeNativeFile -{ - my ($i, $j, $k, $l) = ""; - my $top_srcdir = "../"; - if (defined $ENV{'top_srcdir'}) { - $top_srcdir = $ENV{'top_srcdir'}; - } - my $top_srcdir_regex = $top_srcdir; - if ($top_srcdir_regex !~ /.*\/$/) { - $top_srcdir_regex .= '/'; - } - $top_srcdir_regex =~ s/\./\\\./g; # replace . with \. - $top_srcdir_regex =~ s/\//\\\//g; # replace / with \/ -# print "regex is $top_srcdir_regex\n"; - open(MAKEDEP, ">$headerout") || die "Could not open file ", $headerout; - - # the HEADERS = ... stuff - if ($#natives > -1) - { - print MAKEDEP "CP_HEADERS = \\", "\n"; - foreach $i (0 .. $#natives-1) - { - $j = $natives[$i]; - $j =~ s/^$top_srcdir_regex//; # remove ../ or similar - $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/reference\///; # remove vm/reference/ - $j =~ s/\//_/g; # replace / with _ - $j =~ s/\.java$/\.h/; # replace .java with .h - print MAKEDEP " \$(top_builddir)/include/", $j, " \\", "\n"; - } - $j = $natives[$#natives]; - $j =~ s/^$top_srcdir_regex//; # remove ../ - $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/reference\///; # remove vm/reference/ - $j =~ s/\//_/g; # replace / with _ - $j =~ s/\.java/\.h/; # replace .java with .h - print MAKEDEP " \$(top_builddir)/include/", $j, "\n\n"; - - # print rules to make .h files - # y/x.h : z/x.class - # y/x.h : ../z/x.java - # javah -jni z.x - # mv y_x.h $(top_srcdir)/include - - # j = y/x.h - # k = z/x.class - # k = ../z/x.java - # l = z.x - foreach $i (0 .. $#natives-1) - { - $j = $natives[$i]; - $j =~ s/^$top_srcdir_regex//; # remove ../ - $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/reference\///; # remove vm/reference/ -# $k = $l = $j; - $l = $j; - $j =~ s/\//_/g; # replace / with _ - $j =~ s/\.java$/\.h/; # replace .java with .h - - $k = $natives[$i]; # the original .java file -# $k =~ s/\.java$/\.class/; # replace .java with .class - - $l =~ s/\.java$//; # remove .class - $l =~ s/\//\./g; # replace / with . - - print MAKEDEP "\$(top_builddir)/include/", $j, " : ", $k, "\n"; - print MAKEDEP "\t\$(JAVAH) ", $l, "\n"; - print MAKEDEP "\tmv ", $j, " \$(top_builddir)/include\n\n"; - } - $j = $natives[$#natives]; - $j =~ s/^$top_srcdir_regex//; # remove ../ - $j =~ s/^(\.\.\/)+//g; # remove all preceding ../ - $j =~ s/^vm\/reference\///; # remove vm/reference/ -# $k = $l = $j; - $l = $j; - $j =~ s/\//_/g; # replace / with _ - $j =~ s/\.java/\.h/; # replace .java with .h - - $k = $natives[$#natives]; # the original .java file -# $k =~ s/\.java$/\.class/; # replace .java with .class - - $l =~ s/\.java$//; # remove .class - $l =~ s/\//\./g; # replace / with . - - print MAKEDEP "\$(top_builddir)/include/", $j, " : ", $k, "\n"; - print MAKEDEP "\t\$(JAVAH) ", $l, "\n"; - print MAKEDEP "\tmv ", $j, " \$(top_builddir)/include\n\n"; - } - close(MAKEDEP); -} - -sub writeJavaFile -{ - my ($i, $j, $class, $depend, $source, $depend_source) = ""; - - open(MAKEDEP, ">$javaout") || die "Could not open file ", $classout; - - # the JAVA_SRCS = ... stuff - if ($#natives > -1) - { - print MAKEDEP "JAVA_SRCS = \\", "\n"; - foreach $i (0 .. $#natives-1) - { - $j = $natives[$i]; - print MAKEDEP " ", $j, " \\", "\n"; - } - $j = $natives[$#natives]; - print MAKEDEP " ", $j, "\n\n"; - } - close(MAKEDEP); -} - -sub writeClassFile -{ - my ($i, $j, $class, $depend, $source, $depend_source) = ""; - - open(MAKEDEP, ">$classout") || die "Could not open file ", $classout; - - # the CLASSES = ... stuff - if ($#natives > -1) - { - print MAKEDEP "CLASSES = \\", "\n"; - foreach $i (0 .. $#natives-1) - { - $j = $natives[$i]; - $j =~ s/\.java$/\.class/; - print MAKEDEP " ", $j, " \\", "\n"; - } - $j = $natives[$#natives]; - $j =~ s/\.java$/\.class/; - print MAKEDEP " ", $j, "\n\n"; - } - close(MAKEDEP); -} - -sub writeDepFile -{ - my ($i, $j, $class, $depend, $source, $depend_source) = ""; - - open(MAKEDEP, ">$depout") || die "Could not open file ", $depout; - - # the class dependencies - foreach $i (@deps) - { - open(FILE, "<$i") || die "Could not open file ", $i, "\n"; - while(<FILE>) - { - chop; - ($class, $depend) = /(.+) : (.+)$/; - $source = $class; - $source =~ s/\.class$/\.java/; - if (($source eq $depend) || ($depend !~ /\.java$/)) - { - if ($depend =~ /^\.\.\/.+\.class$/) - { - $depend =~ s/^\.\.\///; - } - if (($depend =~ /\.java$/) && ($depend !~ /^\.\.\//)) - { - $depend = "../" . $depend; - } - print MAKEDEP $class, " : ", $depend, "\n"; - } - } - print MAKEDEP "\n"; - close(FILE); - } - close(MAKEDEP); -} - -sub findJavaFiles -{ - my ($file) = ""; - open(CLASSES, "<classes") || die "Could not open file classes\n"; - while(<CLASSES>) - { - chop; - $file = $_; - push @natives, $file; - } - close(CLASSES); -} - -sub findClassFiles -{ - my ($file) = ""; - open(CLASSES, "<classes") || die "Could not open file classes\n"; - while(<CLASSES>) - { - chop; - $file = $_; - $file =~ s/^\.\.\///; - push @natives, $file; - } - close(CLASSES); -} - -sub findNativeFiles -{ - my ($file) = ""; - open(CLASSES, "<classes") || die "Could not open file classes\n"; - while(<CLASSES>) - { - chop; - $file = $_; - if (hasNativeMethod($file)) - { - push @natives, $file; - } - - } - close(CLASSES); -} - -sub hasNativeMethod -{ - my ($file) = @_; - my ($line, $one, $two) = ""; - open(FILE, "<$file") || die "Could not open file ", $file, "\n"; - while(<FILE>) - { - chop; - $one = $two; - $two = $_; - - $line = $one . " " . $two; - if ( ($line =~ /^\s*public\s.*native\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*public\s.*native\s+\S+\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*protected\s.*native\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*protected\s.*native\s+\S+\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*private\s.*native\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*private\s.*native\s+\S+\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*abstract\s.*native\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*final\s.*native\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*synchronized\s.*native\s+\S+\s+\S+\s*\(/) || - ($line =~ /^\s*native\s.*/) ) - { - close(FILE); - return 1; - } - } - close(FILE); - return 0; -} - -sub findDepFiles -{ - - my ($dir) = @_; - my (@dirs) = (); - my (@local_deps) = (); - my (@entries) = (); - my ($i, $local_dep) = ""; - if (opendir(DIR, $dir)) - { - @entries = grep(-d "$dir/$_" && !/^\.\.?$/, readdir(DIR)); - foreach $i (@entries) - { - push @dirs, "$dir/$i"; - } - rewinddir(DIR); - @entries= grep(/\.u$/, readdir(DIR)); - closedir(DIR); - foreach $i (@entries) - { - push @local_deps, "$dir/$i"; - } - push @deps, @local_deps; - foreach $i (@dirs) - { - findDepFiles($i); - } - } -} - |