fix: don't try to build OS X x64

develar · develar · commit ee6443263396 · 2016-06-12T10:44:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ dist/
 /typings/browser/
 /typings/browser.d.ts
 /typings/main.d.ts
-.DS_Store
+.DS_Store
+.idea/shelf/
diff --git a/src/builder.ts b/src/builder.ts
@@ -89,8 +89,13 @@ export function normalizeOptions(args: CliOptions): BuildOptions {
     }
 
     if (types.length === 0) {
-      for (let arch of commonArch()) {
-        archToType.set(arch, [])
+      if (platform === Platform.OSX) {
+        archToType.set(Arch.x64, [])
+      }
+      else {
+        for (let arch of commonArch()) {
+          archToType.set(arch, [])
+        }
       }
       return
     }
diff --git a/src/metadata.ts b/src/metadata.ts
@@ -399,6 +399,10 @@ export class Platform {
 
   createTarget(type?: string | Array<string> | null, ...archs: Array<Arch>): Map<Platform, Map<Arch, Array<string>>> {
     const archToType = new Map()
+    if (this === Platform.OSX) {
+      archs = [Arch.x64]
+    }
+
     for (let arch of (archs == null || archs.length === 0 ? [archFromString(process.arch)] : archs)) {
       archToType.set(arch, type == null ? [] : (Array.isArray(type) ? type : [type]))
     }
diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts
@@ -29,6 +29,7 @@ test("cli", () => {
   }
 
   assertThat(parse("--platform osx")).isEqualTo(expected({targets: Platform.OSX.createTarget()}))
+  assertThat(parse("-owl --x64 --ia32")).isEqualTo(expected({targets: new Map([...Platform.OSX.createTarget(null, Arch.x64), ...Platform.WINDOWS.createTarget(null, Arch.x64, Arch.ia32), ...Platform.LINUX.createTarget(null, Arch.x64, Arch.ia32)])}))
   assertThat(parse("--osx")).isEqualTo(expected({targets: Platform.OSX.createTarget()}))
   assertThat(parse("--arch x64")).isEqualTo(expected({targets: Platform.current().createTarget(null, Arch.x64)}))
   assertThat(parse("--ia32 --x64")).isEqualTo(expected({targets: Platform.current().createTarget(null, Arch.x64, Arch.ia32)}))

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,13 @@ export function normalizeOptions(args: CliOptions): BuildOptions {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (types.length === 0) {`
`92`		`- for (let arch of commonArch()) {`
`93`		`- archToType.set(arch, [])`
	`92`	`+ if (platform === Platform.OSX) {`
	`93`	`+ archToType.set(Arch.x64, [])`
	`94`	`+ }`
	`95`	`+ else {`
	`96`	`+ for (let arch of commonArch()) {`
	`97`	`+ archToType.set(arch, [])`
	`98`	`+ }`
`94`	`99`	`}`
`95`	`100`	`return`
`96`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ test("cli", () => {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`assertThat(parse("--platform osx")).isEqualTo(expected({targets: Platform.OSX.createTarget()}))`
	`32`	`+ assertThat(parse("-owl --x64 --ia32")).isEqualTo(expected({targets: new Map([...Platform.OSX.createTarget(null, Arch.x64), ...Platform.WINDOWS.createTarget(null, Arch.x64, Arch.ia32), ...Platform.LINUX.createTarget(null, Arch.x64, Arch.ia32)])}))`
`32`	`33`	`assertThat(parse("--osx")).isEqualTo(expected({targets: Platform.OSX.createTarget()}))`
`33`	`34`	`assertThat(parse("--arch x64")).isEqualTo(expected({targets: Platform.current().createTarget(null, Arch.x64)}))`
`34`	`35`	`assertThat(parse("--ia32 --x64")).isEqualTo(expected({targets: Platform.current().createTarget(null, Arch.x64, Arch.ia32)}))`