Skip to content

Commit

Permalink
[icons] Use buildResources folder (#771)
Browse files Browse the repository at this point in the history
This PR updates the application icon folder structure and declarations to be aligned with updated electron-builder documentation. Specifically, we streamline the usage of application icons by:

- Removing direct icon references for each platform in package.json, and replacing with a top-level buildResources directory
- Removing the linux-specific icon so electron-builder can use icon.icns for both Linux and Mac (per the docs)

Per the docs, icons in buildResources will automatically be detected and used accordingly as follows:

- icon.icns -- Mac and Linux (installers and applications)
- background.png and [email protected] (Mac installer backgrounds)
- icon.ico -- Windows (installer and application)
  • Loading branch information
nsakaimbo authored Feb 11, 2020
1 parent c69f820 commit b98ad97
Show file tree
Hide file tree
Showing 16 changed files with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
"appId": "com.automattic.wordpress",
"asar": false,
"directories": {
"buildResources": "./resource/icons",
"output": "./release"
},
"files": [
Expand All @@ -110,7 +111,6 @@
}
],
"mac": {
"icon": "./resource/image/mac/app-icon.icns",
"category": "public.app-category.social-networking",
"entitlements": "./resource/macos/entitlements.mac.plist",
"entitlementsInherit": "./resource/macos/entitlements.mac.inherit.plist",
Expand All @@ -121,9 +121,7 @@
},
"dmg": {
"title": "WordPress.com Installer",
"icon": "./resource/image/mac/dmg-icon.icns",
"iconSize": 150,
"background": "./resource/image/mac/dmg-background/background.png",
"contents": [
{
"x": 486,
Expand All @@ -146,7 +144,6 @@
"ia32"
]
},
"icon": "./resource/image/win/wordpress.ico",
"certificateSubjectName": "Automattic, Inc."
},
"nsis": {
Expand All @@ -157,7 +154,6 @@
"deb",
"tar.gz"
],
"icon": "./resource/image/linux/512x512.png",
"executableName": "wpcom",
"description": "WordPress.com Desktop Client",
"synopsis": "WordPress.com Desktop client",
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
Binary file removed resource/image/linux/icon_128x128.png
Binary file not shown.
Binary file removed resource/image/linux/[email protected]
Binary file not shown.
Binary file removed resource/image/linux/icon_16x16.png
Binary file not shown.
Binary file removed resource/image/linux/[email protected]
Binary file not shown.
Binary file removed resource/image/linux/icon_256x256.png
Binary file not shown.
Binary file removed resource/image/linux/[email protected]
Binary file not shown.
Binary file removed resource/image/linux/icon_32x32.png
Binary file not shown.
Binary file removed resource/image/linux/[email protected]
Binary file not shown.
Binary file removed resource/image/linux/icon_512x512.png
Binary file not shown.
Binary file removed resource/image/linux/[email protected]
Binary file not shown.
Binary file removed resource/image/mac/dmg-icon.icns
Binary file not shown.

0 comments on commit b98ad97

Please sign in to comment.