packages: java-sun/Test.class, java-sun/Test.java, java-sun/java-sun.spec -...
glen
glen at pld-linux.org
Fri Feb 26 16:12:22 CET 2010
Author: glen Date: Fri Feb 26 15:12:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use stderr for output, as java prints it find_vma problem to stdout
---- Files affected:
packages/java-sun:
Test.class (1.1 -> 1.2) , Test.java (1.2 -> 1.3) , java-sun.spec (1.238 -> 1.239)
---- Diffs:
================================================================
Index: packages/java-sun/Test.class
<<Binary file>>
================================================================
Index: packages/java-sun/Test.java
diff -u packages/java-sun/Test.java:1.2 packages/java-sun/Test.java:1.3
--- packages/java-sun/Test.java:1.2 Fri Feb 26 12:16:38 2010
+++ packages/java-sun/Test.java Fri Feb 26 16:12:17 2010
@@ -8,6 +8,6 @@
public class Test {
public static void main(String[] args) {
Properties p = System.getProperties();
- System.out.println(p.get("java.class.version"));
+ System.err.println(p.get("java.class.version"));
}
}
================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.238 packages/java-sun/java-sun.spec:1.239
--- packages/java-sun/java-sun.spec:1.238 Fri Feb 26 12:21:51 2010
+++ packages/java-sun/java-sun.spec Fri Feb 26 16:12:17 2010
@@ -355,7 +355,8 @@
fi
# $ORIGIN does not work on PLD builders. workaround with LD_LIBARY_PATH
-classver=$(LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli ./bin/java Test)
+LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli ./bin/java Test 2> classver >/dev/null
+classver=$(cat classver)
if [ "$classver" != %{_classdataversion} ]; then
echo "Set %%define _classdataversion to $classver and rerun."
@@ -935,6 +936,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.239 2010/02/26 15:12:17 glen
+- use stderr for output, as java prints it find_vma problem to stdout
+
Revision 1.238 2010/02/26 11:21:51 glen
- grab java class version by printing out java.class.version system property
with precompiled class. hopefully this will not hung our builders
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/Test.class?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/Test.java?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.238&r2=1.239&f=u
More information about the pld-cvs-commit
mailing list