self.src_dir = os.path.normpath( options.src )
self.build_dir = os.path.normpath( options.build )
self.prefix_dir = os.path.normpath( options.prefix )
+ if options.sysroot != None:
+ self.sysroot_dir = os.path.normpath( options.sysroot )
+ else:
+ self.sysroot_dir = ""
+
+ if options.minver != None:
+ self.minver = options.minver
+ else:
+ self.minver = ""
## special case if src == build: add build subdir
if os.path.abspath( self.src_dir ) == os.path.abspath( self.build_dir ):
if self.uuid == 'b64f7644-9d1e-0410-96f1-a4d463321fa5':
self.official = 1
m = re.match( '([^:]+)://([^/]+)/(.+)', self.url )
- if m and re.match( 'tags/', m.group( 3 )):
+ if m and re.match( '.*tags/.*', m.group( 3 )):
self.type = 'release'
else:
self.type = 'developer'
self.vmajor = 0
self.vminor = 9
- self.vpoint = 4
+ self.vpoint = 5
def _action( self ):
## add architecture to URL only for Mac
self.build = time.strftime('%Y%m%d') + '01'
self.title = '%s svn%d (%s)' % (self.name,repo.rev,self.build)
else:
- self.version = 'svn%d' % (repo.rev)
+ self.version = 'rev%d' % (repo.rev)
url_ctype = '_unofficial'
url_ntype = 'unofficial'
self.build = time.strftime('%Y%m%d') + '99'
- self.title = 'Unofficial svn%d (%s)' % (repo.rev,self.build)
+ self.title = '%s rev%d (%s)' % (self.name,repo.rev,self.build)
self.url_appcast = 'http://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
self.url_appnote = 'http://handbrake.fr/appcast/%s.html' % (url_ntype)
## add install options
grp = OptionGroup( cli, 'Directory Locations' )
+ h = IfHost( 'specify sysroot (e.g. for Leopard builds from Snow Leapard)', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--sysroot', default=None, action='store', metavar='DIR',
+ help=h )
grp.add_option( '--src', default=cfg.src_dir, action='store', metavar='DIR',
help='specify top-level source dir [%s]' % (cfg.src_dir) )
grp.add_option( '--build', default=cfg.build_dir, action='store', metavar='DIR',
arch.mode.cli_add_option( grp, '--arch' )
grp.add_option( '--cross', default=None, action='store', metavar='SPEC',
help='specify GCC cross-compilation spec' )
+ h = IfHost( 'Min OS X Version', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--minver', default=None, action='store', metavar='VER',
+ help=h )
cli.add_option_group( grp )
## add tool locations
doc.add( 'XCODE.external.prefix', cfg.xcode_x_prefix )
doc.addMake( '' )
+ doc.addMake( '## define debug mode before other includes' )
+ doc.addMake( '## since it is tested in some module.defs' )
+ doc.add( 'GCC.g', debugMode.mode )
+ doc.addBlank()
doc.addMake( '## include definitions' )
doc.addMake( 'include $(SRC/)make/include/main.defs' )
select.doc_add( doc )
doc.addBlank()
- if arch.mode.mode != arch.mode.default:
+ if build.match( '*-*-darwin*' ):
doc.add( 'GCC.archs', arch.mode.mode )
+ doc.add( 'GCC.sysroot', cfg.sysroot_dir )
+ doc.add( 'GCC.minver', cfg.minver )
else:
doc.add( 'GCC.archs', '' )
- doc.add( 'GCC.g', debugMode.mode )
+ doc.add( 'GCC.sysroot', '' )
+ doc.add( 'GCC.minver', '' )
+ doc.add( 'GCC.ldsysroot', '$(GCC.sysroot)' )
+ doc.add( 'GCC.ldminver', '$(GCC.minver)' )
doc.add( 'GCC.O', optimizeMode.mode )
if options.enable_asm and not Tools.yasm.fail: