diff --git a/config/build/darwin/Info.plist b/config/build/mac/Info.plist similarity index 100% rename from config/build/darwin/Info.plist rename to config/build/mac/Info.plist diff --git a/config/build/mac/bin/probe-mac-x64 b/config/build/mac/bin/probe-mac-x64 new file mode 100755 index 0000000..e9aec64 Binary files /dev/null and b/config/build/mac/bin/probe-mac-x64 differ diff --git a/config/build/darwin/icon/background/background.png b/config/build/mac/icon/background/background.png similarity index 100% rename from config/build/darwin/icon/background/background.png rename to config/build/mac/icon/background/background.png diff --git a/config/build/darwin/icon/background/background@2x.png b/config/build/mac/icon/background/background@2x.png similarity index 100% rename from config/build/darwin/icon/background/background@2x.png rename to config/build/mac/icon/background/background@2x.png diff --git a/config/build/darwin/icon/overflow_1024.icns b/config/build/mac/icon/overflow_1024.icns similarity index 100% rename from config/build/darwin/icon/overflow_1024.icns rename to config/build/mac/icon/overflow_1024.icns diff --git a/config/build/darwin/icon/overflow_128.icns b/config/build/mac/icon/overflow_128.icns similarity index 100% rename from config/build/darwin/icon/overflow_128.icns rename to config/build/mac/icon/overflow_128.icns diff --git a/config/build/darwin/icon/overflow_16.icns b/config/build/mac/icon/overflow_16.icns similarity index 100% rename from config/build/darwin/icon/overflow_16.icns rename to config/build/mac/icon/overflow_16.icns diff --git a/config/build/darwin/icon/overflow_256.icns b/config/build/mac/icon/overflow_256.icns similarity index 100% rename from config/build/darwin/icon/overflow_256.icns rename to config/build/mac/icon/overflow_256.icns diff --git a/config/build/darwin/icon/overflow_32.icns b/config/build/mac/icon/overflow_32.icns similarity index 100% rename from config/build/darwin/icon/overflow_32.icns rename to config/build/mac/icon/overflow_32.icns diff --git a/config/build/darwin/icon/overflow_512.icns b/config/build/mac/icon/overflow_512.icns similarity index 100% rename from config/build/darwin/icon/overflow_512.icns rename to config/build/mac/icon/overflow_512.icns diff --git a/config/build/darwin/icon/overflow_64.icns b/config/build/mac/icon/overflow_64.icns similarity index 100% rename from config/build/darwin/icon/overflow_64.icns rename to config/build/mac/icon/overflow_64.icns diff --git a/electron-builder.json b/electron-builder.json index 9c88442..ce486d0 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -13,12 +13,7 @@ }, "files": [ { - "filter": [ - "**/*", - "!*.ts", - "!*.scss", - "!yarn.lock" - ], + "filter": ["**/*", "!*.ts", "!*.scss", "!yarn.lock"], "from": "./build/dist/", "to": "." }, @@ -30,9 +25,7 @@ "to": "./bin/database.sqlite" }, { - "filter": [ - "**/*" - ], + "filter": ["**/*"], "from": "config/build/${os}/icon/", "to": "./icon/" } @@ -41,10 +34,7 @@ "target": [ { "target": "deb", - "arch": [ - "ia32", - "x64" - ] + "arch": ["ia32", "x64"] } ], "executableName": "overFlow-NetworkScanner", @@ -59,53 +49,46 @@ ] }, "deb": { - "depends": [ - "libpcap0.8" - ], + "depends": ["libpcap0.8"], "afterInstall": "config/build/linux/after-install.tpl" }, "mac": { "category": "public.app-category.utilities", "artifactName": "${productName}-${version}-${arch}.${ext}", "minimumSystemVersion": "10.12.0", - "extendInfo": "config/build/darwin/Info.plist", - "icon": "config/build/darwin/icon/icon.icns", - "target": [ - "dmg" - ], + "extendInfo": "config/build/mac/Info.plist", + "icon": "config/build/mac/icon/overflow_1024.icns", + "target": ["dmg"], "extraFiles": [ { - "from": "build/nrfjprog/unpacked/nrfjprog", - "to": "Frameworks", - "filter": "*.dylib" + "from": "config/build/mac/bin/probe-${os}-${arch}", + "to": "./bin/probe" } ] }, "dmg": { "icon": null, - "iconSize": 160, + "iconSize": 150, "contents": [ - { - "x": 180, - "y": 170 - }, { "x": 480, - "y": 170, + "y": 240, "type": "link", "path": "/Applications" + }, + { + "x": 130, + "y": 240, + "type": "file" } ], - "background": "config/build/darwin/icon/macos-installer-bg.tiff" + "background": "config/build/mac/icon/background/background.png" }, "win": { "target": [ { "target": "nsis", - "arch": [ - "x64", - "ia32" - ] + "arch": ["x64", "ia32"] } ], "legalTrademarks": "overFlow", @@ -122,4 +105,4 @@ "artifactName": "${productName} Setup ${version}.${ext}", "menuCategory": "overFlow" } -} \ No newline at end of file +}