Skip to content

Commit c987439

Browse files
develardevelar
committed
fix: get rid of nuget to pack win
1 parent b7a8340 commit c987439

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

‎package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
"bugs": "https://github.com/electron-userland/electron-builder/issues",
5555
"homepage": "https://github.com/electron-userland/electron-builder",
5656
"dependencies": {
57-
"7zip-bin": "^0.0.3",
57+
"7zip-bin": "^0.0.4",
5858
"bluebird": "^3.3.5",
5959
"command-line-args": "^2.1.6",
6060
"deep-assign": "^2.0.0",
6161
"electron-packager": "^7.0.0",
62-
"electron-winstaller-fixed": "^2.2.1-beta.0",
63-
"fs-extra": "^0.27.0",
62+
"electron-winstaller-fixed": "~2.3.0-beta.0",
63+
"fs-extra": "^0.28.0",
6464
"fs-extra-p": "^0.2.0",
6565
"globby": "^4.0.0",
6666
"hosted-git-info": "^2.1.4",
@@ -74,7 +74,7 @@
7474
"tmp": "0.0.28"
7575
},
7676
"optionalDependencies": {
77-
"appdmg": "^0.3.6"
77+
"appdmg": "^0.3.7"
7878
},
7979
"devDependencies": {
8080
"ava-tf": "^0.12.4-beta.6",
@@ -93,7 +93,7 @@
9393
"tsconfig-glob": "^0.4.3",
9494
"tslint": "next",
9595
"typescript": "^1.9.0-dev.20160414",
96-
"validate-commit-msg": "^2.6.0"
96+
"validate-commit-msg": "^2.6.1"
9797
},
9898
"babel": {
9999
"plugins": [
@@ -112,5 +112,8 @@
112112
"typings": "./out/electron-builder.d.ts",
113113
"precommit": [
114114
"validate-commit-msg"
115-
]
115+
],
116+
"publishConfig": {
117+
"tag": "next"
118+
}
116119
}

‎src/macPackager.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ export default class MacPackager extends PlatformPackager<OsXBuildOptions> {
107107
log("Creating ZIP for Squirrel.Mac")
108108
// we use app name here - see https://github.com/electron-userland/electron-builder/pull/204
109109
const resultPath = `${this.appName}-${this.metadata.version}-mac.zip`
110-
// -y param is important - "store symbolic links as the link instead of the referenced file"
111-
const args = ["a", "-mm=" + (this.devMetadata.build.compression === "store" ? "Copy" : "Deflate"), "-r", "-bb0", "-bd"]
110+
const args = ["a", "-mm=" + (this.devMetadata.build.compression === "store" ? "Copy" : "Deflate"), "-bb0", "-bd"]
112111
if (this.devMetadata.build.compression === "maximum") {
113112
// http://superuser.com/a/742034
114113
//noinspection SpellCheckingInspection

‎test/src/BuildTest.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,18 @@ test("copy extra resource", async () => {
120120
"lib/net45/libEGL.dll",
121121
"lib/net45/libGLESv2.dll",
122122
"lib/net45/LICENSE",
123+
"lib/net45/LICENSES.chromium.html",
123124
"lib/net45/msvcp120.dll",
124125
"lib/net45/msvcr120.dll",
125126
"lib/net45/natives_blob.bin",
126127
"lib/net45/node.dll",
127128
"lib/net45/platformSpecific",
128129
"lib/net45/snapshot_blob.bin",
129-
"lib/net45/squirrel.exe",
130130
"lib/net45/TestApp.exe",
131131
"lib/net45/ui_resources_200_percent.pak",
132+
"lib/net45/Update.exe",
132133
"lib/net45/vccorlib120.dll",
134+
"lib/net45/version",
133135
"lib/net45/xinput1_3.dll",
134136
"lib/net45/bar/hello.txt",
135137
"lib/net45/bar/x64.txt",

‎test/src/helpers/expectedContents.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,17 @@ export const expectedWinContents = [
6464
"lib/net45/libEGL.dll",
6565
"lib/net45/libGLESv2.dll",
6666
"lib/net45/LICENSE",
67+
"lib/net45/LICENSES.chromium.html",
6768
"lib/net45/msvcp120.dll",
6869
"lib/net45/msvcr120.dll",
6970
"lib/net45/natives_blob.bin",
7071
"lib/net45/node.dll",
7172
"lib/net45/snapshot_blob.bin",
72-
"lib/net45/squirrel.exe",
7373
"lib/net45/TestApp.exe",
7474
"lib/net45/ui_resources_200_percent.pak",
75+
"lib/net45/Update.exe",
7576
"lib/net45/vccorlib120.dll",
77+
"lib/net45/version",
7678
"lib/net45/xinput1_3.dll",
7779
"lib/net45/locales/en-US.pak",
7880
"lib/net45/resources/app.asar",

‎test/src/helpers/packTester.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,20 @@ async function checkWindowsResult(packager: Packager, packagerOptions: PackagerO
240240
await unZipper.extractFile(fileDescriptors.filter(it => it.path === "TestApp.nuspec")[0], {
241241
path: path.dirname(packageFile),
242242
})
243-
assertThat((await readFile(path.join(path.dirname(packageFile), "TestApp.nuspec"), "utf8")).replace(/\r\n/g, "\n")).equal(`<?xml version="1.0"?>
243+
const expectedSpec = await readFile(path.join(path.dirname(packageFile), "TestApp.nuspec"), "utf8")
244+
assertThat((expectedSpec).replace(/\r\n/g, "\n")).equal(`<?xml version="1.0"?>
244245
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
245246
<metadata>
246247
<id>TestApp</id>
247-
<version>1.1.0</version>
248248
<title>${productName}</title>
249+
<version>1.1.0</version>
249250
<authors>Foo Bar</authors>
250251
<owners>Foo Bar</owners>
251-
<projectUrl>http://foo.example.com</projectUrl>
252252
<iconUrl>https://raw.githubusercontent.com/szwacz/electron-boilerplate/master/resources/windows/icon.ico</iconUrl>
253253
<requireLicenseAcceptance>false</requireLicenseAcceptance>
254254
<description>Test Application</description>
255255
<copyright>Copyright © ${new Date().getFullYear()} Foo Bar</copyright>
256+
<projectUrl>http://foo.example.com</projectUrl>
256257
</metadata>
257258
</package>`)
258259
}

0 commit comments

Comments
 (0)