Skip to content

Commit

Permalink
BUILDBOT: Switch Android archive packaging to zip as intial test.
Browse files Browse the repository at this point in the history
This is not final code as once this is working, this should be migrated
to a config[] parameter.
  • Loading branch information
digitall committed Jul 31, 2013
1 parent 150edde commit e69f0da
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
18 changes: 15 additions & 3 deletions config/master.cfg
Expand Up @@ -1207,13 +1207,17 @@ for name, config in scumm_platforms_master.items():
if config.has_key("strip"):
f.addStep(scumm.Strip(command = config["strip"]))

arch_format = "tar.bz"
if name == "android":
arch_format = "zip"

f.addStep(scumm.Package(disttarget = platform_disttarget,
srcpath = "../../src-master/src/",
dstpath = scumm_package_dst_master,
package = scumm_package_master,
buildname = name + "-%s" % scumm_branch_master_desc,
platform_package = config["package"],
archive_format = "tar.bz2",
archive_format = arch_format,
env = config["env"]))

c["builders"].append( {
Expand Down Expand Up @@ -1258,13 +1262,17 @@ for name, config in scumm_platforms_stable.items():
if config.has_key("strip"):
f.addStep(scumm.Strip(command = config["strip"]))

arch_format = "tar.bz"
if name == "android":
arch_format = "zip"

f.addStep(scumm.Package(disttarget = platform_disttarget,
srcpath = "../../src-stable/src/",
dstpath = scumm_package_dst_stable,
package = scumm_package_stable,
buildname = name + "-%s" % scumm_branch_stable_desc,
platform_package = config["package"],
archive_format = "tar.bz2",
archive_format = arch_format,
env = config["env"]))

c["builders"].append( {
Expand Down Expand Up @@ -1312,13 +1320,17 @@ for name, config in scumm_platforms_master.items():
# if config.has_key("strip"):
# f.addStep(scumm.Strip(command = config["strip"]))

arch_format = "tar.bz"
if name == "android":
arch_format = "zip"

f.addStep(scumm.Package(disttarget = platform_disttarget,
srcpath = "../../src-tools-master/src/",
dstpath = scumm_tools_package_dst_master,
package = scumm_tools_package_master,
buildname = name + "-%s" % scumm_tools_branch_master_desc,
platform_package = config["package-tools"],
archive_format = "tar.bz2",
archive_format = arch_format,
env = config["env"]))

c["builders"].append( {
Expand Down

0 comments on commit e69f0da

Please sign in to comment.