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.

Index: .cvsignore
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/.cvsignore,v
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- .cvsignore	5 Mar 2005 14:40:14 -0000	1.1
+++ .cvsignore	14 Nov 2005 23:57:37 -0000
@@ -9,3 +9,10 @@
 configure
 libtool
 stamp-h1
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
Index: .project
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/.project,v
retrieving revision 1.1
diff -u -r1.1 .project
--- .project	27 Jan 2005 21:04:09 -0000	1.1
+++ .project	14 Nov 2005 23:57:38 -0000
@@ -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>
Index: configure.in
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/configure.in,v
retrieving revision 3.124
diff -u -r3.124 configure.in
--- configure.in	7 Nov 2005 16:26:51 -0000	3.124
+++ configure.in	14 Nov 2005 23:57:52 -0000
@@ -436,6 +436,15 @@
 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?)
Index: src/lib/Makefile.am
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/src/lib/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- src/lib/Makefile.am	30 Sep 2005 12:16:40 -0000	1.7
+++ src/lib/Makefile.am	14 Nov 2005 23:57:53 -0000
@@ -70,7 +70,7 @@
 #	$(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
 
Index: src/native/Makefile.am
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/src/native/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- src/native/Makefile.am	29 Sep 2005 14:31:20 -0000	1.18
+++ src/native/Makefile.am	14 Nov 2005 23:57:53 -0000
@@ -49,8 +49,8 @@
 
 $(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
Index: src/native/include/Makefile.am
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/src/native/include/Makefile.am,v
retrieving revision 1.37
diff -u -r1.37 Makefile.am
--- src/native/include/Makefile.am	6 Nov 2005 16:32:15 -0000	1.37
+++ src/native/include/Makefile.am	14 Nov 2005 23:57:54 -0000
@@ -130,7 +130,7 @@
 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)
 
Index: src/vm/global.h
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/src/vm/global.h,v
retrieving revision 3.110
diff -u -r3.110 global.h
--- src/vm/global.h	8 Nov 2005 17:00:15 -0000	3.110
+++ src/vm/global.h	14 Nov 2005 23:57:54 -0000
@@ -80,7 +80,7 @@
 
 #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
 
 
 /*
Index: src/vm/jit/i386/Makefile.am
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/src/vm/jit/i386/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- src/vm/jit/i386/Makefile.am	7 Nov 2005 11:53:28 -0000	1.24
+++ src/vm/jit/i386/Makefile.am	14 Nov 2005 23:57:54 -0000
@@ -78,6 +78,8 @@
 
 $(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
 
Index: tests/native/Makefile.am
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/tests/native/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- tests/native/Makefile.am	25 Oct 2005 17:42:59 -0000	1.9
+++ tests/native/Makefile.am	14 Nov 2005 23:57:55 -0000
@@ -44,7 +44,7 @@
 	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
Index: tests/regression/Makefile.am
===================================================================
RCS file: /ahome/cacao/cacaocvs/cacao/tests/regression/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- tests/regression/Makefile.am	8 Nov 2005 08:57:21 -0000	1.5
+++ tests/regression/Makefile.am	14 Nov 2005 23:57:55 -0000
@@ -33,7 +33,7 @@
 ## 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 \
Index: .cdtproject
===================================================================
RCS file: .cdtproject
diff -N .cdtproject
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cdtproject	1 Jan 1970 00:00:00 -0000
@@ -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>
Index: .externalToolBuilders/CacaoAutogen.launch
===================================================================
RCS file: .externalToolBuilders/CacaoAutogen.launch
diff -N .externalToolBuilders/CacaoAutogen.launch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .externalToolBuilders/CacaoAutogen.launch	1 Jan 1970 00:00:00 -0000
@@ -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>
Index: .externalToolBuilders/CacaoConfigure.launch
===================================================================
RCS file: .externalToolBuilders/CacaoConfigure.launch
diff -N .externalToolBuilders/CacaoConfigure.launch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .externalToolBuilders/CacaoConfigure.launch	1 Jan 1970 00:00:00 -0000
@@ -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>