morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

pull latest version from tag in github when building #286

Browse Source
This commit is contained in:
jderose9
2018-01-26 21:46:49 -05:00
parent 1086cdaeab
commit c629456166
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,7 +1,7 @@
.~ .~
*~ *~
gschemas.compiled gschemas.compiled
dash-to-panel@jderose9.github.com.zip dash-to-panel@jderose9.github.com*.zip
*.mo *.mo
po/dash-to-panel.pot po/dash-to-panel.pot
Settings.ui.h Settings.ui.h

22
Makefile
View File

@@ -15,13 +15,15 @@ INSTALLNAME = dash-to-panel@jderose9.github.com
# The command line passed variable VERSION is used to set the version string # The command line passed variable VERSION is used to set the version string
# in the metadata and in the generated zip-file. If no VERSION is passed, the # in the metadata and in the generated zip-file. If no VERSION is passed, the
# current commit SHA1 is used as version number in the metadata while the # version is pulled from the latest git tag and the current commit SHA1 is
# generated zip file has no string attached. # added to the metadata
ifdef VERSION ifdef VERSION
VSTRING = _v$(VERSION) FILESUFFIX = _v$(VERSION)
else else
VERSION = $(shell git rev-parse HEAD) LATEST_TAG = $(shell git describe --match "v[0-9]*" --abbrev=0 --tags HEAD)
VSTRING = VERSION = $(LATEST_TAG:v%=%)
COMMIT = $(shell git rev-parse HEAD)
FILESUFFIX =
endif endif
all: extension all: extension
@@ -61,8 +63,8 @@ install-local: _build
zip-file: _build zip-file: _build
cd _build ; \ cd _build ; \
zip -qr "$(UUID)$(VSTRING).zip" . zip -qr "$(UUID)$(FILESUFFIX).zip" .
mv _build/$(UUID)$(VSTRING).zip ./ mv _build/$(UUID)$(FILESUFFIX).zip ./
-rm -fR _build -rm -fR _build
_build: all _build: all
@@ -81,4 +83,8 @@ _build: all
mkdir -p $$lf/LC_MESSAGES; \ mkdir -p $$lf/LC_MESSAGES; \
cp $$l $$lf/LC_MESSAGES/dash-to-panel.mo; \ cp $$l $$lf/LC_MESSAGES/dash-to-panel.mo; \
done; done;
sed -i 's/"version": -1/"version": "$(VERSION)"/' _build/metadata.json; ifdef COMMIT
sed -i 's/"version": [[:digit:]][[:digit:]]*/"version": $(VERSION),\n"commit": "$(COMMIT)"/' _build/metadata.json;
else
sed -i 's/"version": [[:digit:]][[:digit:]]*/"version": $(VERSION)/' _build/metadata.json;
endif

2
metadata.json
View File

@@ -6,5 +6,5 @@
"shell-version": [ "3.18", "3.20", "3.22", "3.24", "3.26" ], "shell-version": [ "3.18", "3.20", "3.22", "3.24", "3.26" ],
"url": "https://github.com/jderose9/dash-to-panel", "url": "https://github.com/jderose9/dash-to-panel",
"gettext-domain": "dash-to-panel", "gettext-domain": "dash-to-panel",
"version": -1 "version": 0
} }