Skip to content

Commit 3982109

Browse files
committed
Remove EDITION from dist names.
1 parent a4ab06e commit 3982109

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
RACK_DIR ?= .
2-
EDITION := CE
3-
EDITION_NAME := Community Edition
42
VERSION_MAJOR := 2
5-
VERSION := 2.dev.$(shell git rev-parse --short HEAD)
3+
VERSION := 2.git.$(shell git rev-parse --short HEAD)
64
# VERSION := 2.0.0
75

86
FLAGS += -DVERSION=$(VERSION)
@@ -142,13 +140,13 @@ ifdef ARCH_WIN
142140
endif
143141

144142
DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt
145-
DIST_NAME := Rack-$(EDITION)-"$(VERSION)"-$(ARCH_OS_NAME)
143+
DIST_NAME := Rack-"$(VERSION)"-$(ARCH_OS_NAME)
146144
DIST_SDK_DIR := Rack-SDK
147145
DIST_SDK := Rack-SDK-$(VERSION).zip
148146
ifdef ARCH_MAC
149147
DIST_BUNDLE := VCV Rack $(VERSION_MAJOR).app
150148
else
151-
DIST_DIR := Rack$(EDITION)$(VERSION_MAJOR)
149+
DIST_DIR := Rack$(VERSION_MAJOR)
152150
endif
153151
DIST_MD := $(wildcard *.md)
154152
DIST_HTML := $(patsubst %.md, build/%.html, $(DIST_MD))
@@ -218,7 +216,7 @@ ifdef ARCH_WIN
218216
cd dist && zip -q -9 -r "$(DIST_NAME)".zip "$(DIST_DIR)"
219217
# Make NSIS installer
220218
# pacman -S mingw-w64-x86_64-nsis
221-
makensis -DEDITION="$(EDITION)" -DEDITION_NAME="$(EDITION_NAME)" -DVERSION_MAJOR="$(VERSION_MAJOR)" -DVERSION="$(VERSION)" "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
219+
makensis -DVERSION_MAJOR="$(VERSION_MAJOR)" -DVERSION="$(VERSION)" "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
222220
endif
223221

224222
# Build Rack SDK

installer.nsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
!include "MUI2.nsh"
22

3-
!define NAME_FULL "VCV Rack ${EDITION_NAME} ${VERSION}"
4-
!define NAME "VCV Rack ${EDITION} ${VERSION_MAJOR}"
5-
!define RACK_DIR "Rack${EDITION}${VERSION_MAJOR}"
6-
!define INSTALL_REG "Software\VCV\Rack${EDITION}${VERSION_MAJOR}"
7-
!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${EDITION}${VERSION_MAJOR}"
3+
!define NAME_FULL "VCV Rack Community Edition ${VERSION}"
4+
!define NAME "VCV Rack ${VERSION_MAJOR}"
5+
!define RACK_DIR "Rack${VERSION_MAJOR}"
6+
!define INSTALL_REG "Software\VCV\Rack${VERSION_MAJOR}"
7+
!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${VERSION_MAJOR}"
88

99
Name "${NAME_FULL}"
1010
SetCompressor /solid "lzma"

0 commit comments

Comments
 (0)