Imported Classpath 0.18.
* sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586
This commit is contained in:
Tom Tromey
parent
9b044d1951
commit
1ea63ef8be
544 changed files with 34724 additions and 14512 deletions
|
|
@ -1,8 +1,8 @@
|
|||
# Makefile.in generated by automake 1.9.5 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.9.3 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
# 2003, 2004 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -83,8 +83,14 @@ CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
|
|||
CREATE_JNI_HEADERS_TRUE = @CREATE_JNI_HEADERS_TRUE@
|
||||
CREATE_JNI_LIBRARIES_FALSE = @CREATE_JNI_LIBRARIES_FALSE@
|
||||
CREATE_JNI_LIBRARIES_TRUE = @CREATE_JNI_LIBRARIES_TRUE@
|
||||
CREATE_QT_PEER_LIBRARIES_FALSE = @CREATE_QT_PEER_LIBRARIES_FALSE@
|
||||
CREATE_QT_PEER_LIBRARIES_TRUE = @CREATE_QT_PEER_LIBRARIES_TRUE@
|
||||
CREATE_XMLJ_LIBRARY_FALSE = @CREATE_XMLJ_LIBRARY_FALSE@
|
||||
CREATE_XMLJ_LIBRARY_TRUE = @CREATE_XMLJ_LIBRARY_TRUE@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DATE = @DATE@
|
||||
DEFS = @DEFS@
|
||||
|
|
@ -146,6 +152,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
|||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR = @MKDIR@
|
||||
MOC = @MOC@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
|
@ -157,12 +164,13 @@ PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
|
|||
PANGOFT2_LIBS = @PANGOFT2_LIBS@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
QT_CFLAGS = @QT_CFLAGS@
|
||||
QT_LIBS = @QT_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
REGEN_PARSERS_FALSE = @REGEN_PARSERS_FALSE@
|
||||
REGEN_PARSERS_TRUE = @REGEN_PARSERS_TRUE@
|
||||
REMOVE = @REMOVE@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SH = @SH@
|
||||
SHELL = @SHELL@
|
||||
STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@
|
||||
STRIP = @STRIP@
|
||||
|
|
@ -184,10 +192,13 @@ X_LIBS = @X_LIBS@
|
|||
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@
|
||||
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
#!/bin/sh
|
||||
|
||||
TMPFILE=check-jni-methods.$$.1
|
||||
TMPFILE2=check-jni-methods.$$.2
|
||||
TMPFILE3=check-jni-methods.$$.3
|
||||
# Fail if any command fails
|
||||
set -e
|
||||
# Don't override existing files
|
||||
set -C
|
||||
|
||||
TMPFILE=/tmp/check-jni-methods.$$.1
|
||||
TMPFILE2=/tmp/check-jni-methods.$$.2
|
||||
TMPFILE3=/tmp/check-jni-methods.$$.3
|
||||
|
||||
# Find all methods defined in the header files generated
|
||||
# from the java source files.
|
||||
|
|
@ -13,8 +18,19 @@ grep -h '^JNIEXPORT .* Java_' include/*.h | \
|
|||
# Find all methods in the JNI C source files.
|
||||
find native/jni -name \*.c | \
|
||||
xargs grep -h '^Java_' | \
|
||||
LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' | \
|
||||
sort > $TMPFILE2
|
||||
LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' > $TMPFILE2
|
||||
# Or in the the C++ files. (Note that cpp doesn't follow gnu conventions atm)
|
||||
# So we try to match both GNU style and some other style.
|
||||
find native/jni -name \*.cpp | \
|
||||
xargs grep -h '^Java_' | \
|
||||
LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
|
||||
find native/jni -name \*.cpp | \
|
||||
xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \
|
||||
cut -f4 -d\ | \
|
||||
LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
|
||||
mv $TMPFILE2 $TMPFILE3
|
||||
sort $TMPFILE3 > $TMPFILE2
|
||||
rm $TMPFILE3
|
||||
|
||||
# Write temporary ignore file.
|
||||
cat > $TMPFILE3 << EOF
|
||||
|
|
@ -24,23 +40,24 @@ cat > $TMPFILE3 << EOF
|
|||
EOF
|
||||
|
||||
# Compare again silently.
|
||||
diff -ub -0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | grep -q -v -f $TMPFILE3
|
||||
RESULT=$?
|
||||
|
||||
if test "$RESULT" = "0" ; then
|
||||
# Use fgrep and direct the output to /dev/null for compatibility with older
|
||||
# grep instead of using the non portable -q.
|
||||
if diff -b -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | \
|
||||
fgrep -v -f $TMPFILE3 > /dev/null;
|
||||
then
|
||||
PROBLEM=1
|
||||
echo "Found a problem with the JNI methods declared and implemented."
|
||||
echo "(-) missing in implementation, (+) missing in header files"
|
||||
|
||||
# Compare the found method lists.
|
||||
diff -ub -0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | grep -v -f $TMPFILE3
|
||||
diff -b -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | fgrep -v -f $TMPFILE3
|
||||
fi
|
||||
|
||||
# Cleanup.
|
||||
rm -f $TMPFILE $TMPFILE2 $TMPFILE3
|
||||
|
||||
if test "$RESULT" = "0" ; then
|
||||
if test "$PROBLEM" = "1" ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ sub parseOffset($) {
|
|||
}
|
||||
|
||||
# parse the time of form +/-hh:mm:ss[swguz] (:ss is optional) and return it
|
||||
# in milliseconds since midnight in local standard time
|
||||
# in milliseconds since midnight in local wall time
|
||||
my $timezonename;
|
||||
sub parseTime($$$) {
|
||||
my ($rawoffset, $stdoffset, $time) = @_;
|
||||
|
|
@ -55,11 +55,11 @@ sub parseTime($$$) {
|
|||
if ($1 eq "-") {
|
||||
$millis = -$millis;
|
||||
}
|
||||
# Normally millis is in wall time, adjust for utc and standard time.
|
||||
if ($6 =~ /[guz]/) {
|
||||
$millis += $rawoffset;
|
||||
} elsif ($6 =~ /w/) {
|
||||
print STDERR "$timezonename not in standard time\n" if $stdoffset;
|
||||
$millis -= $stdoffset;
|
||||
$millis += $rawoffset + $stdoffset;
|
||||
} elsif ($6 =~ /s/) {
|
||||
$millis += $stdoffset;
|
||||
}
|
||||
return $millis;
|
||||
}
|
||||
|
|
@ -155,7 +155,7 @@ sub parseRule($$$) {
|
|||
$time += 24*3600*1000;
|
||||
$dayoffset--;
|
||||
}
|
||||
while ($time >= 24*3600*1000) {
|
||||
while ($time > 24*3600*1000) {
|
||||
$time -= 24*3600*1000;
|
||||
$dayoffset++;
|
||||
}
|
||||
|
|
@ -331,7 +331,7 @@ for (@timezones) {
|
|||
$rawoffset = makePretty($rawoffset);
|
||||
if ($rule eq "-") {
|
||||
print <<EOF
|
||||
tz = new SimpleTimeZone($rawoffset, \"$name\");
|
||||
tz = new SimpleTimeZone($rawoffset, \"$name\");
|
||||
EOF
|
||||
} else {
|
||||
my ($endmonth, $endday, $endtime) = @{$rule->[0]};
|
||||
|
|
@ -341,24 +341,24 @@ EOF
|
|||
my $savings = $rule->[2];
|
||||
if ($savings == 3600 * 1000) {
|
||||
print <<EOF
|
||||
tz = new SimpleTimeZone
|
||||
($rawoffset, \"$name\",
|
||||
$startmonth, $startday, $starttime,
|
||||
$endmonth, $endday, $endtime);
|
||||
tz = new SimpleTimeZone
|
||||
($rawoffset, \"$name\",
|
||||
$startmonth, $startday, $starttime,
|
||||
$endmonth, $endday, $endtime);
|
||||
EOF
|
||||
} else {
|
||||
$savings = makePretty($savings);
|
||||
print <<EOF
|
||||
tz = new SimpleTimeZone
|
||||
($rawoffset, \"$name\",
|
||||
$startmonth, $startday, $starttime,
|
||||
$endmonth, $endday, $endtime, $savings);
|
||||
tz = new SimpleTimeZone
|
||||
($rawoffset, \"$name\",
|
||||
$startmonth, $startday, $starttime,
|
||||
$endmonth, $endday, $endtime, $savings);
|
||||
EOF
|
||||
}
|
||||
}
|
||||
for (@aliases) {
|
||||
print <<EOF
|
||||
timezones.put(\"$_\", tz);
|
||||
timezones0.put(\"$_\", tz);
|
||||
EOF
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ Link EST5EDT EST
|
|||
# XXX: Remove EST5EDT after java.lang.System is merged with libgcj?
|
||||
# Remove EST5EDT
|
||||
Link America/Anguilla PRT
|
||||
Link America/Buenos_Aires AGT
|
||||
Link America/Argentina/Buenos_Aires AGT
|
||||
Link America/St_Johns CNT
|
||||
Link CET ECT
|
||||
Link Africa/Cairo ART
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue