Author: mwise
Date: Tue Feb 10 14:18:42 2009
New Revision: 4137
URL: http://svn.slimdevices.com?rev=4137&root=Jive&view=rev
Log:
Fix VERSION_TEXT so that any M or S from the svnversion command is ignored.
Additionally I renamed the calls for the tarball, and deb packages to be more
consistant. Lastly, added DEB_VERSION_TEXT for a debian-friendly version string.
Modified:
7.3/trunk/squeezeplay/src/Makefile.linux
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
Modified: 7.3/trunk/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/Makefile.linux?rev=4137&root=Jive&r1=4136&r2=4137&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/Makefile.linux (original)
+++ 7.3/trunk/squeezeplay/src/Makefile.linux Tue Feb 10 14:18:42 2009
@@ -144,7 +144,7 @@
#
.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont freefont-debian
-app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont squeezeplay_tgz
+app: portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib freefont squeezeplay-tgz
# portaudio
portaudio_v19_1360/Makefile:
@@ -158,7 +158,7 @@
cd flac-1.2.1; ./configure --disable-ogg --disable-xmms-plugin
--prefix=${PREFIX}
flac: flac-1.2.1/Makefile
- flac-1.2.1; make && make install
+ cd flac-1.2.1; make && make install
# libmad
libmad-0.15.1b/Makefile:
@@ -190,6 +190,7 @@
squeezeplay_contrib: squeezeplay/Makefile
cd squeezeplay_contrib; make PREFIX=${PREFIX}
+
# freefont
freefont:
@@ -200,11 +201,21 @@
cp fonts-clock/Digital.ttf ${PREFIX}/share/jive/fonts
cp fonts-clock/DigitalItalic.ttf ${PREFIX}/share/jive/fonts
-squeezeplay_tgz: squeezeplay/Makefile
- cd squeezeplay; make SqueezePlay_tgz
-
-squeezeplay_deb: squeezeplay/Makefile
- cd squeezeplay; make SqueezePlay_deb
+#
+# This builds the .tarball. It's called by 'all' so no need to run it manually
+#
+squeezeplay-tgz: squeezeplay/Makefile
+ cd squeezeplay; make squeezeplay-tgz
+
+#
+# Allow user to call the -deb build and it runs both the 'all' and then
packages it
+#
+
+.PHONY: squeezeplay-deb
+squeezeplay-deb: all squeezeplay-deb-make
+
+squeezeplay-deb-make: squeezeplay/Makefile
+ cd squeezeplay; make squeezeplay-deb
#
# clean
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=4137&root=Jive&r1=4136&r2=4137&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Tue Feb 10 14:18:42 2009
@@ -61,7 +61,8 @@
BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
-VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n ..)
+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')
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
@@ -128,11 +129,11 @@
-rm $(DMG_TMP_IMAGE_FILENAME)
cp -p $(DMG_IMAGE_FILENAME)
$(OSX_BUILD_DIR)/SqueezePlay-$(VERSION_TEXT).dmg
-SqueezePlay_tgz:
+squeezeplay-tgz:
cd $(prefix); tar -zcf ../squeezeplay.tgz *; tar -ztvf
../squeezeplay.tgz
-SqueezePlay_deb:
- sed -e 's/_VERSION_/$(VERSION_TEXT)/g' ../platforms/debian/changelog.in
> ../platforms/debian/changelog
+squeezeplay-deb:
+ sed -e 's/_VERSION_/$(DEB_VERSION_TEXT)/g'
../platforms/debian/changelog.in > ../platforms/debian/changelog
cd ../platforms; fakeroot dpkg-buildpackage -b; ls -lah
../squeezeplay*.deb
# Convenience library:
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=4137&root=Jive&r1=4136&r2=4137&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in Tue Feb 10 14:18:42 2009
@@ -257,7 +257,8 @@
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 ..)
+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')
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
@@ -1183,11 +1184,11 @@
-rm $(DMG_TMP_IMAGE_FILENAME)
cp -p $(DMG_IMAGE_FILENAME)
$(OSX_BUILD_DIR)/SqueezePlay-$(VERSION_TEXT).dmg
-SqueezePlay_tgz:
+squeezeplay-tgz:
cd $(prefix); tar -zcf ../squeezeplay.tgz *; tar -ztvf
../squeezeplay.tgz
-SqueezePlay_deb:
- sed -e 's/_VERSION_/$(VERSION_TEXT)/g' ../platforms/debian/changelog.in
> ../platforms/debian/changelog
+squeezeplay-deb:
+ sed -e 's/_VERSION_/$(DEB_VERSION_TEXT)/g'
../platforms/debian/changelog.in > ../platforms/debian/changelog
cd ../platforms; fakeroot dpkg-buildpackage -b; ls -lah
../squeezeplay*.deb
src/version.h: FORCE
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
