infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8303476: Add the runtime version in the release file of a JDK image

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Mandy Chung 2023-03-02 17:05:01 +00:00
parent 0926d0cbce
commit 32247c336a
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/ReleaseFile.gmk
View File

@ -51,6 +51,7 @@ define create-info-file
$(if $(VENDOR_VERSION_STRING), \ $(if $(VENDOR_VERSION_STRING), \
$(call info-file-item, "IMPLEMENTOR_VERSION", "$(VENDOR_VERSION_STRING)")) $(call info-file-item, "IMPLEMENTOR_VERSION", "$(VENDOR_VERSION_STRING)"))
$(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)") $(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)")
$(call info-file-item, "JAVA_RUNTIME_VERSION", "$(VERSION_STRING)")
$(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)") $(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)")
$(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)") $(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)")
$(call info-file-item, "LIBC", "$(RELEASE_FILE_LIBC)") $(call info-file-item, "LIBC", "$(RELEASE_FILE_LIBC)")

47
test/jdk/build/releaseFile/CheckSource.java → test/jdk/build/releaseFile/CheckReleaseFile.java
View File

@ -1,6 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,9 +23,9 @@
/* /*
* @test * @test
* @bug 8193660 * @bug 8193660 8303476
* @summary Check SOURCE line in "release" file for closedjdk * @summary Check SOURCE line and JAVA_RUNTIME_VERSION in "release" file
* @run main CheckSource * @run main CheckReleaseFile
*/ */
import java.io.BufferedReader; import java.io.BufferedReader;
@ -37,18 +36,21 @@ import java.io.IOException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class CheckSource { public class CheckReleaseFile {
public static final String SRC_HASH_REGEXP = ":((hg)|(git)):[a-z0-9]*\\+?"; public static final String SRC_HASH_REGEXP = ":((hg)|(git)):[a-z0-9]*\\+?";
CheckSource(String dataFile, boolean isOpenJDK) { private final boolean isOpenJDK;
CheckReleaseFile(String dataFile, boolean isOpenJDK) {
this.isOpenJDK = isOpenJDK;
// Read data files // Read data files
readFile(dataFile, isOpenJDK); readFile(dataFile);
} }
private void readFile(String fileName, boolean isOpenJDK) { private void readFile(String fileName) {
String fishForSOURCE = null; String fishForSOURCE = null;
String implementor = null; String implementor = null;
String runtimeVersion = null;
File file = new File(fileName); File file = new File(fileName);
@ -78,6 +80,12 @@ public class CheckSource {
implementor = readIn; implementor = readIn;
continue; continue;
} }
// grab JAVA_RUNTIME_VERSION line
if (readIn.startsWith("JAVA_RUNTIME_VERSION=")) {
runtimeVersion = readIn;
continue;
}
} }
} catch (FileNotFoundException fileExcept) { } catch (FileNotFoundException fileExcept) {
throw new RuntimeException("File " + fileName + throw new RuntimeException("File " + fileName +
@ -91,6 +99,23 @@ public class CheckSource {
if (fishForSOURCE == null) { if (fishForSOURCE == null) {
throw new RuntimeException("SOURCE line was not found!"); throw new RuntimeException("SOURCE line was not found!");
} }
// Check if implementor is Oracle
boolean isOracle = (implementor != null) && implementor.contains("Oracle Corporation");
checkSource(fishForSOURCE, isOracle);
if (runtimeVersion == null) {
throw new RuntimeException("JAVA_RUNTIME_VERSION line was not found!");
}
String expected = "JAVA_RUNTIME_VERSION=\"" + Runtime.version() + "\"";
if (!expected.equals(runtimeVersion)) {
throw new RuntimeException("Mismatched runtime version: " +
runtimeVersion + " expected: " + expected);
}
}
private void checkSource(String fishForSOURCE, boolean isOracle) {
System.out.println("The source string found: " + fishForSOURCE); System.out.println("The source string found: " + fishForSOURCE);
// Extract the value of SOURCE= // Extract the value of SOURCE=
@ -101,8 +126,6 @@ public class CheckSource {
} }
String valueString = valueMatcher.group(1); String valueString = valueMatcher.group(1);
// Check if implementor is Oracle
boolean isOracle = (implementor != null) && implementor.contains("Oracle Corporation");
String[] values = valueString.split(" "); String[] values = valueString.split(" ");
@ -144,6 +167,6 @@ public class CheckSource {
System.out.println("JDK Path : " + jdkPath); System.out.println("JDK Path : " + jdkPath);
System.out.println("Runtime Name : " + runtime); System.out.println("Runtime Name : " + runtime);
new CheckSource(jdkPath + "/release", runtime.contains("OpenJDK")); new CheckReleaseFile(jdkPath + "/release", runtime.contains("OpenJDK"));
} }
} }