syndicate-lang
/
hop-2012
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak embedded version numbering

This commit is contained in:
Tony Garnock-Jones 2012-05-10 17:07:10 -04:00
parent e1cf3c0458
commit 6d07c877a9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osx-server-gui/English.lproj/Credits.html
View File

@ -36,8 +36,7 @@
<h4>Build information</h4>
<ul>
<li>Build stamp @BUILD_STAMP@</li>
<li>@GUI_VERSION@</li>
<li>@SERVER_VERSION@</li>
<li>Server version @SERVER_VERSION@</li>
</ul>
</body>
</html>

10
osx-server-gui/Makefile
View File

@ -7,8 +7,7 @@ RELEASE_RESOURCES=build/Release/$(APP_NAME).app/Contents/Resources
DEBUG_RESOURCES=build/Debug/$(APP_NAME).app/Contents/Resources
BUILD_STAMP:=$(shell date +%Y%m%d-%H%M%S)
GUI_VERSION:=Hop OSX GUI revision git-$(shell git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
SERVER_VERSION:=Server revision git-$(shell cd $(SERVER_PATH); git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
SERVER_VERSION:=git-$(shell cd $(SERVER_PATH); git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
release: $(SERVER_PATH)/$(SERVER_BINARY)
xcodebuild -configuration Release
@ -17,20 +16,19 @@ release: $(SERVER_PATH)/$(SERVER_BINARY)
cp -rp $(SERVER_PATH)/$(SERVER_WEB) $(RELEASE_RESOURCES)/.
sed \
-e 's:@BUILD_STAMP@:$(BUILD_STAMP):g' \
-e 's:@GUI_VERSION@:$(GUI_VERSION):g' \
-e 's:@SERVER_VERSION@:$(SERVER_VERSION):g' \
$(RELEASE_RESOURCES)/English.lproj/Credits.html \
> $(RELEASE_RESOURCES)/English.lproj/Credits.html.tmp
mv \
$(RELEASE_RESOURCES)/English.lproj/Credits.html.tmp \
$(RELEASE_RESOURCES)/English.lproj/Credits.html
/usr/libexec/PlistBuddy \
-c "Set CFBundleVersion $(SERVER_VERSION)" \
$(RELEASE_RESOURCES)/../Info.plist
# /usr/libexec/PlistBuddy \
# -c "Set CFBundleShortVersionString $(GUI_VERSION)" \
# $(RELEASE_RESOURCES)/../Info.plist
# /usr/libexec/PlistBuddy \
# -c "Set CFBundleVersion $(SERVER_VERSION)" \
# $(RELEASE_RESOURCES)/../Info.plist
debug: $(SERVER_PATH)/$(SERVER_BINARY)
xcodebuild -configuration Debug