]> granicus.if.org Git - handbrake/commitdiff
Fixes make so it doesn't misidentify svn builds as stable releases.
authorjbrjake <jb.rubin@gmail.com>
Sun, 8 Jun 2008 20:34:36 +0000 (20:34 +0000)
committerjbrjake <jb.rubin@gmail.com>
Sun, 8 Jun 2008 20:34:36 +0000 (20:34 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1502 b64f7644-9d1e-0410-96f1-a4d463321fa5

Makefile

index 7b3acb5d46447dfb05e23ee10c383d495dc764fd..1021b1a096b4eebf1a47d11fcb667098cd94c34e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ app:    libhb/hbversion.h
 contrib/.contrib:\r
        @$(MAKE) --no-print-directory -C contrib all\r
 \r
-snapshot-app: contrib/.contrib libhb/hbversion.h\r
+snapshot-app: contrib/.contrib unstable-libhb/hbversion.h\r
        ( 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' )\r
 \r
 app-chunky: libhb/hbversion.h\r
@@ -123,5 +123,16 @@ libhb/hbversion.h:
        echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h\r
        echo "#endif" >> libhb/hbversion.h\r
        echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h\r
-       echo "#define APPCAST_URL \"$(APPCAST_URL)\"" >> libhb/hbversion.h\r
+       echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h\r
+       echo "#endif" >> libhb/hbversion.h\r
+\r
+unstable-libhb/hbversion.h:\r
+       echo "#ifndef HB_BUILD" > libhb/hbversion.h\r
+       echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h\r
+       echo "#endif" >> libhb/hbversion.h\r
+       echo "#ifndef HB_VERSION" >> libhb/hbversion.h\r
+       echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h\r
+       echo "#endif" >> libhb/hbversion.h\r
+       echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h\r
+       echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h\r
        echo "#endif" >> libhb/hbversion.h\r