2005-11-14 Tom Tromey <tromey@redhat.com>

	* .cvsignore: Updated.
	* .cdtproject, .project: New files.
	* .externalToolBuilders/CacaoAutogen.launch: New file.
	* .externalToolBuilders/CacaoConfigure.launch: New file.
	* configure.in: Added --with-flat-classpath option, new subst GLIBJZ,
	new define GLIBJZ_STRING.
	* tests/regression/Makefile.am (JAVAC): Use GLIBJZ.
	* tests/native/Makefile.am (JAVAC): Use GLIBJZ.
	* src/vm/global.h (CLASSPATH_GLIBJ_ZIP_PATH): Use GLIBJZ_STRING.
	* src/vm/jit/i386/Makefile.am (BUILT_SOURCES): New variable.
	* src/native/Makefile.am (nativetable.inc): Use GLIBJZ.
	* src/native/include/Makefile.am (GLIBJ_ZIP): Use GLIBJZ.
	* src/lib/Makefile.am (GLIBJ_ZIP): Use GLIBJZ.

diff --git a/.cdtproject b/.cdtproject
new file mode 100644 (file)
index 0000000..7491b9a
--- /dev/null
+++ b/.cdtproject
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-cdt version="2.0"?>
+
+<cdtproject id="org.eclipse.cdt.make.core.make">
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.ctagsindexer" point="org.eclipse.cdt.core.CIndexer">
+<attribute key="ctagslocation" value=""/>
+<attribute key="ctagfiletype" value="ctags_internal"/>
+<attribute key="ctagsindexincludes" value="false"/>
+<attribute key="ctagfilelocation" value=""/>
+<attribute key="ctagslocationtype" value="ctags_path_default"/>
+</extension>
+<data>
+<item id="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+</item>
+<item id="org.eclipse.cdt.core.pathentry">
+<pathentry kind="src" path=""/>
+<pathentry kind="out" path=""/>
+<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
+</item>
+</data>
+</cdtproject>

diff --git a/.cvsignore b/.cvsignore
index 89f04e09b21569457a704936b4cc998f94b716b5..5d08aa5befda6e2a9f51f74d29e6464dca4ada60 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,10 @@ config.status
 configure
 libtool
 stamp-h1
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing

diff --git a/.externalToolBuilders/CacaoAutogen.launch b/.externalToolBuilders/CacaoAutogen.launch
new file mode 100644 (file)
index 0000000..6350f5c
--- /dev/null
+++ b/.externalToolBuilders/CacaoAutogen.launch
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc}/autogen.sh"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+</launchConfiguration>

diff --git a/.externalToolBuilders/CacaoConfigure.launch b/.externalToolBuilders/CacaoConfigure.launch
new file mode 100644 (file)
index 0000000..1d0a9d2
--- /dev/null
+++ b/.externalToolBuilders/CacaoConfigure.launch
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--prefix=${project_loc:classpath}/install --with-classpath-install-dir=${project_loc:classpath}/install --with-flat-classpath"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc}/configure"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+</launchConfiguration>

diff --git a/.project b/.project
index 1130b503f44fb26eb4101caeb53ad023e8ddd2e9..c0f07c6068033206d0eb980cb28ab5b50d00d9ec 100644 (file)
--- a/.project
+++ b/.project
@@ -1,11 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>cacaodev</name>
+       <name>cacao</name>
        <comment></comment>
        <projects>
+               <project>classpath</project>
        </projects>
        <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                       <triggers>full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>LaunchConfigHandle</key>
+                                       <value>&lt;project&gt;/.externalToolBuilders/CacaoAutogen.launch</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                       <triggers>full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>LaunchConfigHandle</key>
+                                       <value>&lt;project&gt;/.externalToolBuilders/CacaoConfigure.launch</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.cdt.make.core.makeBuilder</name>
+                       <triggers>clean,full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.arguments</key>
+                                       <value></value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.core.errorOutputParser</key>
+                                       <value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+                                       <value>false</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.environment</key>
+                                       <value></value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.target.inc</key>
+                                       <value>all install</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.location</key>
+                                       <value></value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.target.clean</key>
+                                       <value>clean</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.command</key>
+                                       <value>make</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.append_environment</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.target.full</key>
+                                       <value>clean all install</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+                                       <value>true</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.build.target.auto</key>
+                                       <value>all</value>
+                               </dictionary>
+                               <dictionary>
+                                       <key>org.eclipse.cdt.make.core.stopOnError</key>
+                                       <value>false</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
+               <nature>org.eclipse.cdt.core.cnature</nature>
+               <nature>org.eclipse.cdt.make.core.makeNature</nature>
+               <nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
        </natures>
 </projectDescription>

diff --git a/configure.in b/configure.in
index b0381720f1bbef56f8d1f70165dd2af38618985e..5e658bb497a0290caf55e248e7e740d68fa0503b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -436,6 +436,15 @@ AC_MSG_RESULT(${CLASSPATH_INSTALL_DIR})
 AC_DEFINE_UNQUOTED([CLASSPATH_INSTALL_DIR], "${CLASSPATH_INSTALL_DIR}", [GNU classpath installation directory])
 AC_SUBST(CLASSPATH_INSTALL_DIR)
 
+dnl Maybe the user has Classpath installed 'flat'.
+AC_ARG_WITH([flat-classpath], [AS_HELP_STRING(--with-flat-classpath, GNU Classpath is not zipped in the install directory)])
+if test x"$with_flat_classpath" = "x"; then
+       GLIBJZ=glibj.zip
+else
+       GLIBJZ=
+fi
+AC_SUBST(GLIBJZ)
+AC_DEFINE_UNQUOTED(GLIBJZ_STRING, "$GLIBJZ", [define to the string base name of the classpath zip file])
 
 dnl now configure subpackages
 dnl the export is not my favorite (is there another way?)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f62e8923733822c0e2b3137e4ecfe0f531e63c99..6d6c32aa146e2cf02505b06d2d1a3a40750460c9 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3320 2005-09-30 12:16:40Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -70,7 +70,7 @@ JAVA_VM_FILES = \
 #      $(top_srcdir)/src/lib/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java \
 #
 
-GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip
+GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
 
 pkgdata_DATA = vm.zip
 

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 381e132a5d5b9c0d4275f6ce1515ea7f5097e6cf..a894c0225a9f9c357f4bf8de352c47673ccf911e 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3313 2005-09-29 14:31:21Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -49,8 +49,8 @@ CLEANFILES += nativetable.inc
 
 $(srcdir)/native.c: nativetable.inc
 
-nativetable.inc: $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip $(top_builddir)/src/native/tools/gennativetable
-       BOOTCLASSPATH=$(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip $(top_builddir)/src/native/tools/gennativetable > $(top_builddir)/src/native/nativetable.inc
+nativetable.inc: $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable
+       BOOTCLASSPATH=$(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable > $(top_builddir)/src/native/nativetable.inc
 endif
 
 noinst_LTLIBRARIES = libnative.la

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 5508e769afd9cde046be279390fdcce4de233278..291b52a371a0a478d4e0e30eaeb3011a9a820da4 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3596 2005-11-06 16:32:15Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -130,7 +130,7 @@ endif
 CACAOH = $(top_builddir)/src/cacaoh/cacaoh
 
 VM_ZIP = $(top_builddir)/src/lib/vm.zip
-GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip
+GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
 

diff --git a/src/vm/global.h b/src/vm/global.h
index 6b123a0db140806b3507d65ba105861189fa8a17..e3737bf936b48f7d142b84cfbe1a72c6ba04da55 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 3636 2005-11-08 17:00:15Z twisti $
+   $Id: global.h 3669 2005-11-15 00:18:01Z twisti $
 
 */
 
@@ -80,7 +80,7 @@ typedef struct java_objectarray java_objectarray;
 
 #define CACAO_VM_ZIP_PATH           "/share/cacao/vm.zip"
 #define CLASSPATH_LIBRARY_PATH      "/lib/classpath"
-#define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/glibj.zip"
+#define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/" GLIBJZ_STRING
 
 
 /*

diff --git a/src/vm/jit/i386/Makefile.am b/src/vm/jit/i386/Makefile.am
index ab1ddbd90d0958ff67c4b185be4feed56136b6cb..bfe1430412197addb19bdbeb1c58ec8266aa23b2 100644 (file)
--- a/src/vm/jit/i386/Makefile.am
+++ b/src/vm/jit/i386/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3603 2005-11-07 11:53:28Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -78,6 +78,8 @@ libarch_la_LIBADD = \
 
 $(srcdir)/asmpart.S: $(top_builddir)/config.h offsets.h
 
+BUILT_SOURCES = offsets.h
+
 offsets.h: $(top_builddir)/src/vm/jit/tools/genoffsets $(top_builddir)/config.h
        $(top_builddir)/src/vm/jit/tools/genoffsets > offsets.h
 

diff --git a/tests/native/Makefile.am b/tests/native/Makefile.am
index 29e8e9acf7c48239ad770519ade8804c99ba02cd..dc118388021068f045d0a5d7c4e4391cf5da32d9 100644 (file)
--- a/tests/native/Makefile.am
+++ b/tests/native/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3494 2005-10-25 17:42:59Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -44,7 +44,7 @@ CLEANFILES = \
        testarguments.h
 
 JAVA = $(top_builddir)/src/cacao/cacao
-JAVAC = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip -nowarn
+JAVAC = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) -nowarn
 JAVAH = $(top_builddir)/src/cacaoh/cacaoh
 
 checkall: test.tst checkjni.tst testarguments.tst

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index f14d3e7cf4448a324450913a9b94cb2a8758ca5e..b08135b9319ced8022598848d47a5cc4a41c42a2 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,12 +28,12 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3630 2005-11-08 08:57:21Z twisti $
+## $Id: Makefile.am 3669 2005-11-15 00:18:01Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 JAVA = $(top_builddir)/src/cacao/cacao
-JAVAC = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip -nowarn
+JAVAC = jikes -classpath $(CLASSPATH_INSTALL_DIR)/share/classpath/$(GLIBJZ) -nowarn
 
 CLEANFILES = \
        *.class \