From cb93dcdd7d5b30cbdc7366cf2e42c101313f91ca Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Thu, 20 Dec 2018 15:59:47 -0600 Subject: [PATCH] makefile: Always update version file in dist target --- build/makefile_base.mak | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index ce5ebeca..ceb05669 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -271,7 +271,7 @@ DIST_GECKO32 := $(DIST_GECKO_DIR)/$(GECKO32_MSI) DIST_GECKO64 := $(DIST_GECKO_DIR)/$(GECKO64_MSI) DIST_FONTS := $(DST_DIR)/share/fonts -DIST_TARGETS := $(DIST_COPY_TARGETS) $(DIST_VERSION) $(DIST_OVR32) $(DIST_OVR64) \ +DIST_TARGETS := $(DIST_COPY_TARGETS) $(DIST_OVR32) $(DIST_OVR64) \ $(DIST_GECKO32) $(DIST_GECKO64) $(DIST_COMPAT_MANIFEST) $(DIST_LICENSE) \ $(DIST_FONTS) @@ -291,10 +291,6 @@ $(DIST_OVR64): $(SRCDIR)/openvr/bin/win64/openvr_api.dll | $(DST_DIR) $(DIST_COPY_TARGETS): | $(DST_DIR) cp -a $(SRCDIR)/$(notdir $@) $@ -$(DIST_VERSION): | $(DST_DIR) - echo `date '+%s'` `GIT_DIR=$(abspath $(SRCDIR)/.git) git describe --tags` > $@ - cp $(DIST_VERSION) $(DST_BASE)/ - $(DIST_COMPAT_MANIFEST): $(COMPAT_MANIFEST_TEMPLATE) $(MAKEFILE_DEP) | $(DST_DIR) sed -r 's|##BUILD_NAME##|$(BUILD_NAME)|' $< > $@ @@ -337,6 +333,8 @@ GOAL_TARGETS += dist # Only drag in WINE_OUT if they need to be built at all, otherwise this doesn't imply a rebuild of wine. If wine is in # the explicit targets, specify that this should occur after. dist: $(DIST_TARGETS) | $(WINE_OUT) $(filter $(MAKECMDGOALS),wine64 wine32 wine) $(DST_DIR) + echo `date '+%s'` `GIT_DIR=$(abspath $(SRCDIR)/.git) git describe --tags` > $(DIST_VERSION) + cp $(DIST_VERSION) $(DST_BASE)/ rm -rf $(abspath $(DIST_PREFIX)) && \ WINEPREFIX=$(abspath $(DIST_PREFIX)) $(WINE_OUT_BIN) wineboot && \ WINEPREFIX=$(abspath $(DIST_PREFIX)) $(WINE_OUT_SERVER) -w && \