2005-07-16 03:27:14 +02:00
|
|
|
#!/usr/bin/tclsh
|
|
|
|
|
|
|
|
# Helper to enforce array-ness.
|
|
|
|
proc makearray {name} {
|
|
|
|
upvar $name ary
|
|
|
|
set ary(_) 1
|
|
|
|
unset ary(_)
|
|
|
|
}
|
|
|
|
|
2006-05-24 21:38:05 +02:00
|
|
|
global is_verbose
|
|
|
|
set is_verbose 0
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# Verbose printer.
|
|
|
|
proc verbose {text} {
|
2006-05-24 21:38:05 +02:00
|
|
|
global is_verbose
|
|
|
|
if {$is_verbose} {
|
|
|
|
puts stderr $text
|
|
|
|
}
|
2005-07-16 03:27:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
# 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.
|
2007-02-16 14:51:04 +01:00
|
|
|
# * bcheaders
|
|
|
|
# as bc, but generate header files and compile with CNI.
|
2005-07-16 03:27:14 +02:00
|
|
|
# * 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'
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
# * interpreter
|
|
|
|
# objects in this package (and possibly sub-packages,
|
|
|
|
# if they do not appear in the map) are only compiled if
|
|
|
|
# the interpreter is enabled. They are compiled as with the
|
|
|
|
# 'package' specifier.
|
2005-07-16 03:27:14 +02:00
|
|
|
#
|
|
|
|
# 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
|
2007-02-15 18:25:24 +01:00
|
|
|
set package_map(gnu/gcj/tools/gc_analyze) ignore
|
2005-07-16 03:27:14 +02:00
|
|
|
|
2006-03-29 18:31:53 +02:00
|
|
|
set package_map(gnu/java/awt/peer/swing) bc
|
2006-03-10 22:46:48 +01:00
|
|
|
|
2007-02-02 02:33:01 +01:00
|
|
|
set package_map(gnu/xml/aelfred2) bc
|
|
|
|
set package_map(gnu/xml/dom) bc
|
|
|
|
set package_map(gnu/xml/libxmlj) bc
|
|
|
|
set package_map(gnu/xml/pipeline) bc
|
|
|
|
set package_map(gnu/xml/stream) bc
|
|
|
|
set package_map(gnu/xml/transform) bc
|
|
|
|
set package_map(gnu/xml/util) bc
|
|
|
|
set package_map(gnu/xml/validation) bc
|
|
|
|
set package_map(gnu/xml/xpath) bc
|
2005-07-16 03:27:14 +02:00
|
|
|
set package_map(javax/imageio) bc
|
|
|
|
set package_map(javax/xml) bc
|
|
|
|
set package_map(gnu/java/beans) bc
|
2007-01-09 20:58:05 +01:00
|
|
|
set package_map(gnu/java/awt/dnd/peer/gtk) bc
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-15 01:12:35 +02:00
|
|
|
set package_map(gnu/java/util/prefs/gconf) bc
|
2005-07-16 03:27:14 +02:00
|
|
|
set package_map(gnu/java/awt/peer/gtk) bc
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-15 01:12:35 +02:00
|
|
|
set package_map(gnu/java/awt/dnd/peer/gtk) bc
|
2005-09-23 23:31:04 +02:00
|
|
|
set package_map(gnu/java/awt/peer/qt) bc
|
2007-01-09 20:58:05 +01:00
|
|
|
set package_map(gnu/java/awt/peer/x) bc
|
|
|
|
set package_map(gnu/java/util/prefs/gconf) bc
|
2005-11-08 15:56:42 +01:00
|
|
|
set package_map(gnu/javax/sound/midi) bc
|
2005-07-16 03:27:14 +02:00
|
|
|
set package_map(org/xml) bc
|
|
|
|
set package_map(org/w3c) bc
|
2006-03-29 22:13:23 +02:00
|
|
|
set package_map(org/relaxng) bc
|
2005-11-25 23:30:53 +01:00
|
|
|
set package_map(javax/rmi) bc
|
|
|
|
set package_map(org/omg) bc
|
|
|
|
set package_map(gnu/CORBA) bc
|
|
|
|
set package_map(gnu/javax/rmi) bc
|
2007-02-16 14:51:04 +01:00
|
|
|
set package_map(gnu/java/lang/management) bcheaders
|
|
|
|
set package_map(java/lang/management) bc
|
|
|
|
set package_map(gnu/classpath/management) bc
|
|
|
|
set package_map(gnu/javax/management) bc
|
2005-07-16 03:27:14 +02:00
|
|
|
|
2007-01-31 22:23:44 +01:00
|
|
|
# parser/HTML_401F.class is really big, and there have been complaints
|
|
|
|
# about this package requiring too much memory to build. So, we
|
|
|
|
# compile it as separate objects. But, we're careful to compile the
|
|
|
|
# sub-packages as packages.
|
|
|
|
set package_map(gnu/javax/swing/text/html/parser) ordinary
|
|
|
|
set package_map(gnu/javax/swing/text/html/parser/models) package
|
|
|
|
set package_map(gnu/javax/swing/text/html/parser/support) package
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# More special cases. These end up in their own library.
|
|
|
|
# Note that if we BC-compile AWT we must update these as well.
|
2005-07-21 01:39:44 +02:00
|
|
|
set package_map(gnu/gcj/xlib) package
|
|
|
|
set package_map(gnu/awt/xlib) package
|
2005-07-16 03:27:14 +02:00
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
# These packages should only be included if the interpreter is
|
|
|
|
# enabled.
|
|
|
|
set package_map(gnu/classpath/jdwp) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/event) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/event/filters) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/exception) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/id) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/processor) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/transport) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/util) interpreter
|
|
|
|
set package_map(gnu/classpath/jdwp/value) interpreter
|
|
|
|
set package_map(gnu/gcj/jvmti) interpreter
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# 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
|
|
|
|
|
2006-05-18 20:59:03 +02:00
|
|
|
# An entry in this map means that all .properties files in the
|
|
|
|
# corresponding directory should be ignored.
|
|
|
|
global properties_map
|
|
|
|
makearray properties_map
|
|
|
|
|
|
|
|
# logging.properties is installed and is editable.
|
|
|
|
set properties_map(java/util/logging) _
|
|
|
|
# We haven't merged locale resources yet.
|
|
|
|
set properties_map(gnu/java/locale) _
|
|
|
|
|
2007-03-09 23:10:49 +01:00
|
|
|
# We want to be able to load xerces if it is on the class path. So,
|
|
|
|
# we have to avoid compiling in the XML-related service files.
|
|
|
|
set properties_map(META-INF/services/javax.xml.parsers.DocumentBuilderFactory) _
|
|
|
|
set properties_map(META-INF/services/javax.xml.parsers.SAXParserFactory) _
|
|
|
|
set properties_map(META-INF/services/javax.xml.parsers.TransformerFactory) _
|
|
|
|
set properties_map(META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory) _
|
|
|
|
set properties_map(META-INF/services/org.w3c.dom.DOMImplementationSourceList) _
|
|
|
|
set properties_map(META-INF/services/org.xml.sax.driver) _
|
2006-05-18 20:59:03 +02:00
|
|
|
|
|
|
|
# List of all properties files.
|
|
|
|
set properties_files {}
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# List of all '@' files that we are going to compile.
|
|
|
|
set package_files {}
|
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
# List of all '@' files that we are going to compile if the
|
|
|
|
# interpreter is enabled.
|
|
|
|
set interpreter_package_files {}
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# List of all header file variables.
|
|
|
|
set header_vars {}
|
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
# List of all header file variables for interpreter packages.
|
|
|
|
set interpreter_header_vars {}
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# 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)]} {
|
2006-05-24 21:38:05 +02:00
|
|
|
# If the entry is 'package', then set up a new entry for the
|
|
|
|
# file's package.
|
|
|
|
if {$package_map($pkg) == "package"} {
|
2005-07-16 03:27:14 +02:00
|
|
|
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"
|
|
|
|
}
|
|
|
|
|
2006-05-18 20:59:03 +02:00
|
|
|
# Scan a directory and its subdirectories for .java source files or
|
|
|
|
# .properties files. Note that we keep basedir and subdir separate so
|
|
|
|
# we can properly update our global data structures.
|
2005-07-16 03:27:14 +02:00
|
|
|
proc scan_directory {basedir subdir} {
|
2006-05-18 20:59:03 +02:00
|
|
|
global dir_map properties_map properties_files
|
2005-07-16 03:27:14 +02:00
|
|
|
|
|
|
|
set subdirs {}
|
|
|
|
set files {}
|
|
|
|
set here [pwd]
|
|
|
|
cd $basedir/$subdir
|
2005-11-16 00:20:01 +01:00
|
|
|
foreach file [lsort [glob -nocomplain *]] {
|
2005-07-16 03:27:14 +02:00
|
|
|
if {[string match *.java $file]} {
|
|
|
|
lappend files $subdir/$file
|
2006-05-18 20:59:03 +02:00
|
|
|
} elseif {[string match *.properties $file]} {
|
|
|
|
if {! [info exists properties_map($subdir)]} {
|
|
|
|
# We assume there aren't any overrides.
|
|
|
|
lappend properties_files $basedir/$subdir/$file
|
|
|
|
}
|
2007-05-03 21:02:52 +02:00
|
|
|
} elseif {[string match *.css $file]} {
|
|
|
|
# Special case for default.css needed by javax.swing.text.html.
|
|
|
|
lappend properties_files $basedir/$subdir/$file
|
2005-07-16 03:27:14 +02:00
|
|
|
} elseif {[file isdirectory $file]} {
|
|
|
|
lappend subdirs $subdir/$file
|
2006-05-18 20:59:03 +02:00
|
|
|
} elseif {$subdir == "META-INF/services"} {
|
2007-03-09 23:10:49 +01:00
|
|
|
# Service files are generally included as properties.
|
|
|
|
if {! [info exists properties_map($subdir/$file)]} {
|
|
|
|
lappend properties_files $basedir/$subdir/$file
|
|
|
|
}
|
2005-07-16 03:27:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
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} {
|
Makefile.am (AM_CXXFLAGS): Define ECJ_JAR_FILE.
2007-03-13 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (AM_CXXFLAGS): Define ECJ_JAR_FILE.
* classpath/configure.ac: Add --with-ecj-jar configure option.
* classpath/gnu/classpath/Configuration.java.in (ECJ_JAR): New
field.
* classpath/INSTALL: Document --with-ecj-jar configure option and
ecj jar requirement for com.sun.tools.javac support.
* classpath/tools/Makefile.am: Build decendents of com and sun
directories.
* configure.ac: Substitute ECJ_JAR in stub Configuration.java.
* gnu/classpath/Configuration.java,
gnu/classpath/natConfiguration.cc (ecj): New method.
(ECJ_JAR): New field.
* scripts/makemake.tcl (scan_packages): Add com directory.
* sources.am (property_files): Add
classpath/resource/sun/rmi/rmic/messages.properties and
classpath/resource/com/sun/tools/javac/messages.properties.
* classpath/resource/com, classpath/resource/com/sun,
classpath/resource/com/sun/tools,
classpath/resource/com/sun/tools/javac, classpath/resource/sun,
classpath/resource/sun/rmi, classpath/resource/sun/rmi/rmic,
classpath/tools/classes/com, classpath/tools/classes/com/sun,
classpath/tools/classes/com/sun/javadoc,
classpath/tools/classes/com/sun/tools,
classpath/tools/classes/com/sun/tools/doclets,
classpath/tools/classes/sun, classpath/tools/classes/sun/rmi,
classpath/tools/classes/sun/rmi/rmic, classpath/tools/com,
classpath/tools/com/sun, classpath/tools/com/sun/javadoc,
classpath/tools/com/sun/tools,
classpath/tools/com/sun/tools/doclets,
classpath/tools/com/sun/tools/javac, classpath/tools/sun,
classpath/tools/sun/rmi, classpath/tools/sun/rmi/rmic: New
directories.
* classpath/resource/com/sun/tools/javac/messages.properties,
classpath/resource/sun/rmi/rmic/messages.properties,
classpath/tools/classes/com/sun/javadoc/ClassDoc.class,
classpath/tools/classes/com/sun/javadoc/ConstructorDoc.class,
classpath/tools/classes/com/sun/javadoc/Doc.class,
classpath/tools/classes/com/sun/javadoc/DocErrorReporter.class,
classpath/tools/classes/com/sun/javadoc/Doclet.class,
classpath/tools/classes/com/sun/javadoc/ExecutableMemberDoc.class,
classpath/tools/classes/com/sun/javadoc/FieldDoc.class,
classpath/tools/classes/com/sun/javadoc/MemberDoc.class,
classpath/tools/classes/com/sun/javadoc/MethodDoc.class,
classpath/tools/classes/com/sun/javadoc/PackageDoc.class,
classpath/tools/classes/com/sun/javadoc/ParamTag.class,
classpath/tools/classes/com/sun/javadoc/Parameter.class,
classpath/tools/classes/com/sun/javadoc/ProgramElementDoc.class,
classpath/tools/classes/com/sun/javadoc/RootDoc.class,
classpath/tools/classes/com/sun/javadoc/SeeTag.class,
classpath/tools/classes/com/sun/javadoc/SerialFieldTag.class,
classpath/tools/classes/com/sun/javadoc/SourcePosition.class,
classpath/tools/classes/com/sun/javadoc/Tag.class,
classpath/tools/classes/com/sun/javadoc/ThrowsTag.class,
classpath/tools/classes/com/sun/javadoc/Type.class,
classpath/tools/classes/com/sun/javadoc/TypeVariable.class,
classpath/tools/classes/com/sun/tools/doclets/Taglet.class,
classpath/tools/classes/sun/rmi/rmic/Main.class,
classpath/tools/classes/sun/rmi/rmic/Messages.class,
classpath/tools/com/sun/javadoc/ClassDoc.java,
classpath/tools/com/sun/javadoc/ConstructorDoc.java,
classpath/tools/com/sun/javadoc/Doc.java,
classpath/tools/com/sun/javadoc/DocErrorReporter.java,
classpath/tools/com/sun/javadoc/Doclet.java,
classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java,
classpath/tools/com/sun/javadoc/FieldDoc.java,
classpath/tools/com/sun/javadoc/MemberDoc.java,
classpath/tools/com/sun/javadoc/MethodDoc.java,
classpath/tools/com/sun/javadoc/PackageDoc.java,
classpath/tools/com/sun/javadoc/ParamTag.java,
classpath/tools/com/sun/javadoc/Parameter.java,
classpath/tools/com/sun/javadoc/ProgramElementDoc.java,
classpath/tools/com/sun/javadoc/RootDoc.java,
classpath/tools/com/sun/javadoc/SeeTag.java,
classpath/tools/com/sun/javadoc/SerialFieldTag.java,
classpath/tools/com/sun/javadoc/SourcePosition.java,
classpath/tools/com/sun/javadoc/Tag.java,
classpath/tools/com/sun/javadoc/ThrowsTag.java,
classpath/tools/com/sun/javadoc/Type.java,
classpath/tools/com/sun/javadoc/TypeVariable.java,
classpath/tools/com/sun/tools/doclets/Taglet.java,
classpath/tools/com/sun/tools/javac/Main.java,
classpath/tools/com/sun/tools/javac/Messages.java,
classpath/tools/sun/rmi/rmic/Main.java,
classpath/tools/sun/rmi/rmic/Messages.java: New files.
* Makefile.in, classpath/Makefile.in, classpath/configure,
classpath/doc/Makefile.in, classpath/doc/api/Makefile.in,
classpath/examples/Makefile.in, classpath/external/Makefile.in,
classpath/external/jsr166/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/include/Makefile.in, classpath/include/config.h.in,
classpath/lib/Makefile.in,
classpath/lib/gnu/classpath/Configuration.class,
classpath/native/Makefile.in, classpath/native/fdlibm/Makefile.in,
classpath/native/jawt/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, configure,
gnu/classpath/Configuration.h: Regenerate.
From-SVN: r122876
2007-03-13 06:48:03 +01:00
|
|
|
foreach subdir {gnu java javax org sun com META-INF} {
|
2005-07-16 03:27:14 +02:00
|
|
|
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
|
2005-07-18 22:54:01 +02:00
|
|
|
set tname [join [split $pkgname /] -].list
|
2005-07-16 03:27:14 +02:00
|
|
|
|
|
|
|
puts "$loname: \$($varname)"
|
2005-07-18 22:54:01 +02:00
|
|
|
# Create a temporary list file and then compile it. This works
|
|
|
|
# around the libtool problem mentioned in PR 21058. classpath was
|
|
|
|
# built first, so the class files are to be found there.
|
2005-07-16 03:27:14 +02:00
|
|
|
set omit ""
|
|
|
|
if {[info exists exclusion_map($package)]} {
|
|
|
|
set omit "| grep -v $exclusion_map($package)"
|
|
|
|
}
|
2007-01-09 20:58:05 +01:00
|
|
|
puts "\t@find \$(srcdir)/classpath/lib/$package -name '*.class'${omit} > $tname"
|
2007-02-16 14:51:04 +01:00
|
|
|
puts -nonewline "\t\$(LTGCJCOMPILE) -fsource-filename=\$(here)/classpath/lib/classes "
|
|
|
|
if {$package_map($package) == "bc"} {
|
|
|
|
puts -nonewline "-fjni "
|
|
|
|
}
|
|
|
|
puts "-findirect-dispatch -fno-indirect-classes -c -o $loname @$tname"
|
2005-07-18 22:54:01 +02:00
|
|
|
puts "\t@rm -f $tname"
|
2005-07-16 03:27:14 +02:00
|
|
|
puts ""
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
# We skip these because they are built into their own libraries and
|
|
|
|
# are handled specially in Makefile.am.
|
|
|
|
if {$loname != "gnu-java-awt-peer-qt.lo" && $loname != "gnu-java-awt-peer-x.lo"} {
|
|
|
|
lappend bc_objects $loname
|
|
|
|
}
|
2005-07-16 03:27:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
# Emit a rule for a 'package' package.
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
proc emit_package_rule_to_list {package package_files_list} {
|
|
|
|
global package_map exclusion_map $package_files_list
|
2005-07-16 03:27:14 +02:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
if {$pkgname == "java/lang"} {
|
|
|
|
# Object and Class are special cases due to an apparent compiler
|
|
|
|
# bug. Process is a special case because we don't build all
|
|
|
|
# concrete implementations of Process on all platforms.
|
2007-03-05 16:57:13 +01:00
|
|
|
set omit "| tr ' ' '\\n' | fgrep -v Object.class | fgrep -v Class.class | egrep -v '\(Ecos\|Posix\|Win32\)Process' "
|
2007-01-09 20:58:05 +01:00
|
|
|
} else {
|
|
|
|
set omit ""
|
|
|
|
}
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# A rule to make the phony file we are going to compile.
|
|
|
|
puts "$lname: \$($varname)"
|
2005-07-16 19:40:00 +02:00
|
|
|
puts "\t@\$(mkinstalldirs) \$(dir \$@)"
|
2007-01-09 20:58:05 +01:00
|
|
|
puts "\techo \$(srcdir)/classpath/lib/$package/*.class $omit> $lname"
|
2005-07-16 03:27:14 +02:00
|
|
|
puts ""
|
|
|
|
puts "-include $dname"
|
|
|
|
puts ""
|
|
|
|
puts ""
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"
|
|
|
|
&& $pkgname != "gnu/gcj/tools/gcj_dbtool"} {
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
lappend $package_files_list $lname
|
2005-07-21 01:39:44 +02:00
|
|
|
}
|
2005-07-16 03:27:14 +02:00
|
|
|
}
|
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
proc emit_package_rule {package} {
|
|
|
|
global package_files
|
|
|
|
emit_package_rule_to_list $package package_files
|
|
|
|
}
|
|
|
|
|
|
|
|
proc emit_interpreter_rule {package} {
|
|
|
|
global interpreter_package_files
|
|
|
|
emit_package_rule_to_list $package interpreter_package_files
|
|
|
|
}
|
|
|
|
|
2007-01-31 22:23:44 +01:00
|
|
|
# Emit a rule to build a package full of 'ordinary' files, that is,
|
|
|
|
# one .o for each .java.
|
|
|
|
proc emit_ordinary_rule {package} {
|
|
|
|
global name_map package_files
|
|
|
|
|
|
|
|
foreach file $name_map($package) {
|
|
|
|
# Strip off the '.java'.
|
|
|
|
set root [file rootname $file]
|
|
|
|
|
|
|
|
# Look for all included .class files. Assumes that we don't have
|
|
|
|
# multiple top-level classes in a .java file.
|
|
|
|
set lname $root.list
|
|
|
|
set dname $root.deps
|
|
|
|
|
|
|
|
puts "$lname: classpath/$file"
|
|
|
|
puts "\t@\$(mkinstalldirs) \$(dir \$@)"
|
|
|
|
puts "\techo \$(srcdir)/classpath/lib/${root}*.class> $lname"
|
|
|
|
puts ""
|
|
|
|
puts "-include $dname"
|
|
|
|
puts ""
|
|
|
|
puts ""
|
|
|
|
|
|
|
|
lappend package_files $lname
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
# Emit a package-like rule for a platform-specific Process
|
|
|
|
# implementation.
|
|
|
|
proc emit_process_package_rule {platform} {
|
|
|
|
set base "java/process-$platform"
|
|
|
|
set lname $base.list
|
|
|
|
set dname $base.deps
|
|
|
|
|
|
|
|
puts "$lname: java/lang/${platform}Process.java"
|
|
|
|
puts "\t@\$(mkinstalldirs) \$(dir \$@)"
|
|
|
|
puts "\techo \$(srcdir)/classpath/lib/java/lang/${platform}Process*.class > $lname"
|
|
|
|
puts ""
|
|
|
|
puts "-include $dname"
|
|
|
|
puts ""
|
|
|
|
puts ""
|
|
|
|
}
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# Emit a source file variable for a package, and corresponding header
|
|
|
|
# file variable, if needed.
|
|
|
|
proc emit_source_var {package} {
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
global package_map name_map dir_map header_vars interpreter_header_vars
|
2005-07-16 03:27:14 +02:00
|
|
|
|
|
|
|
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))"
|
2007-01-09 20:58:05 +01:00
|
|
|
# We use -decreasing so that classpath/external will be stripped
|
|
|
|
# before classpath.
|
|
|
|
foreach dir [lsort -decreasing [array names dirs]] {
|
2005-07-18 22:54:01 +02:00
|
|
|
if {$dir != "."} {
|
|
|
|
set result "\$(patsubst $dir/%,%,$result)"
|
|
|
|
}
|
2005-07-16 03:27:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
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"
|
|
|
|
puts ""
|
2005-07-21 01:39:44 +02:00
|
|
|
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"} {
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
if {$package_map($package) == "interpreter"} {
|
|
|
|
lappend interpreter_header_vars "${uname}_header_files"
|
|
|
|
} else {
|
|
|
|
lappend header_vars "${uname}_header_files"
|
|
|
|
}
|
2005-07-21 01:39:44 +02:00
|
|
|
}
|
2005-07-16 03:27:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# 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 ""
|
|
|
|
}
|
|
|
|
|
2006-05-24 21:38:05 +02:00
|
|
|
global argv
|
|
|
|
if {[llength $argv] > 0 && [lindex $argv 0] == "-verbose"} {
|
|
|
|
set is_verbose 1
|
|
|
|
}
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
# Read the proper .omit files.
|
2005-07-21 01:39:44 +02:00
|
|
|
read_omit_file standard.omit.in
|
2007-01-09 20:58:05 +01:00
|
|
|
read_omit_file classpath/lib/standard.omit.in
|
2005-07-16 03:27:14 +02:00
|
|
|
|
|
|
|
# Scan classpath first.
|
|
|
|
scan_packages classpath
|
|
|
|
scan_packages classpath/external/sax
|
|
|
|
scan_packages classpath/external/w3c_dom
|
2006-03-29 22:13:23 +02:00
|
|
|
scan_packages classpath/external/relaxngDatatype
|
2007-01-09 20:58:05 +01:00
|
|
|
scan_packages classpath/external/jsr166
|
2006-05-18 20:59:03 +02:00
|
|
|
# Resource files.
|
|
|
|
scan_packages classpath/resource
|
2005-07-16 03:27:14 +02:00
|
|
|
# Now scan our own files; this will correctly override decisions made
|
|
|
|
# when scanning classpath.
|
|
|
|
scan_packages .
|
|
|
|
# Files created by the build.
|
2006-05-18 19:29:21 +02:00
|
|
|
classify_source_file classpath gnu/java/locale/LocaleData.java
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-15 01:12:35 +02:00
|
|
|
classify_source_file classpath gnu/java/security/Configuration.java
|
2005-07-16 03:27:14 +02:00
|
|
|
|
|
|
|
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
|
2007-02-16 14:51:04 +01:00
|
|
|
} elseif {$package_map($package) == "bcheaders"} {
|
|
|
|
emit_bc_rule $package
|
2005-07-16 03:27:14 +02:00
|
|
|
} elseif {$package_map($package) == "ordinary"} {
|
2007-01-31 22:23:44 +01:00
|
|
|
emit_ordinary_rule $package
|
2005-07-16 03:27:14 +02:00
|
|
|
} elseif {$package_map($package) == "package"} {
|
|
|
|
emit_package_rule $package
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
} elseif {$package_map($package) == "interpreter"} {
|
|
|
|
emit_interpreter_rule $package
|
2005-07-16 03:27:14 +02:00
|
|
|
} else {
|
|
|
|
error "unrecognized type: $package_map($package)"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
emit_process_package_rule Ecos
|
|
|
|
emit_process_package_rule Win32
|
|
|
|
emit_process_package_rule Posix
|
|
|
|
|
configure.ac (INTERPRETER): New AM_CONDITIONAL.
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
From-SVN: r127097
2007-07-31 18:17:21 +02:00
|
|
|
puts "if INTERPRETER"
|
|
|
|
pp_var interpreter_packages_source_files $interpreter_package_files
|
|
|
|
pp_var interpreter_header_files $interpreter_header_vars "\$(" ")"
|
|
|
|
puts ""
|
|
|
|
puts "else"
|
|
|
|
puts ""
|
|
|
|
puts "interpreter_packages_source_files="
|
|
|
|
puts ""
|
|
|
|
puts "interpreter_header_files="
|
|
|
|
puts ""
|
|
|
|
puts "endif"
|
|
|
|
|
|
|
|
lappend package_files {$(interpreter_packages_source_files)}
|
|
|
|
lappend header_vars interpreter_header_files
|
|
|
|
|
2005-07-16 03:27:14 +02:00
|
|
|
pp_var all_packages_source_files $package_files
|
|
|
|
pp_var ordinary_header_files $header_vars "\$(" ")"
|
|
|
|
pp_var bc_objects $bc_objects
|
2006-05-18 20:59:03 +02:00
|
|
|
pp_var property_files $properties_files
|