gcc/libjava/classpath/lib/mkcollections.pl.in
Matthias Klose e1bea0c068 libjava/classpath/ChangeLog.gcj:
2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.

From-SVN: r125302
2007-06-03 23:18:43 +00:00

159 lines
4.0 KiB
Perl
Executable File

#!@PERL@
#
# mkcollections.pl - small perl script to convert GNU Classpath's
# Collection classes into its own package for java 1.1
#
# USAGE: mkcollections.pl <Destination-Path>
#
# Copyright (C) 2000 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA
my $destpath=@COLLECTIONS_PREFIX@;
my $classpath=pop;
my @javalangclasses=qw(UnsupportedOperationException
Comparable
Iterable);
my @javautilclasses=qw(AbstractCollection
AbstractList
AbstractMap
AbstractSequentialList
AbstractSet
ArrayList
Arrays
List
Collection
Collections
Comparator
ConcurrentModificationException
HashMap
HashSet
Hashtable
Iterator
LinkedList
ListIterator
Map
NoSuchElementException
Random
RandomAccess
Set
SortedMap
SortedSet
TreeMap
TreeSet
Vector);
my @externalclasses=qw(AbstractQueue
ArrayDeque
Deque
NavigableMap
NavigableSet
Queue);
my $destPkg = $destpath;
$destPkg =~ s!/!.!g;
my %imports = ( "Collections" => [ "Enumeration" ],
"Hashtable" => [ "Dictionary", "Enumeration" ],
"Vector" => [ "Enumeration" ]);
sub mymkdir ($)
{
my ($dir) = @_;
if ($dir =~ /^(.*)\/\w+$/)
{
$parentdir = "$1";
if (! (-d $parentdir))
{
mymkdir ($parentdir);
}
}
print "$dir";
mkdir ($dir, 0777);
}
sub convert($$$) {
my ($file, $infile, $outfile) = @_;
open (INPUT, "<$infile") || die "Could not open ", $infile, " for reading\n";
my $dir = "$outfile";
$dir =~ /^(.*)\/\S+\.java$/ and
$dir = "$1";
if (! (-d $dir)) {
mymkdir ($dir);
}
open (OUTPUT, ">$outfile") || die "Could not open ", $outfile, " for writing\n";
print OUTPUT <<'EOF';
/* This file was converted from the GNU Classpath Project by a
* perl script, written by Jochen Hoenicke <jochen\@gnu.org>.
*/
EOF
while (<INPUT>) {
$_ = "package $destPkg;\n" if ($_ =~ /^package java.(lang|util);$/);
next if $_ =~ /^import java.io.Object.*putStream.*Field;$/;
next if $_ =~ /^import java.io.ObjectStreamField;$/;
for $clazz (@javalangclasses) {
$_ =~ s/java.lang.$clazz/$clazz/g;
}
for $clazz (@javautilclasses) {
$_ =~ s/java.util.$clazz/$clazz/g;
}
for $clazz (@externalclasses) {
$_ =~ s/java.util.$clazz/$clazz/g;
}
$_ =~ s/abstract (interface)/$1/g;
print OUTPUT $_;
if ($_ =~ /^package $destPkg;$/
&& exists $imports{$file}) {
for $imp (@{$imports{$file}}) {
print OUTPUT "import java.util.$imp;\n";
}
}
}
close (OUTPUT);
close (INPUT);
}
my $file;
for $file (@javalangclasses) {
my $infile = "$classpath/java/lang/$file.java";
my $outfile = "$destpath/$file.java";
print "$outfile\n";
convert ($file, $infile, $outfile);
}
for $file (@javautilclasses) {
my $infile = "$classpath/java/util/$file.java";
my $outfile = "$destpath/$file.java";
print "$outfile\n";
convert ($file, $infile, $outfile);
}
for $file (@externalclasses) {
my $infile = "$classpath/external/jsr166/java/util/$file.java";
my $outfile = "$destpath/$file.java";
print "$outfile\n";
convert ($file, $infile, $outfile);
}