Skip to content

Commit 315d5ee

Browse files
deepydeepy
authored
Merge pull request #167 from akatona84/issue-166
Add support for Linux Power PC #166
2 parents 75df597 + 9e03f5a commit 315d5ee

3 files changed

Lines changed: 27 additions & 22 deletions

File tree

‎src/main/kotlin/com/github/gradle/node/util/PlatformHelper.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ open class PlatformHelper constructor(private val props: Properties = System.get
2424
*/
2525
arch == "arm" || arch.startsWith("aarch") -> property("uname")
2626
.mapIf({ it == "armv8l" || it == "aarch64" }) { "arm64" }
27+
arch == "ppc64le" -> "ppc64le"
2728
arch.contains("64") -> "x64"
2829
else -> "x86"
2930
}

‎src/test/groovy/com/github/gradle/node/util/PlatformHelperTest.groovy‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ class PlatformHelperTest extends Specification {
2424
this.helper.isWindows() == isWindows
2525

2626
where:
27-
osProp | archProp | osName | osArch | isWindows
28-
'Windows 8' | 'x86' | 'win' | 'x86' | true
29-
'Windows 8' | 'x86_64' | 'win' | 'x64' | true
30-
'Mac OS X' | 'x86' | 'darwin' | 'x86' | false
31-
'Mac OS X' | 'x86_64' | 'darwin' | 'x64' | false
32-
'Linux' | 'x86' | 'linux' | 'x86' | false
33-
'Linux' | 'x86_64' | 'linux' | 'x64' | false
34-
'SunOS' | 'x86' | 'sunos' | 'x86' | false
35-
'SunOS' | 'x86_64' | 'sunos' | 'x64' | false
27+
osProp | archProp | osName | osArch | isWindows
28+
'Windows 8' | 'x86' | 'win' | 'x86' | true
29+
'Windows 8' | 'x86_64' | 'win' | 'x64' | true
30+
'Mac OS X' | 'x86' | 'darwin' | 'x86' | false
31+
'Mac OS X' | 'x86_64' | 'darwin' | 'x64' | false
32+
'Linux' | 'x86' | 'linux' | 'x86' | false
33+
'Linux' | 'x86_64' | 'linux' | 'x64' | false
34+
'Linux' | 'ppc64le' | 'linux' | 'ppc64le' | false
35+
'SunOS' | 'x86' | 'sunos' | 'x86' | false
36+
'SunOS' | 'x86_64' | 'sunos' | 'x64' | false
3637
}
3738

3839
@Unroll
@@ -53,6 +54,7 @@ class PlatformHelperTest extends Specification {
5354
'aarch32' | 'arm' | 'arm'
5455
'aarch64' | 'arm64' | 'arm64'
5556
'aarch64' | 'aarch64' | 'arm64'
57+
'ppc64le' | 'ppc64le' | 'ppc64le'
5658
}
5759

5860
def "throw exception if unsupported os"() {

‎src/test/groovy/com/github/gradle/node/variant/VariantComputerTest.groovy‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,16 @@ class VariantComputerTest extends Specification {
9999
computedNpxScriptFile.get().toString().endsWith(NODE_BASE_PATH + nodeDir + PS + "lib${PS}node_modules${PS}npm${PS}bin${PS}npx-cli.js")
100100

101101
where:
102-
osName | osArch | nodeDir | depName
103-
'Linux' | 'x86' | 'node-v5.12.0-linux-x86' | 'org.nodejs:node:5.12.0:linux-x86@tar.gz'
104-
'Linux' | 'x86_64' | 'node-v5.12.0-linux-x64' | 'org.nodejs:node:5.12.0:linux-x64@tar.gz'
105-
'Mac OS X' | 'x86' | 'node-v5.12.0-darwin-x86' | 'org.nodejs:node:5.12.0:darwin-x86@tar.gz'
106-
'Mac OS X' | 'x86_64' | 'node-v5.12.0-darwin-x64' | 'org.nodejs:node:5.12.0:darwin-x64@tar.gz'
107-
'FreeBSD' | 'x86' | 'node-v5.12.0-linux-x86' | 'org.nodejs:node:5.12.0:linux-x86@tar.gz'
108-
'FreeBSD' | 'x86_64' | 'node-v5.12.0-linux-x64' | 'org.nodejs:node:5.12.0:linux-x64@tar.gz'
109-
'SunOS' | 'x86' | 'node-v5.12.0-sunos-x86' | 'org.nodejs:node:5.12.0:sunos-x86@tar.gz'
110-
'SunOS' | 'x86_64' | 'node-v5.12.0-sunos-x64' | 'org.nodejs:node:5.12.0:sunos-x64@tar.gz'
102+
osName | osArch | nodeDir | depName
103+
'Linux' | 'x86' | 'node-v5.12.0-linux-x86' | 'org.nodejs:node:5.12.0:linux-x86@tar.gz'
104+
'Linux' | 'x86_64' | 'node-v5.12.0-linux-x64' | 'org.nodejs:node:5.12.0:linux-x64@tar.gz'
105+
'Linux' | 'ppc64le' | 'node-v5.12.0-linux-ppc64le' | 'org.nodejs:node:5.12.0:linux-ppc64le@tar.gz'
106+
'Mac OS X' | 'x86' | 'node-v5.12.0-darwin-x86' | 'org.nodejs:node:5.12.0:darwin-x86@tar.gz'
107+
'Mac OS X' | 'x86_64' | 'node-v5.12.0-darwin-x64' | 'org.nodejs:node:5.12.0:darwin-x64@tar.gz'
108+
'FreeBSD' | 'x86' | 'node-v5.12.0-linux-x86' | 'org.nodejs:node:5.12.0:linux-x86@tar.gz'
109+
'FreeBSD' | 'x86_64' | 'node-v5.12.0-linux-x64' | 'org.nodejs:node:5.12.0:linux-x64@tar.gz'
110+
'SunOS' | 'x86' | 'node-v5.12.0-sunos-x86' | 'org.nodejs:node:5.12.0:sunos-x86@tar.gz'
111+
'SunOS' | 'x86_64' | 'node-v5.12.0-sunos-x64' | 'org.nodejs:node:5.12.0:sunos-x64@tar.gz'
111112
}
112113

113114
@Unroll
@@ -144,10 +145,11 @@ class VariantComputerTest extends Specification {
144145
computedNpxScriptFile.get().toString().endsWith(NODE_BASE_PATH + nodeDir + PS + "lib${PS}node_modules${PS}npm${PS}bin${PS}npx-cli.js")
145146
146147
where:
147-
osName | osArch | sysOsArch | nodeDir | depName
148-
'Linux' | 'arm' | 'armv6l' | 'node-v5.12.0-linux-armv6l' | 'org.nodejs:node:5.12.0:linux-armv6l@tar.gz'
149-
'Linux' | 'arm' | 'armv7l' | 'node-v5.12.0-linux-armv7l' | 'org.nodejs:node:5.12.0:linux-armv7l@tar.gz'
150-
'Linux' | 'arm' | 'arm64' | 'node-v5.12.0-linux-arm64' | 'org.nodejs:node:5.12.0:linux-arm64@tar.gz'
148+
osName | osArch | sysOsArch | nodeDir | depName
149+
'Linux' | 'arm' | 'armv6l' | 'node-v5.12.0-linux-armv6l' | 'org.nodejs:node:5.12.0:linux-armv6l@tar.gz'
150+
'Linux' | 'arm' | 'armv7l' | 'node-v5.12.0-linux-armv7l' | 'org.nodejs:node:5.12.0:linux-armv7l@tar.gz'
151+
'Linux' | 'arm' | 'arm64' | 'node-v5.12.0-linux-arm64' | 'org.nodejs:node:5.12.0:linux-arm64@tar.gz'
152+
'Linux' | 'ppc64le' | 'ppc64le' | 'node-v5.12.0-linux-ppc64le' | 'org.nodejs:node:5.12.0:linux-ppc64le@tar.gz'
151153
}
152154
153155
@Unroll

0 commit comments

Comments
 (0)