Browse Source

Remove EDITION from dist names.

tags/v2.0.0
Andrew Belt 3 years ago
parent
commit
398210978b
2 changed files with 9 additions and 11 deletions
  1. +4
    -6
      Makefile
  2. +5
    -5
      installer.nsi

+ 4
- 6
Makefile View File

@@ -1,8 +1,6 @@
RACK_DIR ?= . RACK_DIR ?= .
EDITION := CE
EDITION_NAME := Community Edition
VERSION_MAJOR := 2 VERSION_MAJOR := 2
VERSION := 2.dev.$(shell git rev-parse --short HEAD)
VERSION := 2.git.$(shell git rev-parse --short HEAD)
# VERSION := 2.0.0 # VERSION := 2.0.0


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


DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt
DIST_NAME := Rack-$(EDITION)-"$(VERSION)"-$(ARCH_OS_NAME)
DIST_NAME := Rack-"$(VERSION)"-$(ARCH_OS_NAME)
DIST_SDK_DIR := Rack-SDK DIST_SDK_DIR := Rack-SDK
DIST_SDK := Rack-SDK-$(VERSION).zip DIST_SDK := Rack-SDK-$(VERSION).zip
ifdef ARCH_MAC ifdef ARCH_MAC
DIST_BUNDLE := VCV Rack $(VERSION_MAJOR).app DIST_BUNDLE := VCV Rack $(VERSION_MAJOR).app
else else
DIST_DIR := Rack$(EDITION)$(VERSION_MAJOR)
DIST_DIR := Rack$(VERSION_MAJOR)
endif endif
DIST_MD := $(wildcard *.md) DIST_MD := $(wildcard *.md)
DIST_HTML := $(patsubst %.md, build/%.html, $(DIST_MD)) DIST_HTML := $(patsubst %.md, build/%.html, $(DIST_MD))
@@ -218,7 +216,7 @@ ifdef ARCH_WIN
cd dist && zip -q -9 -r "$(DIST_NAME)".zip "$(DIST_DIR)" cd dist && zip -q -9 -r "$(DIST_NAME)".zip "$(DIST_DIR)"
# Make NSIS installer # Make NSIS installer
# pacman -S mingw-w64-x86_64-nsis # pacman -S mingw-w64-x86_64-nsis
makensis -DEDITION="$(EDITION)" -DEDITION_NAME="$(EDITION_NAME)" -DVERSION_MAJOR="$(VERSION_MAJOR)" -DVERSION="$(VERSION)" "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
makensis -DVERSION_MAJOR="$(VERSION_MAJOR)" -DVERSION="$(VERSION)" "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
endif endif


# Build Rack SDK # Build Rack SDK


+ 5
- 5
installer.nsi View File

@@ -1,10 +1,10 @@
!include "MUI2.nsh" !include "MUI2.nsh"


!define NAME_FULL "VCV Rack ${EDITION_NAME} ${VERSION}"
!define NAME "VCV Rack ${EDITION} ${VERSION_MAJOR}"
!define RACK_DIR "Rack${EDITION}${VERSION_MAJOR}"
!define INSTALL_REG "Software\VCV\Rack${EDITION}${VERSION_MAJOR}"
!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${EDITION}${VERSION_MAJOR}"
!define NAME_FULL "VCV Rack Community Edition ${VERSION}"
!define NAME "VCV Rack ${VERSION_MAJOR}"
!define RACK_DIR "Rack${VERSION_MAJOR}"
!define INSTALL_REG "Software\VCV\Rack${VERSION_MAJOR}"
!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${VERSION_MAJOR}"


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


Loading…
Cancel
Save