harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r343845 - in /incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm: APACHE.README INSTALL configure.in etc/makedist.sh java/Makefile.am libjc/Makefile.am libjc/definitions.h tools/Makefile.am tools/cfdump/Makefile.am tools/jcgen/
Date Sun, 13 Nov 2005 21:11:42 GMT
Author: archie
Date: Sun Nov 13 13:11:32 2005
New Revision: 343845

URL: http://svn.apache.org/viewcvs?rev=343845&view=rev
Log:
- Remove more stuff related to code generation and Soot.
- Make the default expected Classpath location be /usr/local/classpath.

Removed:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/jcgen/
Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/APACHE.README
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/INSTALL
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/makedist.sh
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/Makefile.am
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/definitions.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/Makefile.am
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/cfdump/Makefile.am

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/APACHE.README
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/APACHE.README?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/APACHE.README (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/APACHE.README Sun Nov
13 13:11:32 2005
@@ -22,9 +22,10 @@
 To create the distribution tarball:
 
   0. You'll need autoconf, automake, autoheader, and libtool installed first.
-  1. Follow INSTALL step 0 & 1 to install libpopt, libz, and Classpath;
+  1. Follow INSTALL step 0 & 1 to install libpopt, libz, and Classpath.
      you should configure Classpath with ``--prefix=/usr/local''
-  2. Run the etc/makedist.sh script as root.
+  2. Run "sh etc/makedist.sh --with-classpath=DIR" as root with DIR being
+     the Classpath installation root (default is /usr/local/classpath).
 
 Once you've done that, you don't actually have to use the distribution
 tarball; you can just run "make && make install" from this directory.

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/INSTALL
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/INSTALL?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/INSTALL (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/INSTALL Sun Nov 13 13:11:32
2005
@@ -39,7 +39,7 @@
 
    Then:
 
-	$ ./configure --prefix=/usr/local --enable-jni --with-jikes
+	$ ./configure --enable-jni --with-jikes
 	$ gmake
 	$ gmake install
 
@@ -55,7 +55,7 @@
 	$ make install
 
    where DIR is the Classpath is install location, i.e., the --prefix
-   you configured Classpath with. Classpath's default prefix is
+   you configured Classpath with (if any). Classpath's default prefix is
    /usr/local/classpath, but packaging systems often change this. E.g.,
    on Debian, if using the classpath package, use "--with-classpath=/usr".
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/configure.in Sun Nov 13
13:11:32 2005
@@ -12,9 +12,6 @@
 
 # Definitions
 AC_SUBST(LIBRARY_VERSION, [1:1:0])
-AC_SUBST(SOOT_VERSION, [2.1.0])
-AC_SUBST(JASMIN_VERSION, [1.2])
-AC_SUBST(POLYGLOT_VERSION, [1.1.0])
 AC_SUBST(CLASSPATH_VERSION, [0.19])
 
 [JC_CFLAGS='-g -O3 -pipe -Wall -Waggregate-return -Wcast-align -Wchar-subscripts -Wcomment
-Wformat -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long
-Wparentheses -Wpointer-arith -Wredundant-decls -Wreturn-type -Wswitch -Wtrigraphs -Wuninitialized
-Wunused -Wwrite-strings']
@@ -33,8 +30,8 @@
     JC_PREFIX="$prefix"
 fi]
 
-# Get Classpath home, default to same as prefix
-[CLASSPATH_HOME="${JC_PREFIX}"]
+# Get Classpath home, default to /usr/local/classpath
+[CLASSPATH_HOME="/usr/local/classpath"]
 AC_ARG_WITH([classpath],
     [AC_HELP_STRING([--with-classpath=DIR],
 	[specify Classpath installation home])],

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/makedist.sh
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/makedist.sh?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/makedist.sh (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/etc/makedist.sh Sun Nov
13 13:11:32 2005
@@ -1,7 +1,13 @@
 #!/bin/sh
 # $Id$
 
-PREFIX=/usr/local
+CLASSPATH_HOME=/usr/local
+for ARG in $@; do
+  case $ARG in
+    --with-classpath=*)
+    	CLASSPATH_HOME=`echo $ARG | sed 's/--with-classpath=\(.*\)$/\1/g'`
+    	;;
+done
 
 if [ ! -f etc/makedist.sh ]; then
     echo '***' run me from the top level directory please
@@ -13,14 +19,14 @@
     exit 1
 fi
 
-if [ ! -w ${PREFIX}/share/classpath/glibj.zip ]; then
+if [ ! -w ${CLASSPATH_HOME}/share/classpath/glibj.zip ]; then
     echo '***' you must build and install classpath first
     exit 1
 fi
 
 rm -f java/jc.zip java/api.tgz
 
-sh etc/regen.sh
+sh etc/regen.sh ${1+"$@"}
 (cd tools && make && make install) || exit 1
 (cd java && make && make install) || exit 1
 (cd include && make && make install) || exit 1

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/java/Makefile.am Sun Nov
13 13:11:32 2005
@@ -5,9 +5,7 @@
 
 jc_DATA=	jc.zip
 
-sootdir=	$(top_srcdir)/soot
-
-CLASSPATH=	$(CLASSPATH_HOME)/share/classpath/glibj.zip:$(sootdir)/sootclasses-@SOOT_VERSION@.jar:$(sootdir)/jasminclasses-sable-@JASMIN_VERSION@.jar:$(sootdir)/polyglot-@POLYGLOT_VERSION@.jar
+CLASSPATH=	$(CLASSPATH_HOME)/share/classpath/glibj.zip
 
 JCOMPILE=	$(JIKES) -nowarn +F -bootclasspath '' -extdirs '' -sourcepath '' -classpath $(srcdir):$(CLASSPATH)
-d classes
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/Makefile.am?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/Makefile.am (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/Makefile.am Sun
Nov 13 13:11:32 2005
@@ -97,9 +97,6 @@
 AM_CFLAGS+=		-D_AC_LIBDIR=\"$(libdir)\"
 AM_CFLAGS+=		-D_AC_SYSCONFDIR=\"$(sysconfdir)\"
 AM_CFLAGS+=		-D_JC_CLASSPATH_HOME=\"@CLASSPATH_HOME@\"
-AM_CFLAGS+=		-DSOOT_VERSION=\"@SOOT_VERSION@\"
-AM_CFLAGS+=		-DJASMIN_VERSION=\"@JASMIN_VERSION@\"
-AM_CFLAGS+=		-DPOLYGLOT_VERSION=\"@POLYGLOT_VERSION@\"
 AM_CFLAGS+=		-D_JC_BOOTSTRAP_JAVA=\"$(JAVA)\"
 AM_CFLAGS+=		-D_JC_GNU_COMPILER=\"$(HOSTGCC)\"
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/definitions.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/definitions.h?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/definitions.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/definitions.h Sun
Nov 13 13:11:32 2005
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *
- * $Id: definitions.h,v 1.17 2005/05/24 01:09:38 archiecobbs Exp $
+ * $Id$
  */
 
 #ifndef _DEFINITIONS_H_
@@ -509,13 +509,7 @@
 
 #define _JC_BOOT_CLASS_PATH						\
     _AC_DATADIR "/jc/jc.zip"						\
-    _JC_PATH_SEPARATOR _JC_CLASSPATH_HOME "/share/classpath/glibj.zip"	\
-    _JC_PATH_SEPARATOR _AC_DATADIR 					\
-	"/jc/sootclasses-" SOOT_VERSION ".jar"				\
-    _JC_PATH_SEPARATOR _AC_DATADIR					\
-	"/jc/jasminclasses-sable-" JASMIN_VERSION ".jar"		\
-    _JC_PATH_SEPARATOR _AC_DATADIR					\
-	"/jc/polyglot-" POLYGLOT_VERSION ".jar"
+    _JC_PATH_SEPARATOR _JC_CLASSPATH_HOME "/share/classpath/glibj.zip"
 
 /*
  * Core classes that must be loaded by the boot loader.

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/Makefile.am?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/Makefile.am (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/Makefile.am Sun
Nov 13 13:11:32 2005
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.3 2005/01/08 23:23:07 archiecobbs Exp $
+## $Id$
 
-SUBDIRS=		cfdump jcgen jcjavah
+SUBDIRS=		cfdump jcjavah
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/cfdump/Makefile.am
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/cfdump/Makefile.am?rev=343845&r1=343844&r2=343845&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/cfdump/Makefile.am
(original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/tools/cfdump/Makefile.am
Sun Nov 13 13:11:32 2005
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2005/02/27 21:50:04 archiecobbs Exp $
+## $Id$
 
 jcbindir=	$(bindir)
 
@@ -22,9 +22,6 @@
 AM_CFLAGS+=	-D_AC_DATADIR=\"$(datadir)\"
 AM_CFLAGS+=	-D_AC_LIBDIR=\"$(libdir)\"
 AM_CFLAGS+=	-D_JC_CLASSPATH_HOME=\"@CLASSPATH_HOME@\"
-AM_CFLAGS+=	-DSOOT_VERSION=\"@SOOT_VERSION@\"
-AM_CFLAGS+=	-DJASMIN_VERSION=\"@JASMIN_VERSION@\"
-AM_CFLAGS+=	-DPOLYGLOT_VERSION=\"@POLYGLOT_VERSION@\"
 
 AM_CPPFLAGS=	-I$(top_srcdir)/libjc
 AM_CPPFLAGS+=	-I$(top_srcdir)/libjc/arch



Mime
View raw message