Skip to content

Commit

Permalink
8287754: Update jib GNU make dependency on Windows to latest cygwin b…
Browse files Browse the repository at this point in the history 
…uild

Reviewed-by: djelinski, ihse, mikael
  • Loading branch information
@erikj79
erikj79 committed Oct 25, 2022
1 parent 9051dde commit af2de97
Showing 1 changed file with 20 additions and 11 deletions.
31 changes: 20 additions & 11 deletions make/conf/jib-profiles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
* input.build_osenv
* input.build_osenv_cpu
* input.build_osenv_platform
* input.build_osenv_version
*
* For more complex nested attributes, there is a method "get":
*
Expand Down Expand Up @@ -1088,9 +1089,23 @@ var getJibProfilesDependencies = function (input, common) {
pandoc_version = "2.3.1+1.0";
}

var makeBinDir = (input.build_os == "windows"
? input.get("gnumake", "install_path") + "/cygwin/bin"
: input.get("gnumake", "install_path") + "/bin");
var makeRevision = "4.0+1.0";
var makeBinSubDir = "/bin";
var makeModule = "gnumake-" + input.build_platform;
if (input.build_os == "windows") {
makeModule = "gnumake-" + input.build_osenv_platform;
if (input.build_osenv == "cygwin") {
var versionArray = input.build_osenv_version.split(/\./);
var majorVer = parseInt(versionArray[0]);
var minorVer = parseInt(versionArray[1]);
if (majorVer > 3 || (majorVer == 3 && minorVer >= 3)) {
makeRevision = "4.3+1.0";
} else {
makeBinSubDir = "/cygwin/bin";
}
}
}
var makeBinDir = input.get("gnumake", "install_path") + makeBinSubDir;

var dependencies = {
boot_jdk: boot_jdk,
Expand Down Expand Up @@ -1155,18 +1170,12 @@ var getJibProfilesDependencies = function (input, common) {
gnumake: {
organization: common.organization,
ext: "tar.gz",
revision: "4.0+1.0",

module: (input.build_os == "windows"
? "gnumake-" + input.build_osenv_platform
: "gnumake-" + input.build_platform),

revision: makeRevision,
module: makeModule,
configure_args: "MAKE=" + makeBinDir + "/make",

environment: {
"MAKE": makeBinDir + "/make"
},

environment_path: makeBinDir
},

Expand Down

3 comments on commit af2de97

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on af2de97 Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on af2de97 Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin Could not automatically backport af2de975 to openjdk/jdk17u-dev due to conflicts in the following files:

  • make/conf/jib-profiles.js

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b GoeLin-backport-af2de975

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk af2de975cbc46ad91c736b110a2212cd32ba60a7

# Backport the commit
$ git cherry-pick --no-commit af2de975cbc46ad91c736b110a2212cd32ba60a7
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport af2de975cbc46ad91c736b110a2212cd32ba60a7'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport af2de975cbc46ad91c736b110a2212cd32ba60a7.

Please sign in to comment.