[vmkit-commits] [vmkit] r129225 - in /vmkit/trunk: autoconf/configure.ac configure mmtk/Makefile mmtk/java/build.xml mmtk/java/build.xml.in
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Apr 9 12:46:09 PDT 2011
Author: geoffray
Date: Sat Apr 9 14:46:08 2011
New Revision: 129225
URL: http://llvm.org/viewvc/llvm-project?rev=129225&view=rev
Log:
Import build fixes from 0.29.
Bump version to 0.30svn.
Added:
vmkit/trunk/mmtk/java/build.xml.in
Removed:
vmkit/trunk/mmtk/java/build.xml
Modified:
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
vmkit/trunk/mmtk/Makefile
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=129225&r1=129224&r2=129225&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Sat Apr 9 14:46:08 2011
@@ -31,12 +31,12 @@
dnl===-----------------------------------------------------------------------===
dnl Initialize autoconf and define the package name, version number and
dnl email address for reporting bugs.
-AC_INIT([vmkit],[0.29svn],[nicolas.geoffray at gmail.com])
+AC_INIT([vmkit],[0.30svn],[nicolas.geoffray at gmail.com])
dnl Provide a copyright substitution and ensure the copyright notice is included
dnl in the output of --version option of the generated configure script.
-AC_SUBST(VMKIT_COPYRIGHT,["Copyright (c) 2003-2010 Universite Pierre et Marie Curie."])
-AC_COPYRIGHT([Copyright (c) 2003-2010 Universite Pierre et Marie Curie.])
+AC_SUBST(VMKIT_COPYRIGHT,["Copyright (c) 2003-2011 Universite Pierre et Marie Curie."])
+AC_COPYRIGHT([Copyright (c) 2003-2011 Universite Pierre et Marie Curie.])
dnl Indicate that we require autoconf 2.59 or later. Ths is needed because we
dnl use some autoconf macros only available in 2.59.
@@ -626,6 +626,7 @@
AC_CONFIG_FILES([lib/J3/Classpath/Classpath.h])
AC_CONFIG_FILES([tools/llcj/LinkPaths.h])
AC_CONFIG_FILES([mmtk/java/src/org/j3/config/Selected.java])
+AC_CONFIG_FILES([mmtk/java/build.xml])
dnl Do special configuration of Makefiles
AC_CONFIG_MAKEFILE(Makefile)
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=129225&r1=129224&r2=129225&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Sat Apr 9 14:46:08 2011
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for vmkit 0.29svn.
+# Generated by GNU Autoconf 2.65 for vmkit 0.30svn.
#
# Report bugs to <nicolas.geoffray at gmail.com>.
#
@@ -13,7 +13,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright (c) 2003-2010 Universite Pierre et Marie Curie.
+# Copyright (c) 2003-2011 Universite Pierre et Marie Curie.
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
@@ -554,8 +554,8 @@
# Identity of this package.
PACKAGE_NAME='vmkit'
PACKAGE_TARNAME='vmkit'
-PACKAGE_VERSION='0.29svn'
-PACKAGE_STRING='vmkit 0.29svn'
+PACKAGE_VERSION='0.30svn'
+PACKAGE_STRING='vmkit 0.30svn'
PACKAGE_BUGREPORT='nicolas.geoffray at gmail.com'
PACKAGE_URL=''
@@ -1289,7 +1289,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures vmkit 0.29svn to adapt to many kinds of systems.
+\`configure' configures vmkit 0.30svn to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1355,7 +1355,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of vmkit 0.29svn:";;
+ short | recursive ) echo "Configuration of vmkit 0.30svn:";;
esac
cat <<\_ACEOF
@@ -1470,14 +1470,14 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-vmkit configure 0.29svn
+vmkit configure 0.30svn
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright (c) 2003-2010 Universite Pierre et Marie Curie.
+Copyright (c) 2003-2011 Universite Pierre et Marie Curie.
_ACEOF
exit
fi
@@ -1935,7 +1935,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by vmkit $as_me 0.29svn, which was
+It was created by vmkit $as_me 0.30svn, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2283,7 +2283,7 @@
-VMKIT_COPYRIGHT="Copyright (c) 2003-2010 Universite Pierre et Marie Curie."
+VMKIT_COPYRIGHT="Copyright (c) 2003-2011 Universite Pierre et Marie Curie."
@@ -6135,6 +6135,8 @@
ac_config_files="$ac_config_files mmtk/java/src/org/j3/config/Selected.java"
+ac_config_files="$ac_config_files mmtk/java/build.xml"
+
ac_config_commands="$ac_config_commands Makefile"
@@ -6649,7 +6651,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by vmkit $as_me 0.29svn, which was
+This file was extended by vmkit $as_me 0.30svn, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6715,7 +6717,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-vmkit config.status 0.29svn
+vmkit config.status 0.30svn
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
@@ -6843,6 +6845,7 @@
"lib/J3/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/J3/Classpath/Classpath.h" ;;
"tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES tools/llcj/LinkPaths.h" ;;
"mmtk/java/src/org/j3/config/Selected.java") CONFIG_FILES="$CONFIG_FILES mmtk/java/src/org/j3/config/Selected.java" ;;
+ "mmtk/java/build.xml") CONFIG_FILES="$CONFIG_FILES mmtk/java/build.xml" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
"lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
Modified: vmkit/trunk/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/Makefile?rev=129225&r1=129224&r2=129225&view=diff
==============================================================================
--- vmkit/trunk/mmtk/Makefile (original)
+++ vmkit/trunk/mmtk/Makefile Sat Apr 9 14:46:08 2011
@@ -9,7 +9,6 @@
LEVEL = ..
DIRS = magic mmtk-j3 mmtk-alloc java inline
-EXTRA_DIST = config/marksweep
include $(LEVEL)/Makefile.config
Removed: vmkit/trunk/mmtk/java/build.xml
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/build.xml?rev=129224&view=auto
==============================================================================
--- vmkit/trunk/mmtk/java/build.xml (original)
+++ vmkit/trunk/mmtk/java/build.xml (removed)
@@ -1,9 +0,0 @@
-<project name="MMTK-VMKit" default="main" basedir=".">
- <target name="main">
- <mkdir dir="classes"/>
- <javac srcdir="src" destdir="classes" source="1.5"/>
- <jar jarfile="mmtk-vmkit.jar">
- <fileset dir="classes"/>
- </jar>
- </target>
-</project>
Added: vmkit/trunk/mmtk/java/build.xml.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/build.xml.in?rev=129225&view=auto
==============================================================================
--- vmkit/trunk/mmtk/java/build.xml.in (added)
+++ vmkit/trunk/mmtk/java/build.xml.in Sat Apr 9 14:46:08 2011
@@ -0,0 +1,9 @@
+<project name="MMTK-VMKit" default="main" basedir=".">
+ <target name="main">
+ <mkdir dir="classes"/>
+ <javac srcdir="@abs_top_srcdir@/mmtk/java/src:./src" destdir="classes" source="1.5"/>
+ <jar jarfile="mmtk-vmkit.jar">
+ <fileset dir="classes"/>
+ </jar>
+ </target>
+</project>
More information about the vmkit-commits
mailing list