stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8304171: Fix layout of JCov instrumented bundle on Mac OS

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Alexandre Iline 2023-03-14 23:36:57 +00:00
parent cd41c69d44
commit 065d3e0d58
2 changed files with 3 additions and 3 deletions

4
make/Bundles.gmk

@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -449,7 +449,7 @@ ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), )
BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \
FILES := $(JCOV_BUNDLE_FILES), \
BASE_DIRS := $(JCOV_IMAGE_DIR), \
SUBDIR := $(JDK_BUNDLE_SUBDIR), \
SUBDIR := jdk-$(VERSION_NUMBER), \
))
JCOV_TARGETS += $(BUILD_JCOV_BUNDLE)

2
make/conf/jib-profiles.js

@ -851,7 +851,7 @@ var getJibProfilesProfiles = function (input, common, data) {
[ "linux-aarch64", "linux-x64", "macosx-x64", "macosx-aarch64", "windows-x64" ]
.forEach(function (name) {
var o = artifactData[name]
var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
var jdk_subdir = "jdk-" + data.version;
var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
var pf = o.platform
var jcovName = name + "-jcov";