[kaffe] CVS kaffe (robilad): added configuration files for test-autobuild

Kaffe CVS cvs-commits at kaffe.org
Mon Sep 18 05:35:17 PDT 2006


PatchSet 7418 
Date: 2006/09/18 12:25:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
added configuration files for test-autobuild

2006-09-18  Dalibor Topic  <robilad at kaffe.org>

        * autobuild.sh: New file. Adds support for Test-Autobuild,
        an autobuilder from autobuild.org.

        * developers/auto-build.conf: New file. Configuration for
        the autobuilder.

        * developers/README: Added information on
        developers/auto-build.conf.

        * Makefile.am (EXTRA_DIST): Added autobuild.sh and
        developers/auto-build.conf.

Members: 
	ChangeLog:1.4920->1.4921 
	Makefile.am:1.120->1.121 
	Makefile.in:1.271->1.272 
	autobuild.sh:INITIAL->1.1 
	developers/README:1.13->1.14 
	developers/auto-build.conf:INITIAL->1.1 
	libraries/javalib/external/classpath/config.guess:1.30->1.31 
	libraries/javalib/external/classpath/ltmain.sh:1.30->1.31 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4920 kaffe/ChangeLog:1.4921
--- kaffe/ChangeLog:1.4920	Sat Sep 16 15:08:17 2006
+++ kaffe/ChangeLog	Mon Sep 18 12:25:29 2006
@@ -1,3 +1,17 @@
+2006-09-18  Dalibor Topic  <robilad at kaffe.org>
+
+	* autobuild.sh: New file. Adds support for Test-Autobuild,
+	an autobuilder from autobuild.org.
+
+	* developers/auto-build.conf: New file. Configuration for 
+	the autobuilder.
+
+	* developers/README: Added information on 
+	developers/auto-build.conf.
+
+	* Makefile.am (EXTRA_DIST): Added autobuild.sh and 
+	developers/auto-build.conf.
+
 2006-09-16  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* developers/autogen.sh,
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.120 kaffe/Makefile.am:1.121
--- kaffe/Makefile.am:1.120	Sun Aug 27 22:26:14 2006
+++ kaffe/Makefile.am	Mon Sep 18 12:25:33 2006
@@ -63,6 +63,7 @@
 	THIRDPARTY \
 	WHATSNEW \
 	RELEASE-NOTES \
+	autobuild.sh \
 	license.terms \
 	license-lesser.terms \
 	license-w3c.terms \
@@ -120,6 +121,7 @@
 	compat-include/eh-common.h \
 	compat-include/frame.h \
 	compat-include/gansidecl.h \
+	developers/auto-build.conf
 	developers/boehm-with-kaffe.patch \
 	developers/build_mathnamespace \
 	developers/check-classpath-unmerged \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.271 kaffe/Makefile.in:1.272
--- kaffe/Makefile.in:1.271	Tue Aug 29 23:43:44 2006
+++ kaffe/Makefile.in	Mon Sep 18 12:25:33 2006
@@ -432,6 +432,7 @@
 	THIRDPARTY \
 	WHATSNEW \
 	RELEASE-NOTES \
+	autobuild.sh \
 	license.terms \
 	license-lesser.terms \
 	license-w3c.terms \
@@ -489,42 +490,7 @@
 	compat-include/eh-common.h \
 	compat-include/frame.h \
 	compat-include/gansidecl.h \
-	developers/boehm-with-kaffe.patch \
-	developers/build_mathnamespace \
-	developers/check-classpath-unmerged \
-	developers/math_symbols \
-	developers/check-classpath-merge-status \
-	developers/FullTest.sh \
-	developers/GCJ.note.1 \
-	developers/JavaClass.pm \
-	developers/README \
-	developers/README.EUC_JP \
-	developers/alignment_of_size.c \
-	developers/autogen.sh \
-	developers/createLdScript.pl \
-	developers/dumpClass.pl \
-	developers/gdbinit \
-	developers/fixup.c \
-	developers/geteh_from_libgcc2 \
-	developers/glibc-2.1.1-signal.patch \
-	developers/mangleNative.pl \
-	developers/mauve-html-gen.pl \
-	developers/mauve-kaffe \
-	developers/mauve-results.sh \
-	developers/mnemonicizer.awk \
-	developers/resync-classpath.sh \
-	developers/rpm-kaffe.spec \
-	developers/sp_offset.c \
-	developers/test-kaffe-sh \
-	developers/update-class-list \
-	developers/utf8munge.pl \
-	scripts/GCCWarning.pm \
-	scripts/JikesWarning.pm \
-	scripts/LogWarning.pm \
-	scripts/Registry.pm \
-	scripts/sort-warnings.pl \
-	scripts/SparseWarning.pm \
-	scripts/WarningDescription.pm
+	developers/auto-build.conf
 
 CLEANFILES = BUILD_ENVIRONMENT
 noinst_SCRIPTS = libtool BUILD_ENVIRONMENT
@@ -974,6 +940,42 @@
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
+	developers/boehm-with-kaffe.patch \
+	developers/build_mathnamespace \
+	developers/check-classpath-unmerged \
+	developers/math_symbols \
+	developers/check-classpath-merge-status \
+	developers/FullTest.sh \
+	developers/GCJ.note.1 \
+	developers/JavaClass.pm \
+	developers/README \
+	developers/README.EUC_JP \
+	developers/alignment_of_size.c \
+	developers/autogen.sh \
+	developers/createLdScript.pl \
+	developers/dumpClass.pl \
+	developers/gdbinit \
+	developers/fixup.c \
+	developers/geteh_from_libgcc2 \
+	developers/glibc-2.1.1-signal.patch \
+	developers/mangleNative.pl \
+	developers/mauve-html-gen.pl \
+	developers/mauve-kaffe \
+	developers/mauve-results.sh \
+	developers/mnemonicizer.awk \
+	developers/resync-classpath.sh \
+	developers/rpm-kaffe.spec \
+	developers/sp_offset.c \
+	developers/test-kaffe-sh \
+	developers/update-class-list \
+	developers/utf8munge.pl \
+	scripts/GCCWarning.pm \
+	scripts/JikesWarning.pm \
+	scripts/LogWarning.pm \
+	scripts/Registry.pm \
+	scripts/sort-warnings.pl \
+	scripts/SparseWarning.pm \
+	scripts/WarningDescription.pm
 
 depend:
 	@echo \`make depend\' is no longer needed
===================================================================
Checking out kaffe/autobuild.sh
RCS:  /home/cvs/kaffe/kaffe/autobuild.sh,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/autobuild.sh	Mon Sep 18 12:35:16 2006
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+
+# Pull in config scripts
+PATH=$AUTOBUILD_INSTALL_ROOT/bin:$PATH
+export PATH
+
+# Clean up build area
+#[ -f Makefile ] && make -k maintainer-clean ||:
+[ -f Makefile ] && make -k clean ||:
+
+# Re-generate autotools scripts
+#autoconf
+#automake -a
+
+# Configure the build
+./configure --prefix=$AUTOBUILD_INSTALL_ROOT $CONFIG_LINE
+
+# Make
+make
+
+# run tests
+if [ -n "$MAKE_CHECK" ]
+then
+	test -n "$1" && TEST_RESULTS_FILE=$1 || TEST_RESULTS_FILE=results.log
+	rm -f $TEST_RESULTS_FILE
+
+	make check | tee $TEST_RESULTS_FILE
+fi
+
+# Check source code dist
+if [ -n "$MAKE_DISTCHECK" ]
+then
+	make distcheck
+fi
+
Index: kaffe/developers/README
diff -u kaffe/developers/README:1.13 kaffe/developers/README:1.14
--- kaffe/developers/README:1.13	Sun Jul 16 13:32:31 2006
+++ kaffe/developers/README	Mon Sep 18 12:25:34 2006
@@ -1,6 +1,10 @@
 
 This directory contains various files useful for Kaffe developers.
 
+auto-build.conf: a configuration file for Test-Autobuild from autobuild.sh.
+		It goes into /etc/auto-build.d/ once you install 
+		Test-Autobuild.
+
 sp_offset.c:	a program that guesses the correct offset of the sp in a
 		jmpbuf for the jthread threading system.
 
===================================================================
Checking out kaffe/developers/auto-build.conf
RCS:  /home/cvs/kaffe/kaffe/developers/auto-build.conf,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/developers/auto-build.conf	Mon Sep 18 12:35:17 2006
@@ -0,0 +1,613 @@
+#
+# Test-AutoBuild main configuration file.
+#
+# Short documentation can be found inline, and for further
+# information consult the manual page 'man 5 auto-build.conf'
+#
+
+# Path to the build engine definition. This determines the
+# sequence of stages executed by the build engine, package
+# types to publish, and other miscellaneous aspects of the
+# build engine's runtime environment. 
+# It will typically suffice to leave this on the default
+# setting
+engine = /etc/auto-build.d/engine/host-build.conf
+
+# The location of the directory containing the template files
+# for the HTML status pages, and email alert messages
+templateDir = /etc/auto-build.d/templates
+
+# The directory under which the build engine will run. This
+# should match whatever path was provided when running the 
+# 'auto-build-make-root' script. /var/lib/builder is the default
+# directory created by the RPM perl-Test-AutoBuild-account
+buildRoot = /var/lib/builder
+
+# A name for the build instance. This is used in the HTML
+# status pages, email alert subject, and RSS feeds
+label = Continous Automatic Builder
+
+# Name and email address of the build administrator
+adminEmail = robilad at kaffe.org
+adminName = Dalibor Topic
+
+# Name and email address of the development team writing the
+# software being built. Typically point it to the main developer
+# mailing list
+groupEmail = kaffe at kaffe.org
+groupName = Kaffe Developers
+
+# If the build host has multiple names, then specify which
+# one is used for the virtual host publishing the HTML status
+# pages. This will be used to construct links in the RSS feed
+# and email alert messages. If not set, defaults to the primary
+# hostname of the machine
+#hostname = example.com
+
+# The prefix under which the HTML status pages are located.
+# If using /etc/auto-build.d/httpd/aliased.conf, then
+#httpPrefix  = /builder
+# Else with /etc/auto-build.d/httpd/user.conf, then
+#httpPrefix  = /~builder
+# Finally with /etc/auto-build.d/httpd/vhost.conf, then
+httpPrefix  =
+
+# Where to save a log of the build engine progress (this
+# data is also sent to STDERR, but when run from cron this
+# typically ends up in /dev/null)
+engineLogFile = /var/lib/builder/autobuild.log
+
+# The method used for acquiring a lock file to prevent multiple
+# build instances running at the same time against the same
+# buildRoot directory. 
+#  * fcntl - Best option, but only implemented for Linux, SunOS
+#            and FreeBSD
+#  * flock - Portable to any UNIX, but does not completely protect
+#            if buildRoot is on an NFS volume
+#  * file  - Simple file creation/deletion test. If the build engine
+#            or host machine crashes, it will be neccessary to manually
+#            delete the lock file ($buildRoot/.build.mutex)
+lockMethod = fcntl
+
+# Define what high level features you want enabled
+features = {
+  # If the cache is enabled, then modules will only be built if their
+  # sources have changed since the previous build cycle. This provides 
+  # much faster cycle times if there are many modules in the build
+  # config, only a few of which ever change
+  cache = 1
+
+  # Whether to try and checkout the latest sources from version control
+  # If checkout is disabled, the build will run with whatever sources
+  # were checked out on the previous cycle.
+  checkout = 1
+
+  # Whether to run the 'createrepo' tool against the RPMs on the HTTP
+  # distribution site
+  createrepo_index = 1
+
+  # Whether to run the 'yum-arch' tool against the RPMs on the HTTP
+  # distribution site
+  yum_index = 0
+
+  # Whether to generate an APT index of RPMs / Debian packages on the
+  # HTTP distribution site
+  apt_index = 0
+
+  # Whether to send email alerts at the end of cycles
+  email_alerts = 0
+}
+
+# Describe 'interesting' metadata about the build platform
+platform = {
+  # Taken from /etc/issue, if not set
+  #label = RHEL-4, Update 2
+
+  # Taken from uname(2) 'sysname' if not set
+  #operating_system = GNU/Linux
+
+  # Taken from uname(2) 'machine' if not set
+  # architecture = i386
+
+  # Arbitrary administrator specific options...
+  #options = {
+  #  compiler.cc = GCC 4.0.2
+  #  linker = GNU ld 2.15.94.0.2.2
+  #}
+}
+
+# Criteria for sending email alerts
+alert = {
+  # If the scope is set to
+  #  * builder - one email is sent with info on all modules
+  #  * module  - one email is sent for each module
+  scope = builder
+
+  # Conditions for sending alerts
+  #  * always     - send regardless of status
+  #  * fail       - send whenever the status is 'failed'
+  #  * first-fail - send on the first failure only
+  trigger = first-fail
+
+  # If scope is set to 'builder' then
+  #
+  #  * admin - use the global address defined for $adminEmail
+  #  * group - use the global address defined for $groupEmail 
+  #
+  # If scope is set to 'module' then
+  #
+  #  * admin - use the module specific address defined for $adminEmail
+  #  * group - use the module specific address defined for $groupEmail
+  #
+  # Or just set an explicit email address (separate multiple address with ,)
+  to = group
+
+  # What to set the 'From' address to
+  #from = builder at example.com
+
+  # The SMTP server to relay the mail via, defaults to localhost
+  #smtpServer = mail.example.com
+}
+
+# Set the maximum disk space allowed for use by the cache
+maxCacheSize = 100M
+
+# Set the maximum number of days to keep a cache around before
+# considering it expired
+maxCacheAge = 7d
+
+
+# Module groups (for web status)
+groups = {
+  software = {
+      label = Software
+  }
+#  autobuild = {
+#      label = Test-AutoBuild
+#  }
+#  docs = {
+#      label = Documentation
+#  }
+}
+
+# Global environment variables which will be set whenever
+# any command is run by the build engine
+env = {
+  USER = builder
+}
+
+# Define the source control repositories from which modules
+# will be checked out. There are 7 supported repository types
+# at this time. Depending on the 'type' parameter, various
+# 'env' or 'option' parameters may be required
+#
+#  cvs  - CVS. Specify the CVSROOT environment variable, and 
+#         optionally a CVS_RSH variable
+#
+#           env = {
+#             CVSROOT = :pserver:anonymous at cvs.gna.org:/cvs/testautobuild
+#           }
+#
+#           env = {
+#             CVSROOT = :pserver:anonymous at cvs.kaffe.org:/cvs/kaffe
+#           }
+#
+#  p4   - Perforce. Specify the P4CONFIG environment variable 
+#         for a client view. The viewspec will be filled in 
+#         automatically
+#
+#           env = {
+#             P4CONFIG = /var/lib/builder/.p4config
+#           }
+#
+#  tla  - GNU Arch. Specify the 'archive-name' and 'archive-uri'
+#         options for the remote repository. eg, 
+#
+#           options = {
+#             archive-name = lord at emf.net--2004
+#             archive-uri = http://arch.quackerhead.com/~lord/archives/lord@emf.net--2004
+#           }
+#
+#  hg   - Mercurial. Specify the 'base-url' option to refer to
+#         the base URL under which the repositories are located
+#
+#           options = {
+#             base-url = http://www.selenic.com/
+#           }
+#
+#  svn  - Subversion. Specify the 'url' option to refer to the base
+#         URL for the repository
+#
+#           options = {
+#             url = http://aplaws.redhat.com/svn/aplaws/
+#           }
+#
+#  svk  - SVK. No special options. The modules contain the full URL
+#
+#  disk - Local disk. Specify the 'directory' otion to refer to the 
+#         base directory containing the files
+#
+#           options = {
+#             directory = /var/lib/builder/local-files
+#           }
+#
+repositories = {
+  kaffe-cvs = {
+    label = Kaffe.org Anonymous CVS Server
+    type = cvs
+    env = {
+      CVSROOT = :pserver:readonly at cvs.kaffe.org:/cvs/kaffe
+    }
+  }
+}
+
+# Now, the list of modules to checkout from the repositories
+# defined above.
+modules = {
+  kaffe-jit3-pthreads-kaffegc = {
+    # This is used in email alerts, HTML status pages & RSS feeds
+    # to refer to the module
+    label = Kaffe - jit3 engine, kaffe gc, unix pthreads
+
+    # If different from global settings. These will be used if
+    # the email alert scope is set to 'module'
+    #
+    #admin-email = autobuild-admin at example.com
+    #admin-name = Module Administrator
+    #group-email = autobuild-dev at example.com
+    #group-name = Module Developers
+
+    # The source code to check out
+    source = {
+      # Name of the repository defined above
+      repository = kaffe-cvs
+
+      # The path within the repository to be checked out
+      path = kaffe
+    }
+
+    # Any module specific environment variables to be set when
+    # executing the module control file
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_CHECK="yes"
+	CONFIG_LINE=--with-engine=jit3 --with-gc=kaffe-gc --with-threads=unix-pthreads
+    }
+    # List of groups (defined earlier) which this module is a
+    # member of
+    groups = (
+      software
+    )
+    # Arbitrary list of hyperlinks to associate with this module
+    # in the HTML status pages. Typically link to the module
+    # developer web pages & source code browser
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    # List of artifacts generated during build which should be 
+    # published on the HTML pages. For example, code cover reports
+    # API documentation. The 'src' parameter is relative to the
+    # module's root source code directory. The 'dst' parameter is
+    # the URL prefix under which to save the artifact. The optional
+    # 'path' parameter is needed if there is no index file in the
+    # directory copied.
+    artifacts = (
+#      {
+#        src = blib/html/*
+#        dst = apidocs/
+#        path = apidocs/Test/AutoBuild.html
+#        label = Module API documentation
+#      }
+    )
+  }
+
+  kaffe-intrp-pthreads-kaffegc = {
+    label = Kaffe - intrp engine, kaffe gc, unix pthreads
+
+    source = {
+      repository = kaffe-cvs
+      path = kaffe
+    }
+
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_CHECK="yes"
+	CONFIG_LINE=--with-engine=intrp --with-gc=kaffe-gc --with-threads=unix-pthreads
+    }
+    groups = (
+      software
+    )
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    artifacts = (
+    )
+  }
+
+#  kaffe-jit3-pthreads-boehmgc = {
+#    label = Kaffe - jit3 engine, boehm gc, unix pthreads
+#
+#    source = {
+#      repository = kaffe-cvs
+#      path = kaffe
+#    }
+#
+#    env = {
+#	CC="ccache gcc"
+#	CXX="ccache g++"
+#	MAKE_CHECK="yes"
+#	CONFIG_LINE=--with-engine=jit3 --with-gc=boehm-gc --with-threads=unix-pthreads
+#    }
+#    groups = (
+#      software
+#    )
+#    links = (
+#      {
+#        href = http://www.kaffe.org/
+#        label = Homepage
+#      }
+#      {
+#        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+#        label = Browse CVS Repository
+#      }
+#    )
+#    artifacts = (
+#    )
+#  }
+
+#  kaffe-jit-pthreads-boehmgc = {
+#    label = Kaffe - jit engine, boehm gc, unix pthreads
+#
+#    source = {
+#      repository = kaffe-cvs
+#      path = kaffe
+#    }
+#
+#    env = {
+#	CC="ccache gcc"
+#	CXX="ccache g++"
+#	MAKE_CHECK="yes"
+#	CONFIG_LINE=--with-engine=jit --with-gc=boehm-gc --with-threads=unix-pthreads
+#    }
+#    groups = (
+#      software
+#    )
+#    links = (
+#      {
+#        href = http://www.kaffe.org/
+#        label = Homepage
+#      }
+#      {
+#        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+#        label = Browse CVS Repository
+#      }
+#    )
+#    artifacts = (
+#    )
+#  }
+
+#  kaffe-intrp-pthreads-boehmgc = {
+#    label = Kaffe - intrp engine, boehm gc, unix pthreads
+#
+#    source = {
+#      repository = kaffe-cvs
+#      path = kaffe
+#    }
+#
+#    env = {
+#	CC="ccache gcc"
+#	CXX="ccache g++"
+#	MAKE_CHECK="yes"
+#	CONFIG_LINE=--with-engine=intrp --with-gc=boehm-gc --with-threads=unix-pthreads
+#    }
+#    groups = (
+#      software
+#    )
+#    links = (
+#      {
+#        href = http://www.kaffe.org/
+#        label = Homepage
+#      }
+#      {
+#        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+#        label = Browse CVS Repository
+#      }
+#    )
+#    artifacts = (
+#    )
+#  }
+
+  kaffe-jit3-jthreads-kaffegc = {
+    label = Kaffe - jit3 engine, kaffe gc, unix jthreads
+
+    source = {
+      repository = kaffe-cvs
+      path = kaffe
+    }
+
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_CHECK="yes"
+	CONFIG_LINE=--with-engine=jit3 --with-gc=kaffe-gc --with-threads=unix-jthreads
+    }
+    groups = (
+      software
+    )
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    artifacts = (
+    )
+  }
+
+  kaffe-jit-jthreads-kaffegc = {
+    label = Kaffe - jit engine, kaffe gc, unix jthreads
+
+    source = {
+      repository = kaffe-cvs
+      path = kaffe
+    }
+
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_CHECK="yes"
+	CONFIG_LINE=--with-engine=jit --with-gc=kaffe-gc --with-threads=unix-jthreads
+    }
+    groups = (
+      software
+    )
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    artifacts = (
+    )
+  }
+
+  kaffe-intrp-jthreads-kaffegc = {
+    label = Kaffe - intrp engine, kaffe gc, unix jthreads
+
+    source = {
+      repository = kaffe-cvs
+      path = kaffe
+    }
+
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_CHECK="yes"
+	CONFIG_LINE=--with-engine=intrp --with-gc=kaffe-gc --with-threads=unix-jthreads
+    }
+    groups = (
+      software
+    )
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    artifacts = (
+    )
+  }
+
+  kaffe-distcheck = {
+    label = Kaffe - distcheck
+
+    source = {
+      repository = kaffe-cvs
+      path = kaffe
+    }
+
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_DISTCHECK="yes"
+	CONFIG_LINE=
+    }
+    groups = (
+      software
+    )
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    artifacts = (
+    )
+  }
+
+  kaffe-with-ecj = {
+    label = Kaffe - with ecj
+
+    source = {
+      repository = kaffe-cvs
+      path = kaffe
+    }
+
+    env = {
+	CC="ccache gcc"
+	CXX="ccache g++"
+	MAKE_CHECK="yes"
+	CONFIG_LINE=--with-ecj
+    }
+    groups = (
+      software
+    )
+    links = (
+      {
+        href = http://www.kaffe.org/
+        label = Homepage
+      }
+      {
+        href = http://cvs.kaffe.org/cgi-bin/viewcvs.cgi/kaffe/
+        label = Browse CVS Repository
+      }
+    )
+    artifacts = (
+    )
+  }
+}
+
+# Optionally, the packages (RPMs, etc) generated during the
+# build can be built into an ISO image for distribution
+isos = {
+  autobuild-unstable = {
+    # File name for the ISO image
+    name = autobuild-unstable.iso
+    # Label to use in link for HTML status pages
+    label = Test-AutoBuild Unstable
+    # The package types to include in the ISO, can be
+    # one or more of 'rpm', 'zip', 'debian'
+    packageTypes = (
+      rpm
+      zip
+    )
+    # List of modules whose packages should be included
+    # in the ISO
+    modules = (
+    )
+  }
+}
+
+# That's all folks!
Index: kaffe/libraries/javalib/external/classpath/config.guess
diff -u kaffe/libraries/javalib/external/classpath/config.guess:1.30 kaffe/libraries/javalib/external/classpath/config.guess:1.31
--- kaffe/libraries/javalib/external/classpath/config.guess:1.30	Sat Sep 16 15:08:29 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess	Mon Sep 18 12:25:34 2006
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-12-13'
+timestamp='2005-08-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -779,7 +779,7 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -851,7 +851,7 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +870,7 @@
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,9 +919,6 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -967,7 +964,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#ifdef __INTEL_COMPILER
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -977,7 +974,7 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1188,6 +1185,7 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1265,9 +1263,6 @@
 	exit ;;
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
 esac
 
Index: kaffe/libraries/javalib/external/classpath/ltmain.sh
diff -u kaffe/libraries/javalib/external/classpath/ltmain.sh:1.30 kaffe/libraries/javalib/external/classpath/ltmain.sh:1.31
--- kaffe/libraries/javalib/external/classpath/ltmain.sh:1.30	Sat Sep 16 15:08:32 2006
+++ kaffe/libraries/javalib/external/classpath/ltmain.sh	Mon Sep 18 12:25:35 2006
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-2"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -3200,6 +3203,11 @@
 	    current=`expr $number_major + $number_minor - 1`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  ;;




More information about the kaffe mailing list