e1bea0c068
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
119 lines
4.7 KiB
Makefile
119 lines
4.7 KiB
Makefile
## Input file for automake to generate the Makefile.in used by configure
|
|
GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':'$(top_builddir)/tools/tools.zip'
|
|
|
|
# Setup the compiler to use the GNU Classpath library we just build
|
|
#if FOUND_GCJ
|
|
#JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
|
|
#else
|
|
#if FOUND_JIKES
|
|
#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
|
|
#else
|
|
if FOUND_ECJ
|
|
JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
|
|
else
|
|
if FOUND_JAVAC
|
|
JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
|
|
else
|
|
error dunno how to setup the JCOMPILER and compile
|
|
#endif
|
|
#endif
|
|
endif
|
|
endif
|
|
|
|
# All our example java source files
|
|
EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java
|
|
|
|
# The example C source & header files
|
|
EXAMPLE_C_FILES = $(srcdir)/gnu/classpath/examples/*/*.c
|
|
EXAMPLE_CH_FILES = $(srcdir)/gnu/classpath/examples/*/*.h
|
|
|
|
# The zip files with classes we want to produce.
|
|
EXAMPLE_ZIP = examples.zip
|
|
|
|
# Extra objects that will not exist until configure-time
|
|
BUILT_SOURCES = $(EXAMPLE_ZIP)
|
|
|
|
# the png icons we use in some of the examples.
|
|
EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png
|
|
EXAMPLE_ICONS += $(srcdir)/gnu/classpath/examples/icons/*.gif
|
|
|
|
# the html pages we use in the swing demo example.
|
|
EXAMPLE_HTML = $(srcdir)/gnu/classpath/examples/swing/*.html
|
|
|
|
# The example specific README files.
|
|
READMES = $(srcdir)/gnu/classpath/examples/CORBA/swing/README.html
|
|
|
|
# All the files we find "interesting"
|
|
ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_CH_FILES) $(EXAMPLE_ICONS) $(EXAMPLE_HTML) $(READMES)
|
|
|
|
# Some architecture independent data to be installed.
|
|
example_DATA = $(EXAMPLE_ZIP) README
|
|
|
|
# Where we want these data files installed.
|
|
exampledir = $(pkgdatadir)/examples
|
|
|
|
# Make sure all sources and icons are also installed so users can use them.
|
|
# (Be careful to strip off the srcdir part of the path when installing.)
|
|
install-data-local:
|
|
srcdir_cnt=`echo $(srcdir) | wc -c`; \
|
|
for file in $(ALL_EXAMPLE_FILES); do \
|
|
f=`echo $$file | cut -c$$srcdir_cnt-`; \
|
|
fdir=`dirname $$f`; \
|
|
if test ! -d $(DESTDIR)$(pkgdatadir)/examples/$$fdir; then \
|
|
echo "$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/examples/$$fdir"; \
|
|
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/examples/$$fdir; \
|
|
fi; \
|
|
echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f"; \
|
|
$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f; \
|
|
done
|
|
echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/"
|
|
echo "$(INSTALL_DATA) Makefile.java2d $(DESTDIR)$(pkgdatadir)/examples/"
|
|
$(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/
|
|
$(INSTALL_DATA) Makefile.java2d $(DESTDIR)$(pkgdatadir)/examples/
|
|
|
|
uninstall-local:
|
|
srcdir_cnt=`echo $(srcdir) | wc -c`; \
|
|
for file in $(ALL_EXAMPLE_FILES); do \
|
|
f=`echo $$file | cut -c$$srcdir_cnt-`; \
|
|
echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f"; \
|
|
rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f; \
|
|
done
|
|
echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt"
|
|
echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.java2d"
|
|
rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt
|
|
rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.java2d
|
|
|
|
# Make sure everything is included in the distribution.
|
|
EXTRA_DIST = README Makefile.jawt.in Makefile.java2d.in
|
|
dist-hook:
|
|
srcdir_cnt=`echo $(srcdir) | wc -c`; \
|
|
for file in $(ALL_EXAMPLE_FILES); do \
|
|
f=`echo $$file | cut -c$$srcdir_cnt-`; \
|
|
fdir=`dirname $$f`; \
|
|
if test ! -d $(distdir)/$$fdir; then \
|
|
echo "$(makeinstalldirs) $(distdir)/$$fdir"; \
|
|
$(mkinstalldirs) $(distdir)/$$fdir; \
|
|
fi; \
|
|
echo "cp -p $$file $(distdir)/$$f"; \
|
|
cp -p $$file $(distdir)/$$f; \
|
|
done
|
|
|
|
# To generate the example zip just depend on the sources and ignore the
|
|
# class files. Always regenerate all .class files and remove them immediatly.
|
|
# And copy the png icons we use to the classes dir so they get also included.
|
|
$(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
|
|
mkdir -p classes/gnu/classpath/examples/icons
|
|
cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
|
|
mkdir -p classes/gnu/classpath/examples/swing
|
|
cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing
|
|
$(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES)
|
|
(cd classes; \
|
|
if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi; \
|
|
if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi; \
|
|
cd ..)
|
|
rm -rf classes
|
|
|
|
# Zip file be gone! (and make sure the classes are gone too)
|
|
clean-local:
|
|
rm -rf $(EXAMPLE_ZIP) classes
|