diff options
author | konablend <[email protected]> | 2009-03-01 17:03:11 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2009-03-01 17:03:11 +0000 |
commit | 4dbce6b69967c1e14092637aa95b6c31855a81fc (patch) | |
tree | 516c17095967698eeb419c70ce72dbd2c11bf754 /libhb/update.c | |
parent | c47939541ccec1e5e57753b16b28baed2613f586 (diff) |
BuildSystem: conversion from jam-based to make-based system.
KNOWN ISSUES:
1. OSX + Xcode builds do not support parallel builds; attempting to
use them may cause unbounded number of jobs. However, disabling
via configure --disable-xcode avoids the issue.
2. OSX ppc binary produces binary which has audio-scan problems.
3. OSX ppc64 binary has not been runtime tested.
ADDED:
00-BuildUserGuide.txt
contrib/*/module.*
doc/
make/
libhb/module.*
test/module.*
macos/module.*
gtk/module.*
DROPPED:
BUILD
BuildContribDarwin.sh
DownloadMacOsXContribBinaries.sh
Jamfile
Jamrules
MacOsXContribBinariesVersion.txt
Makefile
Makefile.config
jam
libhb/Jamefile
libhb/Makefile
test/BUILDSHARED
test/Makefile
contrib/Jamfile
contrib/Makefile
contrib/patch-ffmpeg.patch
contrib/patch-x264-idr.patch
contrib/patch-x264-linux.patch
RENAMED:
contrib/*.patch -> contrib/MODULE/[AP]??-*.patch
macosx/HandBrake.plist -> macosx/Info.plist
MODIFIED: libhb/decavcodec.c
Patched to use cleaner include "libavcodec/audioconvert".
Second part to support this cleanup is ffmpeg A02-audioconvert.patch .
MODIFIED: libhb/hb.c
MODIFIED: libhb/hb.h
MODIFIED: libhb/muxmkv.c
MODIFIED: libhb/muxmp4.c
MODIFIED: libhb/update.c
Patched to use "project.h" for project metadata.
Renamed HB_BUILD -> HB_PROJECT_BUILD.
Renamed HB_VERSION -> HB_PROJECT_VERSION.
MODIFIED: test/test.c:
Patched HandBrakeCLI to support I/O on Mac OS X ZFS filesystems.
Reference r1803 as similar patch for HandBrake.app .
Unpatched behavior is crash/buserror when using ZFS.
MODIFIED: macosx/Growl.framework/
Upgraded 0.7.6 (i386,ppc) -> 1.1.2 (i386,x86_64,ppc,ppc64).
New architectures facilitate x86_64 and ppc64 builds.
MODIFIED: macosx/HandBrake.xcodeproj/
Bumped compatibilty mode from 2.4 -> 3.1 .
Dumped old configurations Deployment, Developer.
Added configurations standard, sebug as replacements.
Added standard.i386, standard.x86_64, standard.ppc, standard.ppc64 .
for explicit architecture build.
All configurations settings cleaned up and normalized.
Build output directories adjusted to support new build system.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2180 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/update.c')
-rw-r--r-- | libhb/update.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libhb/update.c b/libhb/update.c index 599d82ece..6b0d7af92 100644 --- a/libhb/update.c +++ b/libhb/update.c @@ -42,7 +42,7 @@ static void UpdateFunc( void * _data ) int i; /* Setup hb_query and hb_query_two with the correct appcast file */ - if( HB_BUILD % 100 ) + if( HB_PROJECT_BUILD % 100 ) { hb_log("Using http://handbrake.fr/appcast_unstable.xml (primary)"); hb_log("Using http://handbrake.fr/appcast.xml (secondary)"); @@ -148,7 +148,7 @@ static void UpdateFunc( void * _data ) goto error; } - /* Stable HB_BUILD */ + /* Stable HB_PROJECT_BUILD */ stable = strtol( cur, &cur, 10 ); if( cur >= end ) @@ -280,7 +280,7 @@ static void UpdateFunc( void * _data ) goto error; } - /* UnStable HB_BUILD */ + /* UnStable HB_PROJECT_BUILD */ unstable = strtol( cur, &cur, 10 ); if( cur >= end ) @@ -323,10 +323,10 @@ static void UpdateFunc( void * _data ) hb_log( "latest unstable: %s, build %d", unstable_str, unstable ); /* Return the build information */ - if( HB_BUILD % 100 ) + if( HB_PROJECT_BUILD % 100 ) { /* We are runnning an unstable build */ - if( unstable > HB_BUILD ) + if( unstable > HB_PROJECT_BUILD ) { memcpy( data->version, unstable_str, sizeof( unstable_str ) ); *(data->build) = unstable; @@ -335,7 +335,7 @@ static void UpdateFunc( void * _data ) else { /* We are runnning an stable build */ - if( stable > HB_BUILD ) + if( stable > HB_PROJECT_BUILD ) { memcpy( data->version, stable_str, sizeof( stable_str ) ); *(data->build) = stable; |