Skip to content

Commit

Permalink
Use (abbreviated) git revision for Squeezeplay version number.
Browse files Browse the repository at this point in the history 
Change-Id: Ia853a0a2eca5386da015678db8f75ebbad43174a
  • Loading branch information
alan young committed Apr 10, 2012
1 parent 43294d3 commit 9886c11
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/squeezeplay/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ APP_NAME = SqueezePlay Beta
BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist

VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n .. | sed -e 's/[MS]//g')
DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell svnversion -n .. | sed -e 's/[MS]//g')
TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell svnversion -n .. | sed -e 's/[MS]//g')
VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
Expand Down Expand Up @@ -154,7 +154,7 @@ src/version.h: FORCE
@echo '#define SQUEEZEPLAY_RELEASE "'`cat ../squeezeplay.version`'"' >> src/version.h
@echo '#endif' >> src/version.h
@echo '#ifndef SQUEEZEPLAY_REVISION' >> src/version.h
@echo '#define SQUEEZEPLAY_REVISION "'`svnversion -n ..`'"' >> src/version.h
@echo '#define SQUEEZEPLAY_REVISION "'`git rev-list --abbrev-commit --max-count=1 HEAD`'"' >> src/version.h
@echo '#endif' >> src/version.h
@echo '#define JIVE_VERSION SQUEEZEPLAY_RELEASE" r"SQUEEZEPLAY_REVISION' >> src/version.h

Expand Down
8 changes: 4 additions & 4 deletions src/squeezeplay/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ BUNDLE_NAME = SqueezePlay.app
APP_NAME = SqueezePlay Beta
BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n .. | sed -e 's/[MS]//g')
DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell svnversion -n .. | sed -e 's/[MS]//g')
TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell svnversion -n .. | sed -e 's/[MS]//g')
VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
Expand Down Expand Up @@ -1326,7 +1326,7 @@ src/version.h: FORCE
@echo '#define SQUEEZEPLAY_RELEASE "'`cat ../squeezeplay.version`'"' >> src/version.h
@echo '#endif' >> src/version.h
@echo '#ifndef SQUEEZEPLAY_REVISION' >> src/version.h
@echo '#define SQUEEZEPLAY_REVISION "'`svnversion -n ..`'"' >> src/version.h
@echo '#define SQUEEZEPLAY_REVISION "'`git rev-list --abbrev-commit --max-count=1 HEAD`'"' >> src/version.h
@echo '#endif' >> src/version.h
@echo '#define JIVE_VERSION SQUEEZEPLAY_RELEASE" r"SQUEEZEPLAY_REVISION' >> src/version.h

Expand Down

0 comments on commit 9886c11

Please sign in to comment.