[Rev 04] RFR: Add support for offline and local builds

[Erik Helin]

On Thu, 7 Nov 2019 09:08:12 GMT, Erik Helin <ehelin at openjdk.org> wrote:

> On Thu, 7 Nov 2019 06:55:15 GMT, Nick Gasson <ngasson at openjdk.org> wrote:
> 
>> On Wed, 6 Nov 2019 08:19:01 GMT, Erik Helin <ehelin at openjdk.org> wrote:
>> 
>>> The pull request has been updated with additional changes.
>>> 
>>> ----------------
>>> 
>>> Added commits:
>>>  - b68a41a9: Fix Windows x64 JDK hashsum check
>>> 
>>> Changes:
>>>   - all: https://git.openjdk.java.net/skara/pull/237/files
>>>   - new: https://git.openjdk.java.net/skara/pull/237/files/07073380..b68a41a9
>>> 
>>> Webrevs:
>>>  - full: https://webrevs.openjdk.java.net/skara/237/webrev.04
>>>  - incr: https://webrevs.openjdk.java.net/skara/237/webrev.03-04
>>> 
>>>   Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
>>>   Patch: https://git.openjdk.java.net/skara/pull/237.diff
>>>   Fetch: git fetch https://git.openjdk.java.net/skara pull/237/head:pull/237
>> 
>> build.gradle line 141:
>> 
>>> 140:     }
>>> 141:     throw new GradleException("Unexpected operating system: " + cpu)
>>> 142: }
>> 
>> Should be "Unexpected CPU"?
>> 
>> build.gradle line 140:
>> 
>>> 139:         return 'arm'
>>> 140:     }
>>> 141:     throw new GradleException("Unexpected operating system: " + cpu)
>> 
>> 64-bit and 32-bit Arm have different `os.arch` values. So we need to add:
>> 
>> if (cpu.startsWith('aarch64')) {
>>     return 'aarch64'
>> }
>> 
>> buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java line 70:
>> 
>>> 69:             return "arm";
>>> 70:         }
>>> 71: 
>> 
>> Also need to check for `aarch64` here:
>> 
>> if (p.startsWith("aarch64")) {
>>     return "aarch64";
>> }
> 
> Ah, right, thanks. Fixed!

Thanks, fixed this one as well!

PR: https://git.openjdk.java.net/skara/pull/237