Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make use of electron-builder for the package-electron target #1540

Merged
merged 1 commit into from
Jun 23, 2017
Merged

chore: make use of electron-builder for the package-electron target #1540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ endif

ifdef DISABLE_UPDATES
$(warning Update notification dialog has been disabled (DISABLE_UPDATES is set))
ELECTRON_BUILDER_OPTIONS += --extraMetadata.updates.enabled=false
endif

# ---------------------------------------------------------------------
Expand Down Expand Up @@ -433,7 +434,14 @@ TARGETS = \
installers-all \
electron-develop

package-electron: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So should the $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH) rule be removed too, if there's no target referencing it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Linux rules still use that target. We will be able to remove it after merging the Linux electron-builder PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah, I hadn't spotted that $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-linux-$(TARGET_ARCH) is still being used :)

package-electron:
CSC_NAME="$(CODE_SIGN_IDENTITY)" \
CSC_IDENTITY_AUTO_DISCOVERY=false \
CSC_LINK=$(CODE_SIGN_CERTIFICATE) \
CSC_KEY_PASSWORD=$(CODE_SIGN_CERTIFICATE_PASSWORD) \
TARGET_ARCH=$(TARGET_ARCH) \
$(NPX) build --dir $(ELECTRON_BUILDER_OPTIONS)

package-cli: $(BUILD_DIRECTORY)/$(APPLICATION_NAME)-cli-$(APPLICATION_VERSION)-$(TARGET_PLATFORM)-$(TARGET_ARCH)

ifeq ($(TARGET_PLATFORM),darwin)
Expand Down