| ... |
... |
@@ -1103,7 +1103,7 @@ def milestone(build_env, build_project, version_path, as_milestone, _): |
|
1103
|
1103
|
die("Could not find a version number in {}".format(p))
|
|
1104
|
1104
|
versions.append(content[-1])
|
|
1105
|
1105
|
|
|
1106
|
|
- is_early_beta_or_earlier = None
|
|
|
1106
|
+ is_early_beta_or_earlier = False
|
|
1107
|
1107
|
if as_milestone:
|
|
1108
|
1108
|
if "a1" not in versions[0]:
|
|
1109
|
1109
|
# We could make this work with some effort
|
| ... |
... |
@@ -1111,8 +1111,6 @@ def milestone(build_env, build_project, version_path, as_milestone, _): |
|
1111
|
1111
|
as_milestone = as_milestone[0]
|
|
1112
|
1112
|
as_milestone_flag = "" if as_milestone == "release" else "b1"
|
|
1113
|
1113
|
versions = [v.replace("a1", as_milestone_flag) for v in versions]
|
|
1114
|
|
- if as_milestone == "early-beta":
|
|
1115
|
|
- is_early_beta_or_earlier = True
|
|
1116
|
1114
|
|
|
1117
|
1115
|
milestone, firefox_version, firefox_version_display = versions[:3]
|
|
1118
|
1116
|
|
| ... |
... |
@@ -1133,7 +1131,7 @@ def milestone(build_env, build_project, version_path, as_milestone, _): |
|
1133
|
1131
|
m = re.search(r"([ab]\d+)", milestone)
|
|
1134
|
1132
|
ab_patch = m.group(1) if m else ""
|
|
1135
|
1133
|
|
|
1136
|
|
- if not as_milestone:
|
|
|
1134
|
+ if False:
|
|
1137
|
1135
|
defines = os.path.join(build_env.topsrcdir, "build", "defines.sh")
|
|
1138
|
1136
|
with open(defines, "r") as fh:
|
|
1139
|
1137
|
for line in fh.read().splitlines():
|