← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/openjdk-6/jaunty-security

« back to all changes in this revision

Viewing changes to patches/icedtea-version.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Edward Nevill, Matthias Klose
  • Date: 2009-03-02 16:18:01 UTC
  • Revision ID: james.westby@ubuntu.com-20090302161801-rubk3yhm8j0au4y1
Tags: 6b14-0ubuntu17
[ Edward Nevill ]
* Remove VFP from asm loop
* Disble the mauve testsuite for armel.

[Matthias Klose]
* Update IcedTea (20090302).

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/icedtea-version.patch
23
23
   PRODUCT_NAME = OpenJDK
24
24
   PRODUCT_SUFFIX = Runtime Environment
25
25
   JDK_RC_PLATFORM_NAME = Platform
 
26
--- openjdk/jdk/src/share/classes/sun/misc/Version-template.java.~1~    2008-11-25 01:04:53.000000000 -0800
 
27
+++ openjdk/jdk/src/share/classes/sun/misc/Version-template.java        2009-02-20 09:03:25.000000000 -0800
 
28
@@ -41,6 +41,12 @@
 
29
     private static final String java_runtime_version =
 
30
         "@@java_runtime_version@@";
 
31
 
 
32
+    private static final String jdk_derivative_name =
 
33
+        "@@jdk_derivative_name@@";
 
34
+
 
35
+    private static final String distro_package_version =
 
36
+        "@@distro_package_version@@";
 
37
+
 
38
     static {
 
39
         init();
 
40
     }
 
41
@@ -82,8 +88,17 @@
 
42
         ps.println(launcher_name + " version \"" + java_version + "\"");
 
43
 
 
44
         /* Second line: runtime version (ie, libraries). */
 
45
-        ps.println(java_runtime_name + " (build " +
 
46
-                           java_runtime_version + ")");
 
47
+       StringBuilder sb = new StringBuilder();
 
48
+       sb.append(java_runtime_name);
 
49
+       if (jdk_derivative_name.length() > 0) {
 
50
+           sb.append(" (").append(jdk_derivative_name).append(")");
 
51
+       }
 
52
+       if (distro_package_version.length() > 0) {
 
53
+           sb.append(" (").append(distro_package_version).append(")");
 
54
+       } else {
 
55
+           sb.append(" (build ").append(java_runtime_version).append(")");
 
56
+       }
 
57
+       ps.println(sb.toString());
 
58
 
 
59
         /* Third line: JVM information. */
 
60
         String java_vm_name    = System.getProperty("java.vm.name");
 
61
--- openjdk/jdk/make/java/version/Makefile.~1~  2008-11-25 01:01:15.000000000 -0800
 
62
+++ openjdk/jdk/make/java/version/Makefile      2009-02-20 09:03:56.000000000 -0800
 
63
@@ -39,6 +39,8 @@
 
64
        $(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
 
65
            -e 's/@@java_version@@/$(RELEASE)/g' \
 
66
            -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
 
67
+           -e 's/@@jdk_derivative_name@@/$(JDK_DERIVATIVE_NAME)/g' \
 
68
+           -e 's/@@distro_package_version@@/$(DISTRO_PACKAGE_VERSION)/g' \
 
69
            -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
 
70
        $< > $@.temp
 
71
        @$(MV) $@.temp $@