From 893514ca8ebfbf0e5e29c9fc57042ebc424035be Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Thu, 11 Mar 2021 12:26:07 -0600 Subject: [PATCH] build: Deploy version tag correctly --- build/makefile_base.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 81be1953..9d0abc14 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -219,7 +219,7 @@ $(USER_SETTINGS_PY_TARGET): $(addprefix $(SRCDIR)/,user_settings.sample.py) DIST_COPY_TARGETS := $(FILELOCK_TARGET) $(PROTON_PY_TARGET) \ $(PROTON37_TRACKED_FILES_TARGET) $(USER_SETTINGS_PY_TARGET) -DIST_VERSION := $(DST_DIR)/version +DIST_VERSION := $(DST_BASE)/version DIST_OVR32 := $(DST_LIBDIR32)/wine/dxvk/openvr_api_dxvk.dll DIST_OVR64 := $(DST_LIBDIR64)/wine/dxvk/openvr_api_dxvk.dll DIST_PREFIX := $(DST_DIR)/share/default_pfx/ @@ -328,7 +328,6 @@ dist_wineopenxr: dist_prefix $(DIST_WINEOPENXR_JSON64) dist: $(DIST_TARGETS) all-dist dist_wineopenxr | $(DST_DIR) echo `date '+%s'` `GIT_DIR=$(abspath $(SRCDIR)/.git) git describe --tags` > $(DIST_VERSION) - cp $(DIST_VERSION) $(DST_BASE)/ deploy: dist | $(filter-out dist deploy install redist,$(MAKECMDGOALS)) mkdir -p $(DEPLOY_DIR) && \ @@ -340,6 +339,7 @@ install: dist | $(filter-out dist deploy install redist,$(MAKECMDGOALS)) if [ ! -d $(STEAM_DIR) ]; then echo >&2 "!! "$(STEAM_DIR)" does not exist, cannot install"; return 1; fi mkdir -p $(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME) cp -rf --no-dereference --preserve=mode,links $(DST_BASE)/* $(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME) + cp -f $(DIST_VERSION) $(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME)/dist/ @echo "Installed Proton to "$(STEAM_DIR)/compatibilitytools.d/$(BUILD_NAME) @echo "You may need to restart Steam to select this tool"