X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Fconfigure.py;h=1b140739b91213fde0ae343ffee73f7ba5fd193c;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=0c41792551af3757695899231f1c33852ee8502d;hpb=f9a1c471fc67fe26a76b0921e155028cc9466a27;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/make/configure.py b/make/configure.py index 0c417925..1b140739 100644 --- a/make/configure.py +++ b/make/configure.py @@ -654,23 +654,33 @@ class Project( Action ): self.vpoint = 4 def _action( self ): - appcastfmt = 'http://handbrake.fr/appcast%s.xml' + ## add architecture to URL only for Mac + if fnmatch.fnmatch( build.spec, '*-*-darwin*' ): + url_arch = '.%s' % (arch.mode.mode) + else: + url_arch = '' if repo.type == 'release': self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint) - self.url_appcast = appcastfmt % ('') + url_ctype = '' + url_ntype = 'stable' self.build = time.strftime('%Y%m%d') + '00' self.title = '%s %s (%s)' % (self.name,self.version,self.build) elif repo.type == 'developer': self.version = 'svn%d' % (repo.rev) - self.url_appcast = appcastfmt % ('_unstable') + url_ctype = '_unstable' + url_ntype = 'unstable' 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.url_appcast = appcastfmt % ('_unofficial') + 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) self.msg_end = '%s (%s)' % (self.name,repo.type) self.fail = False @@ -1190,17 +1200,18 @@ try: doc.add( 'CONF.args', ' '.join( args )) doc.addBlank() - doc.add( 'HB.title', project.title ) - doc.add( 'HB.name', project.name ) - doc.add( 'HB.name.lower', project.name_lower ) - doc.add( 'HB.name.upper', project.name_upper ) - doc.add( 'HB.acro.lower', project.acro_lower ) - doc.add( 'HB.acro.upper', project.acro_upper ) - - doc.add( 'HB.url.website', project.url_website ) - doc.add( 'HB.url.community', project.url_community ) - doc.add( 'HB.url.irc', project.url_irc ) - doc.add( 'HB.url.appcast', project.url_appcast ) + doc.add( 'HB.title', project.title ) + doc.add( 'HB.name', project.name ) + doc.add( 'HB.name.lower', project.name_lower ) + doc.add( 'HB.name.upper', project.name_upper ) + doc.add( 'HB.acro.lower', project.acro_lower ) + doc.add( 'HB.acro.upper', project.acro_upper ) + + doc.add( 'HB.url.website', project.url_website ) + doc.add( 'HB.url.community', project.url_community ) + doc.add( 'HB.url.irc', project.url_irc ) + doc.add( 'HB.url.appcast', project.url_appcast ) + doc.add( 'HB.url.appnote', project.url_appnote ) doc.add( 'HB.version.major', project.vmajor ) doc.add( 'HB.version.minor', project.vminor )