hrnz
/
NeoLayoutViewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'make-src-package' into unstable

This commit is contained in:
Olaf Schulz 2018-12-18 21:34:11 +01:00
parent 31fdfba623 8e2795c045
commit 6258f8461d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -17,6 +17,7 @@ BINDIR = bin
PREFIX = /usr/local
APPNAME = NeoLayoutViewer
RELEASE_VERSION=1.2
GIT_COMMIT_VERSION=$(shell git log --oneline --max-count=1 | head --bytes=7)
ENV_FILE=.build_env
@ -26,6 +27,10 @@ VALAC_DEBUG_OPTS = -g
# compiler options for a release build
VALAC_RELEASE_OPTS = -X -O2 --disable-assert
# Debian Packaging version number
# Pattern: [epoch:]upstream_version[-debian_revision].
# The absence of a debian_revision is equivalent to a debian_revision of 0.
VERSION=$(RELEASE_VERSION)-0
#########################################################
@ -144,6 +149,7 @@ src/version.vala: gen_version
gen_version:
@/bin/echo -e "namespace NeoLayoutViewer{$(NL)" \
"public const string RELEASE_VERSION = \"$(RELEASE_VERSION)\";$(NL)" \
"public const string GIT_COMMIT_VERSION = \"$(GIT_COMMIT_VERSION)\";$(NL)" \
"public const string SHARED_ASSETS_PATH = \"$(DATADIR)/$(APPNAME)/assets\";$(NL)" \
"}" \
@ -182,6 +188,8 @@ clean:
run:
bin/neo_layout_viewer
src-package:
tar czf ../neo-layout-viewer-${VERSION}.tar.gz --exclude=.git --exclude=.gitignore --transform 's,^\./,neo-layout-viewer-${VERSION}/,' .
######################################################
## Windows stuff

2
src/main.vala
View File

@ -102,7 +102,7 @@ namespace NeoLayoutViewer{
about.set_logo(neo_win.getIcon());
about.set_destroy_with_parent (true);
about.set_transient_for (neo_win);
about.set_version(@"1.0 (git $(GIT_COMMIT_VERSION)) )");
about.set_version(@"(RELEASE_VERSION) (git $(GIT_COMMIT_VERSION)) )");
about.set_program_name("Neo2.0 Ebenenanzeige");
about.set_comments("""Erleichtert das Nachschlagen von Tastenkombinationen im Neo 2.0-Layout.