* .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.
--- /dev/null
+<?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>
configure
libtool
stamp-h1
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
--- /dev/null
+<?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>
--- /dev/null
+<?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>
<?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><project>/.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><project>/.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>
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?)
##
## 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
# $(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
##
## 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
$(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
##
## 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
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)
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 $
*/
#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
/*
##
## 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
$(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
##
## 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
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
##
## 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 \