Skip to content

Commit

Permalink
Builder|OS X: Automatically update installer package metadata
Browse files Browse the repository at this point in the history
Prior to creating an installer package, the XML files are updated
with version information. (PackageMaker might pull some of this from
the binary metadata, though.)

Also, make sure Snowberry is repackaged for OS X whenever a build
is done.
  • Loading branch information
skyjake committed Aug 6, 2013
1 parent 48dce2a commit bca71f0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
16 changes: 10 additions & 6 deletions distrib/autobuild.py
Expand Up @@ -44,19 +44,22 @@ def create_build_event():
update_changes()


def mac_meta_update():
"""Update the OS X installer metadata."""
import build_version
build_version.find_version(quiet=True)

# Let's find the previous event of this version.
system_command("deng_generate_installer_xml.py " + build_version.DOOMSDAY_VERSION_FULL_PLAIN)


def todays_platform_release():
"""Build today's release for the current platform."""
print "Building today's build."
ev = builder.Event()

git_pull()

if sys.platform == 'darwin' and mac_os_version() == '10.5':
if version_cmp(ev.version_base(), '1.11') >= 0:
# Build should not occur on this platform.
print 'Version %s is not buildable on OS X %s.' % (ev.version(), mac_os_version())
return

git_checkout(ev.tag() + builder.config.TAG_MODIFIER)

# We'll copy the new files to the build dir.
Expand Down Expand Up @@ -462,6 +465,7 @@ def sorted_commands():
'wiki': generate_wiki,
'web_init': web_init,
'web_update': web_update,
'mac_meta': mac_meta_update,
'help': show_help
}

Expand Down
5 changes: 5 additions & 0 deletions distrib/pilot.py
Expand Up @@ -318,6 +318,10 @@ def doTask(task):
msg("UPDATE .DEB CHANGELOG")
return autobuild('debchanges')

elif task == 'mac_meta':
msg("OS X METADATA UPDATE")
return autobuild('mac_meta')

elif task == 'build':
msg("BUILD RELEASE")
return autobuild('platform_release')
Expand Down Expand Up @@ -378,6 +382,7 @@ def handleCompletedTasks():

elif task == 'tag_build':
newTask('deb_changes', forClient='ubuntu')
newTask('mac_meta', forClient='master')
newTask('generate_readme', forClient='clikits')

elif task == 'deb_changes':
Expand Down
2 changes: 1 addition & 1 deletion distrib/platform_release.py
Expand Up @@ -171,7 +171,7 @@ def mac_package_snowberry():

def mac_release():
"""The Mac OS X release procedure."""

# Package Snowberry or acquire the shared package.
if mac_able_to_package_snowberry():
# Check Python dependencies.
Expand Down

0 comments on commit bca71f0

Please sign in to comment.