summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-06-18 21:11:41 +0000
committerkonablend <[email protected]>2009-06-18 21:11:41 +0000
commit66ebe4710bac755606cc02e3201ea1fac8242f6b (patch)
tree35eab5181d1be52f27862bfabc1d0600c040c266
parentc8fb4f011c00707c01216b19bd43f38e1ad572b9 (diff)
BuildSystem: more appcast adjustments.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2571 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--make/configure.py17
-rw-r--r--pkg/appcast.xml.m42
2 files changed, 10 insertions, 9 deletions
diff --git a/make/configure.py b/make/configure.py
index 790d29abb..268781bd1 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -662,25 +662,26 @@ class Project( Action ):
if repo.type == 'release':
self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint)
- url_type = ''
+ 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)
- url_type = '_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)
- url_type = '_unofficial'
+ url_ctype = '_unofficial'
+ url_ntype = 'unofficial'
self.url_appcast = appcast_fmt % ('_unofficial',appcast_arch)
self.build = time.strftime('%Y%m%d') + '99'
self.title = 'Unofficial svn%d (%s)' % (repo.rev,self.build)
- #self.url_appbase = 'http://handbrake.fr/appcast%s.xml' % (url_type)
- #self.url_appcast = 'http://handbrake.fr/appcast%s%s.xml' % (url_type,url_arch)
- self.url_appbase = 'http://localhost/appcast%s' % (url_type)
- self.url_appcast = 'http://localhost/appcast%s%s.xml' % (url_type,url_arch)
+ 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
@@ -1210,8 +1211,8 @@ try:
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.appbase', project.url_appbase )
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 )
diff --git a/pkg/appcast.xml.m4 b/pkg/appcast.xml.m4
index 98634943a..85793d2a9 100644
--- a/pkg/appcast.xml.m4
+++ b/pkg/appcast.xml.m4
@@ -19,7 +19,7 @@ dnl
<item>
<title>__HB_name __HB_version Released</title>
<cli>__HB_build "__HB_version __BUILD_arch"</cli>
- <sparkle:releaseNotesLink>__HB_url_appbase.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>__HB_url_appnote</sparkle:releaseNotesLink>
<pubDate>__BUILD_date</pubDate>
<description></description>
<enclosure