summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbrjake <[email protected]>2008-06-08 20:34:36 +0000
committerjbrjake <[email protected]>2008-06-08 20:34:36 +0000
commiteae2b0f3e10c035140077ed4d23c3059d99f6e24 (patch)
treebf0e32a7d5204a44be78a901edb7a2123dca9752
parent61d715a1b8403ab04a601fa8e3e1cfc2ad8d096e (diff)
Fixes make so it doesn't misidentify svn builds as stable releases.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1502 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--Makefile15
1 files changed, 13 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7b3acb5d4..1021b1a09 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ app: libhb/hbversion.h
contrib/.contrib:
@$(MAKE) --no-print-directory -C contrib all
-snapshot-app: contrib/.contrib libhb/hbversion.h
+snapshot-app: contrib/.contrib unstable-libhb/hbversion.h
( cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment HB_BUILD="$(SNAP_HB_BUILD)" HB_VERSION="$(SNAP_HB_VERSION)" CURRENT_PROJECT_VERSION="$(SNAP_HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast_unstable.xml" build | sed '/^$$/d' )
app-chunky: libhb/hbversion.h
@@ -123,5 +123,16 @@ libhb/hbversion.h:
echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h
echo "#endif" >> libhb/hbversion.h
echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
- echo "#define APPCAST_URL \"$(APPCAST_URL)\"" >> libhb/hbversion.h
+ echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h
+ echo "#endif" >> libhb/hbversion.h
+
+unstable-libhb/hbversion.h:
+ echo "#ifndef HB_BUILD" > libhb/hbversion.h
+ echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h
+ echo "#endif" >> libhb/hbversion.h
+ echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+ echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h
+ echo "#endif" >> libhb/hbversion.h
+ echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+ echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h
echo "#endif" >> libhb/hbversion.h