openttd/bee-reward
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Copy repo tag for bananas version instead of day number.

Browse Source
This commit is contained in:
Alberth
2015-01-16 21:51:29 +01:00
parent 7c1422fa0d
commit c125ad0ec5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -26,9 +26,10 @@ MUSA = musa.py
VERSION_INFO := "$(shell ./findversion.sh)" VERSION_INFO := "$(shell ./findversion.sh)"
REPO_VERSION := $(shell echo ${VERSION_INFO} | cut -f2) REPO_VERSION := $(shell echo ${VERSION_INFO} | cut -f2)
REPO_TAG := $(shell echo ${VERSION_INFO} | cut -f5)
REPO_DATE := $(shell echo ${VERSION_INFO} | cut -f7) REPO_DATE := $(shell echo ${VERSION_INFO} | cut -f7)
DISPLAY_NAME := $(PROJECT_NAME) $(shell echo ${VERSION_INFO} | cut -f5) DISPLAY_NAME := $(PROJECT_NAME) $(REPO_TAG)
BUNDLE_NAME := $(PROJECT_NAME) BUNDLE_NAME := $(PROJECT_NAME)
BUNDLE_FILENAME = $(shell echo "$(DISPLAY_NAME)" | sed 's/ /-/g') BUNDLE_FILENAME = $(shell echo "$(DISPLAY_NAME)" | sed 's/ /-/g')
@@ -58,6 +59,6 @@ $(BUNDLE_DIR)/$(BUNDLE_FILENAME).tar: $(SOURCES) $(LANGFILES) $(DOCS)
bananas: bundle bananas: bundle
echo "[BaNaNaS]" echo "[BaNaNaS]"
sed -e 's/^version *=.*/version = $(REPO_VERSION)/' $(BANANAS_INI) > "$(BUNDLE_DIR)/$(BANANAS_INI)" sed -e 's/^version *=.*/version = $(REPO_TAG)/' $(BANANAS_INI) > "$(BUNDLE_DIR)/$(BANANAS_INI)"
$(MUSA) -r -x license.txt -c $(BUNDLE_DIR)/$(BANANAS_INI) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)" $(MUSA) -r -x license.txt -c $(BUNDLE_DIR)/$(BANANAS_INI) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)"