PatchSet 7664
Date: 2008/01/03 00:48:25
Author: robilad
Branch: HEAD
Tag: (none)
Log:
cleaned up BUILD_ENVIRONMENT
2008-01-02 Dalibor Topic <[EMAIL PROTECTED]>
* Makefile.am (BUILD_ENVRONMENT-make): Cleaned up, and removed no
longer used paths.
Members:
ChangeLog:1.5166->1.5167
Makefile.am:1.146->1.147
Makefile.in:1.303->1.304
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5166 kaffe/ChangeLog:1.5167
--- kaffe/ChangeLog:1.5166 Wed Jan 2 23:48:20 2008
+++ kaffe/ChangeLog Thu Jan 3 00:48:25 2008
@@ -1,5 +1,9 @@
2008-01-02 Dalibor Topic <[EMAIL PROTECTED]>
+ * Makefile.am (BUILD_ENVRONMENT-make): Cleaned up, and removed no
longer used paths.
+
+2008-01-02 Dalibor Topic <[EMAIL PROTECTED]>
+
* test/regression/SecureRandomTest.java: Adapted to work with default
crypto provider.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.146 kaffe/Makefile.am:1.147
--- kaffe/Makefile.am:1.146 Wed Jan 2 22:28:48 2008
+++ kaffe/Makefile.am Thu Jan 3 00:48:26 2008
@@ -156,9 +156,9 @@
"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
BUILD_ENVIRONMENT-make: Makefile
- echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
- echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >>
BUILD_ENVIRONMENT.new; \
- echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/kaffe/kaffevm/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-util/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\''$(PATHSEP)'\'@[EMAIL
PROTECTED]; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
+ echo CLASSPATH=.'$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\; export
CLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=$(top_builddir)/kaffe/kaffevm/.libs'$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'@[EMAIL
PROTECTED]''$(PATHSEP)'\'.\'\; export KAFFELIBRARYPATH >>
BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.303 kaffe/Makefile.in:1.304
--- kaffe/Makefile.in:1.303 Wed Jan 2 23:48:21 2008
+++ kaffe/Makefile.in Thu Jan 3 00:48:26 2008
@@ -883,9 +883,9 @@
"DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make
BUILD_ENVIRONMENT-make: Makefile
- echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
- echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >>
BUILD_ENVIRONMENT.new; \
- echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/kaffe/kaffevm/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-lang/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/external/classpath/native/jni/java-util/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\''$(PATHSEP)'\'@[EMAIL
PROTECTED]; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo
BOOTCLASSPATH=$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/zlib-zip/kaffe-zlib.jar\''$(PATHSEP)'\'$(GLIBJ_ZIP)\''$(PATHSEP)'\'\$${BOOTCLASSPATH}\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
+ echo CLASSPATH=.'$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\; export
CLASSPATH | $(SED) 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=$(top_builddir)/kaffe/kaffevm/.libs'$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'@[EMAIL
PROTECTED]''$(PATHSEP)'\'.\'\; export KAFFELIBRARYPATH >>
BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
