From 5e582ceb9839ee4815cf90cfb8986edfbce77688 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Mon, 31 Jul 2017 16:04:10 -0300 Subject: [PATCH] chore: use electron-builder default package names (#1609) We're currently manually changing the names of the final packages created by `electron-builder`. This commit makes Etcher use the default package names that `electron-builder` picks for us. The Windows final package names contain spaces, so I did keep the `artifactName` entries for them, which now basically use what `electron-builder` recommends, but use hyphens instead of spaces. Change-Type: minor See: https://github.com/resin-io/etcher/pull/1555 Signed-off-by: Juan Cruz Viotti --- Makefile | 30 +++++++++++++++--------------- electron-builder.yml | 5 ++--- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index a61601a3..73d24519 100644 --- a/Makefile +++ b/Makefile @@ -277,13 +277,13 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$( assets/osx/installer.tiff: assets/osx/installer.png assets/osx/installer@2x.png tiffutil -cathidpicheck $^ -out $@ -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-darwin-$(TARGET_ARCH).dmg: assets/osx/installer.tiff \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg: assets/osx/installer.tiff \ | $(BUILD_DIRECTORY) TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --mac dmg $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.packageType=dmg -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-darwin-$(TARGET_ARCH).zip: assets/osx/installer.tiff \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip: assets/osx/installer.tiff \ | $(BUILD_DIRECTORY) TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --mac zip $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.version=$(APPLICATION_VERSION) \ @@ -340,18 +340,18 @@ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(TARGET -w $(BUILD_TEMPORARY_DIRECTORY) \ -o $@ -$(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH).zip: \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH_APPIMAGE).zip: \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(TARGET_ARCH_APPIMAGE).AppImage \ | $(BUILD_DIRECTORY) ./scripts/build/zip-file.sh -f $< -s $(PLATFORM) -o $@ -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH)-portable.exe: \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Portable-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe: \ | $(BUILD_DIRECTORY) TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --win portable $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.version=$(APPLICATION_VERSION) \ --extraMetadata.packageType=portable -$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TARGET_ARCH).exe: \ +$(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Setup-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe: \ | $(BUILD_DIRECTORY) TARGET_ARCH=$(TARGET_ARCH) $(NPX) build --win nsis $(ELECTRON_BUILDER_OPTIONS) \ --extraMetadata.version=$(APPLICATION_VERSION) \ @@ -392,21 +392,21 @@ package-electron: package-cli: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH) ifeq ($(PLATFORM),darwin) -electron-installer-app-zip: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).zip -electron-installer-dmg: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).dmg +electron-installer-app-zip: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip +electron-installer-dmg: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg cli-installer-tar-gz: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).tar.gz TARGETS += \ electron-installer-dmg \ electron-installer-app-zip \ cli-installer-tar-gz PUBLISH_AWS_S3 += \ - $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).zip \ - $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).dmg \ + $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-mac.zip \ + $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION).dmg \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).tar.gz endif ifeq ($(PLATFORM),linux) -electron-installer-appimage: $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).zip +electron-installer-appimage: $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH_APPIMAGE).zip electron-installer-debian: $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb electron-installer-redhat: $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)-$(APPLICATION_VERSION_REDHAT).$(TARGET_ARCH_REDHAT).rpm cli-installer-tar-gz: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).tar.gz @@ -416,7 +416,7 @@ TARGETS += \ electron-installer-redhat \ cli-installer-tar-gz PUBLISH_AWS_S3 += \ - $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).zip \ + $(BUILD_DIRECTORY)/$(APPLICATION_NAME_LOWERCASE)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH_APPIMAGE).zip \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).tar.gz PUBLISH_BINTRAY_DEBIAN += \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME_ELECTRON)_$(APPLICATION_VERSION_DEBIAN)_$(TARGET_ARCH_DEBIAN).deb @@ -425,16 +425,16 @@ PUBLISH_BINTRAY_REDHAT += \ endif ifeq ($(PLATFORM),win32) -electron-installer-portable: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH)-portable.exe -electron-installer-nsis: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).exe +electron-installer-portable: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Portable-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe +electron-installer-nsis: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Setup-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe cli-installer-zip: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).zip TARGETS += \ electron-installer-portable \ electron-installer-nsis \ cli-installer-zip PUBLISH_AWS_S3 += \ - $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH)-portable.exe \ - $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).exe \ + $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Portable-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe \ + $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-Setup-$(APPLICATION_VERSION)-$(TARGET_ARCH).exe \ $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(PLATFORM)-$(TARGET_ARCH).zip endif diff --git a/electron-builder.yml b/electron-builder.yml index add92fdd..1587f075 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -11,7 +11,6 @@ files: - node_modules/**/* mac: icon: assets/icon.icns - artifactName: "${productName}-${version}-darwin-${env.TARGET_ARCH}.${ext}" category: public.app-category.developer-tools dmg: background: assets/osx/installer.tiff @@ -36,9 +35,9 @@ nsis: uninstallerIcon: assets/icon.ico deleteAppDataOnUninstall: true license: LICENSE - artifactName: "${productName}-${version}-win32-${env.TARGET_ARCH}.${ext}" + artifactName: "${productName}-Setup-${version}-${env.TARGET_ARCH}.${ext}" portable: - artifactName: "${productName}-${version}-win32-${env.TARGET_ARCH}-portable.${ext}" + artifactName: "${productName}-Portable-${version}-${env.TARGET_ARCH}.${ext}" requestExecutionLevel: user linux: category: Utility