summaryrefslogtreecommitdiff
path: root/src/moz-version
diff options
context:
space:
mode:
authorBenjamin Drung <bdrung@ubuntu.com>2009-12-17 11:56:30 +0100
committerBenjamin Drung <bdrung@ubuntu.com>2009-12-17 11:56:30 +0100
commit219e0a074702900f9c954f462ecace9b3a5c7149 (patch)
tree9b46192a4f3fe6ea38aaea87783fe083440fe1a9 /src/moz-version
parented0d1e1b776fd6c752392681d1df7ab37936a409 (diff)
- Move compare_versions from moz-version into separate module
- add src/moz_version.py - update src/moz-version - update src/dh_xul-ext
Diffstat (limited to 'src/moz-version')
-rwxr-xr-xsrc/moz-version111
1 files changed, 8 insertions, 103 deletions
diff --git a/src/moz-version b/src/moz-version
index 512ab8d..ddf4ac5 100755
--- a/src/moz-version
+++ b/src/moz-version
@@ -20,108 +20,16 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-# Reference: https://developer.mozilla.org/en/Toolkit_version_format
-
import getopt
import sys
+from moz_version import compare_versions
+
# error codes
COMMAND_LINE_SYNTAX_ERROR = 2
INVALID_COMPARATOR = 3
EMPTY_VERSION_STRING = 4
-def decode_part(part):
- """Decodes a version part (like 5pre4) to <number-a><string-b><number-c><string-d>"""
- subpart = [0,"",0,""]
-
- # Split <number-a>
- length = 0
- for i in xrange(len(part)):
- if part[i].isdigit() or part[i] in ("-"):
- length += 1
- else:
- break
- if length > 0:
- subpart[0] = int(part[0:length])
- part = part[length:]
-
- # Split <string-b>
- length = 0
- for i in xrange(len(part)):
- if not (part[i].isdigit() or part[i] in ("-")):
- length += 1
- else:
- break
- subpart[1] = part[0:length]
- part = part[length:]
-
- # Split <number-c>
- length = 0
- for i in xrange(len(part)):
- if part[i].isdigit() or part[i] in ("-"):
- length += 1
- else:
- break
- if length > 0:
- subpart[2] = int(part[0:length])
- subpart[3] = part[length:]
-
- # if string-b is a plus sign, number-a is incremented to be compatible with
- # the Firefox 1.0.x version format: 1.0+ is the same as 1.1pre
- if subpart[1] == "+":
- subpart[0] += 1
- subpart[1] = "pre"
-
- # if the version part is a single asterisk, it is interpreted as an
- # infinitely-large number: 1.5.0.* is the same as 1.5.0.(infinity)
- if subpart[1] == "*":
- subpart[0] = sys.maxint
- subpart[1] = ""
-
- return subpart
-
-def decode_version(version, verbose=False):
- """Decodes a version string like 1.1pre1a"""
- parts = version.split(".")
- decoded_parts = map(decode_part, parts)
- if verbose:
- print "I: Split %s up into %s." % (version, decoded_parts)
- return decoded_parts
-
-def compare_subpart((a, b)):
- # A string-part that exists is always less-then a nonexisting string-part
- if a == "":
- if b == "":
- return 0
- else:
- return 1
- elif b == "":
- if a == "":
- return 0
- else:
- return -1
- else:
- return cmp(a, b)
-
-def compare_part((x, y)):
- compared_subparts = filter(lambda x: x != 0, map(compare_subpart, zip(x, y)))
- if compared_subparts:
- return compared_subparts[0]
- else:
- return 0
-
-def compare_versions(a, b):
- if len(a) < len(b):
- a.extend((len(b) - len(a)) * [[0,"",0,""]])
- if len(b) < len(a):
- b.extend((len(a) - len(b)) * [[0,"",0,""]])
-
- result = filter(lambda x: x != 0, map(compare_part, zip(a, b)))
- if result:
- return result[0]
- else:
- return 0
-
comparators = ("lt", "le", "eq", "ne", "ge", "gt")
def moz_version_compare(version1, comparator, version2, silent=False, verbose=False):
@@ -141,21 +49,18 @@ def moz_version_compare(version1, comparator, version2, silent=False, verbose=Fa
symbol = {"lt": "<", "le": "<=", "eq": "=", "ne": "!=", "ge": ">=", "gt": ">"}
print "I: Comparing %s %s %s." % (version1, symbol[comparator], version2)
- a = decode_version(version1, verbose)
- b = decode_version(version2, verbose)
-
if comparator == "lt":
- return compare_versions(a, b) < 0
+ return compare_versions(version1, version2, verbose) < 0
elif comparator == "le":
- return compare_versions(a, b) <= 0
+ return compare_versions(version1, version2, verbose) <= 0
elif comparator == "eq":
- return compare_versions(a, b) == 0
+ return compare_versions(version1, version2, verbose) == 0
elif comparator == "ne":
- return compare_versions(a, b) != 0
+ return compare_versions(version1, version2, verbose) != 0
elif comparator == "ge":
- return compare_versions(a, b) >= 0
+ return compare_versions(version1, version2, verbose) >= 0
elif comparator == "gt":
- return compare_versions(a, b) > 0
+ return compare_versions(version1, version2, verbose) > 0
def usage(output):