fix(windows): Releases file for Windows not uploaded to Github

develar · develar · commit 9f4fba98ad91 · 2016-03-03T20:31:10.000+01:00
Closes #190
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "bluebird": "^3.3.3",
     "command-line-args": "^2.1.6",
     "electron-packager-tf": "^5.2.3",
-    "electron-winstaller-temp-fork": "^2.0.5-beta.2",
+    "electron-winstaller-temp-fork": "^2.0.5-beta.3",
     "fs-extra": "^0.26.5",
     "gm": "^1.21.1",
     "hosted-git-info": "^2.1.4",
@@ -105,16 +105,16 @@
     ],
     "env": {
       "test": {
-        "ignore": "**/out/*.js",
+        "ignore": ["**/out/*.js"],
         "plugins": [
           [
-            "babel-plugin-transform-async-to-module-method",
+            "transform-async-to-module-method",
             {
               "module": "bluebird",
               "method": "coroutine"
             }
           ],
-          "babel-plugin-transform-es2015-modules-commonjs",
+          "transform-es2015-modules-commonjs",
           "transform-strict-mode"
         ]
       }
diff --git a/src/linuxPackager.ts b/src/linuxPackager.ts
@@ -63,13 +63,13 @@ export class LinuxPackager extends PlatformPackager<DebOptions> {
     return "linux"
   }
 
-  async packageInDistributableFormat(outDir: string, appOutDir: string): Promise<any> {
+  async packageInDistributableFormat(outDir: string, appOutDir: string, arch: string): Promise<any> {
     const specification: DebOptions = {
       version: this.metadata.version,
       title: this.metadata.name,
       comment: this.metadata.description,
       maintainer: `${this.metadata.author.name} <${this.metadata.author.email}>`,
-      arch: this.currentArch === "ia32" ? 32 : 64,
+      arch: arch === "ia32" ? 32 : 64,
       target: "deb",
       executable: this.metadata.name,
       desktop: `[Desktop Entry]
diff --git a/src/macPackager.ts b/src/macPackager.ts
@@ -28,8 +28,8 @@ export default class MacPackager extends PlatformPackager<appdmg.Specification>
     return "osx"
   }
 
-  async pack(platform: string, outDir: string, appOutDir: string): Promise<any> {
-    await super.pack(platform, outDir, appOutDir)
+  async pack(platform: string, outDir: string, appOutDir: string, arch: string): Promise<any> {
+    await super.pack(platform, outDir, appOutDir, arch)
     let codeSigningInfo = await this.codeSigningInfo
     return await this.signMac(path.join(appOutDir, this.metadata.name + ".app"), codeSigningInfo)
   }
diff --git a/src/packager.ts b/src/packager.ts
@@ -72,12 +72,11 @@ export class Packager implements BuildInfo {
       for (let arch of normalizeArchs(platform, this.options.arch)) {
         await this.installAppDependencies(arch)
 
-        helper.currentArch = arch
         const outDir = path.join(this.projectDir, "dist")
         const appOutDir = path.join(outDir, this.metadata.name + "-" + platform + "-" + arch)
-        await helper.pack(platform, outDir, appOutDir)
+        await helper.pack(platform, outDir, appOutDir, arch)
         if (this.options.dist) {
-          distTasks.push(helper.packageInDistributableFormat(outDir, appOutDir))
+          distTasks.push(helper.packageInDistributableFormat(outDir, appOutDir, arch))
         }
       }
     }
diff --git a/src/platformPackager.ts b/src/platformPackager.ts
@@ -70,8 +70,6 @@ export abstract class PlatformPackager<DC> implements ProjectMetadataProvider {
 
   customDistOptions: DC
 
-  currentArch: string
-
   protected abstract getBuildConfigurationKey(): string
 
   constructor(protected info: BuildInfo) {
@@ -97,7 +95,7 @@ export abstract class PlatformPackager<DC> implements ProjectMetadataProvider {
     this.info.eventEmitter.emit("artifactCreated", path)
   }
 
-  pack(platform: string, outDir: string, appOutDir: string): Promise<any> {
+  pack(platform: string, outDir: string, appOutDir: string, arch: string): Promise<any> {
     const version = this.metadata.version
     let buildVersion = version
     const buildNumber = process.env.TRAVIS_BUILD_NUMBER || process.env.APPVEYOR_BUILD_NUMBER || process.env.CIRCLE_BUILD_NUM
@@ -110,7 +108,7 @@ export abstract class PlatformPackager<DC> implements ProjectMetadataProvider {
       out: outDir,
       name: this.metadata.name,
       platform: platform,
-      arch: this.currentArch,
+      arch: arch,
       version: this.info.electronVersion,
       icon: path.join(this.buildResourcesDir, "icon"),
       asar: true,
@@ -132,5 +130,5 @@ export abstract class PlatformPackager<DC> implements ProjectMetadataProvider {
     return pack(options)
   }
 
-  abstract packageInDistributableFormat(outDir: string, appOutDir: string): Promise<any>
+  abstract packageInDistributableFormat(outDir: string, appOutDir: string, arch: string): Promise<any>
 }
diff --git a/src/promisifed-fs.ts b/src/promisifed-fs.ts
@@ -1,4 +1,4 @@
-import * as fs from "fs"
+import * as fs from "fs-extra"
 import { Promise as BluebirdPromise } from "bluebird"
 
 const readFileAsync: ((filename: string, encoding?: string) => Promise<string | Buffer>) = BluebirdPromise.promisify(fs.readFile)
@@ -20,6 +20,13 @@ export function renameFile(oldPath: string, newPath: string): BluebirdPromise<st
   })
 }
 
+// returns copied name
+export function copyFile(src: string, dest: string): BluebirdPromise<string> {
+  return new BluebirdPromise<any>((resolve, reject) => {
+    fs.copy(src, dest, error => error == null ? resolve(dest) : reject(error))
+  })
+}
+
 const statFileAsync = BluebirdPromise.promisify(fs.stat)
 
 export function stat(path: string): BluebirdPromise<fs.Stats> {
diff --git a/src/winPackager.ts b/src/winPackager.ts
@@ -5,7 +5,7 @@ import { PlatformPackager, BuildInfo } from "./platformPackager"
 import * as path from "path"
 import { Stats } from "fs"
 import { log } from "./util"
-import { deleteFile, stat, renameFile } from "./promisifed-fs"
+import { deleteFile, stat, renameFile, copyFile } from "./promisifed-fs"
 import * as fse from "fs-extra"
 
 const __awaiter = tsAwaiter
@@ -49,25 +49,25 @@ export default class WinPackager extends PlatformPackager<any> {
     return "win"
   }
 
-  pack(platform: string, outDir: string, appOutDir: string): Promise<any> {
+  pack(platform: string, outDir: string, appOutDir: string, arch: string): Promise<any> {
     if (this.options.dist && !this.isNsis) {
-      const installerOut = this.computeDistOut(outDir)
+      const installerOut = this.computeDistOut(outDir, arch)
       log("Removing %s", installerOut)
       return BluebirdPromise.all([
-        super.pack(platform, outDir, appOutDir),
+        super.pack(platform, outDir, appOutDir, arch),
         emptyDir(installerOut)
       ])
     }
     else {
-      return super.pack(platform, outDir, appOutDir)
+      return super.pack(platform, outDir, appOutDir, arch)
     }
   }
 
-  private computeDistOut(outDir: string): string {
-    return path.join(outDir, (this.isNsis ? "nsis" : "win") + (this.currentArch === "x64" ? "-x64" : ""))
+  private computeDistOut(outDir: string, arch: string): string {
+    return path.join(outDir, (this.isNsis ? "nsis" : "win") + (arch === "x64" ? "-x64" : ""))
   }
 
-  async packageInDistributableFormat(outDir: string, appOutDir: string): Promise<any> {
+  async packageInDistributableFormat(outDir: string, appOutDir: string, arch: string): Promise<any> {
     let iconUrl = this.metadata.build.iconUrl
     if (!iconUrl) {
       if (this.customDistOptions != null) {
@@ -89,9 +89,9 @@ export default class WinPackager extends PlatformPackager<any> {
 
     const certificateFile = await this.certFilePromise
     const version = this.metadata.version
-    const installerOutDir = this.computeDistOut(outDir)
+    const installerOutDir = this.computeDistOut(outDir, arch)
     const appName = this.metadata.name
-    const archSuffix = this.currentArch === "x64" ? "-x64" : ""
+    const archSuffix = arch === "x64" ? "-x64" : ""
     const installerExePath = path.join(installerOutDir, appName + "Setup-" + version + archSuffix + ".exe")
     const options = Object.assign({
       name: this.metadata.name,
@@ -134,12 +134,22 @@ export default class WinPackager extends PlatformPackager<any> {
       }
     }
 
-    return await BluebirdPromise.all([
+    const promises = [
       renameFile(path.join(installerOutDir, "Setup.exe"), installerExePath)
         .then(it => this.dispatchArtifactCreated(it)),
       renameFile(path.join(installerOutDir, appName + "-" + version + "-full.nupkg"), path.join(installerOutDir, appName + "-" + version + archSuffix + "-full.nupkg"))
         .then(it => this.dispatchArtifactCreated(it))
-    ])
+    ]
+
+    if (arch === "x64") {
+      this.dispatchArtifactCreated(path.join(installerOutDir, "RELEASES"))
+    }
+    else {
+      promises.push(copyFile(path.join(installerOutDir, "RELEASES"), path.join(installerOutDir, "RELEASES-ia32"))
+        .then(it => this.dispatchArtifactCreated(it)))
+    }
+
+    return await BluebirdPromise.all(promises)
   }
 
   private async nsis(options: any, installerFile: string) {
diff --git a/test/helpers/packTester.js b/test/helpers/packTester.js
@@ -8,6 +8,7 @@ import { CSC_LINK, CSC_KEY_PASSWORD } from "./codeSignData"
 import { expectedLinuxContents } from "./expectedContents"
 import { readText } from "out/promisifed-fs"
 import { Packager } from "out/index"
+import { normalizePlatforms } from "out/packager"
 import { exec } from "out/util"
 import pathSorter from "path-sort"
 
@@ -36,16 +37,26 @@ export async function assertPack(projectDir, platform, packagerOptions, useTempD
     }
   }
 
+  const platforms = Array.isArray(platform) ? platform : [platform]
   const packager = new Packager(Object.assign({
     projectDir: projectDir,
     cscLink: CSC_LINK,
     cscKeyPassword: CSC_KEY_PASSWORD,
     dist: true,
-    platform: Array.isArray(platform) ? platform : [platform],
+    platform: platforms,
   }, packagerOptions))
 
+  let artifacts = []
+  packager.artifactCreated(it => {
+    artifacts.push(path.basename(it))
+  })
+
   await packager.build()
-  if (platform === "darwin" || (platform === "all" && process.platform === "darwin")) {
+
+  artifacts = pathSorter(artifacts)
+  const expandedPlatforms = normalizePlatforms(platforms)
+
+  if (expandedPlatforms.includes("darwin")) {
     const packedAppDir = projectDir + "/dist/TestApp-darwin-x64/TestApp.app"
     const info = parsePlist(await readText(packedAppDir + "/Contents/Info.plist"))
     assertThat(info).has.properties({
@@ -58,12 +69,34 @@ export async function assertPack(projectDir, platform, packagerOptions, useTempD
     const result = await exec("codesign", ["--verify", packedAppDir])
     assertThat(result[0].toString()).not.match(/is not signed at all/)
   }
-  else if (platform === "linux" || (platform === "all" && process.platform !== "win32")) {
+  else if (expandedPlatforms.includes("linux")) {
     assertThat(await getContents(projectDir + "/dist/TestApp-1.0.0-amd64.deb")).deepEqual(expectedLinuxContents)
-    assertThat(await getContents(projectDir + "/dist/TestApp-1.0.0-i386.deb")).deepEqual(expectedLinuxContents)
+    if (packagerOptions == null || packagerOptions.arch === null || packagerOptions.arch === "ia32") {
+      assertThat(await getContents(projectDir + "/dist/TestApp-1.0.0-i386.deb")).deepEqual(expectedLinuxContents)
+    }
     // console.log(JSON.stringify(await getContents(projectDir + "/dist/TestApp-1.0.0-amd64.deb"), null, 2))
     // console.log(JSON.stringify(await getContents(projectDir + "/dist/TestApp-1.0.0-i386.deb"), null, 2))
   }
+  else if (expandedPlatforms.includes("win32") && (packagerOptions == null || packagerOptions.target == null)) {
+    const expected32 = [
+      "RELEASES-ia32",
+      "TestApp-1.0.0-full.nupkg",
+      "TestAppSetup-1.0.0.exe"
+    ]
+    const expected64 = [
+      "RELEASES",
+      "TestAppSetup-1.0.0-x64.exe",
+      "TestApp-1.0.0-x64-full.nupkg"
+    ]
+    let expected
+    if (packagerOptions != null && packagerOptions.arch === "x64") {
+      expected = expected64
+    }
+    else {
+      expected = expected32.concat(expected64)
+    }
+    assertThat(artifacts).deepEqual(pathSorter(expected))
+  }
 }
 
 async function getContents(path) {
diff --git a/test/winPackagerTest.js b/test/winPackagerTest.js
@@ -8,6 +8,7 @@ test.ifNotTravis("win", async function () {
 // nsis is deprecated and not thread-safe - just do not run on CI to avoid failures
 test.ifNotCi.serial("win: nsis", async function () {
   await assertPack("test-app-one", "win32", {
-    target: ["nsis"]
+    target: ["nsis"],
+    arch: process.arch
   }, true)
 })
diff --git a/typings/main/ambient/fs-extra/fs-extra.d.ts b/typings/main/ambient/fs-extra/fs-extra.d.ts
@@ -11,28 +11,29 @@
 declare module "fs-extra" {
 	import stream = require("stream");
 
-	export interface Stats {
-		isFile(): boolean;
-		isDirectory(): boolean;
-		isBlockDevice(): boolean;
-		isCharacterDevice(): boolean;
-		isSymbolicLink(): boolean;
-		isFIFO(): boolean;
-		isSocket(): boolean;
-		dev: number;
-		ino: number;
-		mode: number;
-		nlink: number;
-		uid: number;
-		gid: number;
-		rdev: number;
-		size: number;
-		blksize: number;
-		blocks: number;
-		atime: Date;
-		mtime: Date;
-		ctime: Date;
-	}
+	interface Stats {
+     isFile(): boolean;
+     isDirectory(): boolean;
+     isBlockDevice(): boolean;
+     isCharacterDevice(): boolean;
+     isSymbolicLink(): boolean;
+     isFIFO(): boolean;
+     isSocket(): boolean;
+     dev: number;
+     ino: number;
+     mode: number;
+     nlink: number;
+     uid: number;
+     gid: number;
+     rdev: number;
+     size: number;
+     blksize: number;
+     blocks: number;
+     atime: Date;
+     mtime: Date;
+     ctime: Date;
+     birthtime: Date;
+ }
 
 	export interface FSWatcher {
 		close(): void;
@@ -87,7 +88,7 @@ declare module "fs-extra" {
 	export function writeJsonSync(file: string, object: any, options?: OpenOptions): void;
 	export function writeJSONSync(file: string, object: any, options?: OpenOptions): void;
 
-	export function rename(oldPath: string, newPath: string, callback?: (err: Error) => void): void;
+	export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
 	export function renameSync(oldPath: string, newPath: string): void;
 	export function truncate(fd: number, len: number, callback?: (err: Error) => void): void;
 	export function truncateSync(fd: number, len: number): void;
@@ -123,7 +124,7 @@ declare module "fs-extra" {
 	export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
 	export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
 	export function realpathSync(path: string, cache?: boolean): string;
-	export function unlink(path: string, callback?: (err: Error) => void): void;
+	export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
 	export function unlinkSync(path: string): void;
 	export function rmdir(path: string, callback?: (err: Error) => void): void;
 	export function rmdirSync(path: string): void;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`"bluebird": "^3.3.3",`
`53`	`53`	`"command-line-args": "^2.1.6",`
`54`	`54`	`"electron-packager-tf": "^5.2.3",`
`55`		`- "electron-winstaller-temp-fork": "^2.0.5-beta.2",`
	`55`	`+ "electron-winstaller-temp-fork": "^2.0.5-beta.3",`
`56`	`56`	`"fs-extra": "^0.26.5",`
`57`	`57`	`"gm": "^1.21.1",`
`58`	`58`	`"hosted-git-info": "^2.1.4",`
`@@ -105,16 +105,16 @@`
`105`	`105`	`],`
`106`	`106`	`"env": {`
`107`	`107`	`"test": {`
`108`		`- "ignore": "*/out/.js",`
	`108`	`+ "ignore": ["*/out/.js"],`
`109`	`109`	`"plugins": [`
`110`	`110`	`[`
`111`		`- "babel-plugin-transform-async-to-module-method",`
	`111`	`+ "transform-async-to-module-method",`
`112`	`112`	`{`
`113`	`113`	`"module": "bluebird",`
`114`	`114`	`"method": "coroutine"`
`115`	`115`	`}`
`116`	`116`	`],`
`117`		`- "babel-plugin-transform-es2015-modules-commonjs",`
	`117`	`+ "transform-es2015-modules-commonjs",`
`118`	`118`	`"transform-strict-mode"`
`119`	`119`	`]`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ export default class MacPackager extends PlatformPackager<appdmg.Specification>`
`28`	`28`	`return "osx"`
`29`	`29`	`}`
`30`	`30`
`31`		`- async pack(platform: string, outDir: string, appOutDir: string): Promise<any> {`
`32`		`- await super.pack(platform, outDir, appOutDir)`
	`31`	`+ async pack(platform: string, outDir: string, appOutDir: string, arch: string): Promise<any> {`
	`32`	`+ await super.pack(platform, outDir, appOutDir, arch)`
`33`	`33`	`let codeSigningInfo = await this.codeSigningInfo`
`34`	`34`	`return await this.signMac(path.join(appOutDir, this.metadata.name + ".app"), codeSigningInfo)`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,11 @@ export class Packager implements BuildInfo {`
`72`	`72`	`for (let arch of normalizeArchs(platform, this.options.arch)) {`
`73`	`73`	`await this.installAppDependencies(arch)`
`74`	`74`
`75`		`- helper.currentArch = arch`
`76`	`75`	`const outDir = path.join(this.projectDir, "dist")`
`77`	`76`	`const appOutDir = path.join(outDir, this.metadata.name + "-" + platform + "-" + arch)`
`78`		`- await helper.pack(platform, outDir, appOutDir)`
	`77`	`+ await helper.pack(platform, outDir, appOutDir, arch)`
`79`	`78`	`if (this.options.dist) {`
`80`		`- distTasks.push(helper.packageInDistributableFormat(outDir, appOutDir))`
	`79`	`+ distTasks.push(helper.packageInDistributableFormat(outDir, appOutDir, arch))`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`	`}`