Chromium Code Reviews| Index: dart/tools/create_windows_installer.py |
| diff --git a/dart/tools/create_windows_installer.py b/dart/tools/create_windows_installer.py |
| index 6566a5b7d246f6ed73acfa63659a7ae27d0d87b7..29d23feffa037f84953780825dadc8acce9d6a90 100644 |
| --- a/dart/tools/create_windows_installer.py |
| +++ b/dart/tools/create_windows_installer.py |
| @@ -83,24 +83,29 @@ def GetInputDirectory(options, temp_dir): |
| # In addition to that, the limits on the size are: |
| # Major: 256 |
| # Minor: 256 |
| -# Build: 65536 |
| +# Patch: 65536 |
| # To circumvent this we create the version like this: |
| # Major.Minor.X |
| -# where X is Build<<9 + Patch |
| -# Example version 1.2.4.14 will go to 1.2.2062 |
| +# from "major.minor.patch-prerelease.prerelease_patch" |
| +# where X is "patch<<10 + prerelease<<5 + prerelease_patch" |
| +# Example version 1.2.4-dev.2.3 will go to 1.2.4163 |
| def GetMicrosoftProductVersion(version): |
| version_parts = version.split('.') |
| - if len(version_parts) is not 4: |
| + if len(version_parts) is not 5: |
| raise Exception( |
| "Version string (%s) does not follow specification" % version) |
| - (major, minor, build, patch) = map(int, version_parts) |
| + (major, minor, patch, prerelease, prerelease_patch) = map(int, version_parts) |
| - if build > 127 or patch > 511: |
| - raise Exception('Build/Patch can not be above 127/511') |
| if major > 255 or minor > 255: |
| raise Exception('Major/Minor can not be above 256') |
| - |
| - combined = (build << 9) + patch |
| + if patch > 63: |
| + raise Exception('Patch can not be above 63') |
| + if prerelease > 31: |
| + raise Exception('Prerelease can not be above 63') |
|
Bob Nystrom
2013/12/04 22:28:20
"31" here and below.
kustermann
2013/12/05 09:27:27
Done.
|
| + if prerelease > 31: |
|
kasperl
2013/12/05 08:29:58
Check prerelease_patch instead of prerelease.
kustermann
2013/12/05 09:27:27
Thanks for catching this one.
|
| + raise Exception('PrereleasePatch can not be above 63') |
| + |
| + combined = (patch << 10) + (prerelease << 5) + prerelease_patch |
| return '%s.%s.%s' % (major, minor, combined) |
| # Append using the current indentation level |