/[soft]/mga-gnome/trunk/mga-gnome
ViewVC logotype

Diff of /mga-gnome/trunk/mga-gnome

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3086 by ovitters, Mon Feb 27 09:32:36 2012 UTC revision 3090 by ovitters, Mon Feb 27 14:32:00 2012 UTC
# Line 37  MEDIA="Core Release Source" Line 37  MEDIA="Core Release Source"
37  URL="http://download.gnome.org/sources/"  URL="http://download.gnome.org/sources/"
38  PKGROOT='~/pkgs'  PKGROOT='~/pkgs'
39    
40    re_majmin = re.compile(r'^([0-9]+\.[0-9]+).*')
41  re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')  re_version = re.compile(r'([-.]|\d+|[^-.\d]+)')
42    
43  def version_cmp(a, b):  def version_cmp(a, b):
# Line 62  def get_latest_version(versions, max_ver Line 63  def get_latest_version(versions, max_ver
63              latest = version              latest = version
64      return latest      return latest
65    
66    def judge_version_increase(version_old, version_new):
67            """Judge quality of version increase:
68    
69            Returns a tuple containing judgement and message
70    
71            Judgement:
72            Less than 0: Error
73            0 to 4: Better not
74            5+: Ok"""
75            versions = (version_old, version_new)
76    
77            print " => ".join(versions)
78    
79            # First do a basic version comparison to ensure version_new is actually newer
80            compare = version_cmp(version_new, version_old)
81    
82            if compare == 0:
83                return (-2, "Already at version %s!" % (version_old))
84    
85            if compare != 1:
86                return (-3, "Version %s is older than current version %s!" % (version_new, version_old))
87    
88            # Version is newer, but we don't want to see if it follows the GNOME versioning scheme
89            majmins = [re_majmin.sub(r'\1', ver) for ver in versions if re_majmin.match(ver) is not None]
90    
91            if len(majmins) == 1:
92                return (-1, "Version number scheme changes: %s" % (", ".join(versions)))
93    
94            if len(majmins) == 0:
95                return (0, "Unsupported version numbers: %s" % (", ".join(versions)))
96    
97            # Follows GNOME versioning scheme
98            # Meaning: x.y.z
99            #          x = major
100            #          y = minor  : even if stable
101            #          z = micro
102    
103            # Major+minor the same? Then go ahead and upgrade!
104            if majmins[0] == majmins[1]:
105                # Majmin of both versions are the same, looks good!
106                return (10, None)
107    
108            # More detailed analysis needed, so figure out the numbers
109            majmin_nrs = [map(long, ver.split('.')) for ver in majmins]
110    
111            # Check/ensure major version number is the same
112            if majmin_nrs[0][0] != majmin_nrs[1][0]:
113                return (1, "Major version number increase")
114    
115            # Minor indicates stable/unstable
116            devstate = (majmin_nrs[0][1] % 2 == 0, majmin_nrs[1][1] % 2 == 0)
117    
118            # Upgrading to unstable is weird
119            if not devstate[1]:
120                if devstate[0]:
121                    return (1, "Stable to unstable increase")
122    
123                return (4, "Unstable to unstable version increase")
124    
125            # Unstable => stable is always ok
126            if not devstate[0]:
127                return (5, "Unstable to stable")
128    
129            # Can only be increase of minors from one stable to the next
130            return (6, "Stable version increase")
131    
132  def line_input (file):  def line_input (file):
133      for line in file:      for line in file:
134          if line[-1] == '\n':          if line[-1] == '\n':
# Line 153  class SpecFile(object): Line 220  class SpecFile(object):
220          """Update specfile (increase version)"""          """Update specfile (increase version)"""
221          cur_version = self.version          cur_version = self.version
222    
223          compare = version_cmp(version, cur_version)          (judgement, msg) = judge_version_increase(cur_version, version)
224    
225          if compare == 0:          if judgement < 0:
226              print >>sys.stderr, "ERROR: Already at version %s!" % (cur_version)              print >>sys.stderr, "ERROR: %s!" % (msg)
227              return False              return False
228    
229          if compare != 1:          if judgement < 5:
230              print >>sys.stderr, "ERROR: Version %s is older than current version %s!" % (version, cur_version)              print "WARNING: %s!" % (msg)
231              return False              return False
232    
233          # XXX - os.path.join is hackish          # XXX - os.path.join is hackish
# Line 447  def cmd_dep3(options, parser): Line 514  def cmd_dep3(options, parser):
514      p.add_dep3()      p.add_dep3()
515    
516  def cmd_package_new_version(options, parser):  def cmd_package_new_version(options, parser):
517        # Determine the package name
518      if options.upstream:      if options.upstream:
519          downstream, downstream_files = get_downstream_names()          downstream, downstream_files = get_downstream_names()
520    
# Line 456  def cmd_package_new_version(options, par Line 524  def cmd_package_new_version(options, par
524    
525          if len(downstream[options.package]) != 1:          if len(downstream[options.package]) != 1:
526              # XXX - Make it more intelligent              # XXX - Make it more intelligent
527              print >>sys.stderr, "ERROR: Multiple packages for upstream name: %s" % options.package              print >>sys.stderr, "ERROR: Multiple packages found for %s: %s" % (options.package, ", ".join(downstream[options.package]))
528              sys.exit(1)              sys.exit(1)
529    
530          package = list(downstream[options.package])[0]          package = list(downstream[options.package])[0]
531      else:      else:
532          package = options.package          package = options.package
533    
534        # Directories packages are located in
   
535      root = os.path.expanduser(PKGROOT)      root = os.path.expanduser(PKGROOT)
536      cwd = os.path.join(root, package)      cwd = os.path.join(root, package)
537    
538        # Checkout package to ensure the checkout reflects the latest changes
539      try:      try:
540          subprocess.check_call(['mgarepo', 'co', package], cwd=root)          subprocess.check_call(['mgarepo', 'co', package], cwd=root)
541      except subprocess.CalledProcessError:      except subprocess.CalledProcessError:
542          sys.exit(1)          sys.exit(1)
543    
544        # SpecFile class handles the actual version+release change
545      s = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package))      s = SpecFile(os.path.join(cwd, "SPECS", "%s.spec" % package))
546      print "%s => %s" % (s.version, options.version)      print "%s => %s" % (s.version, options.version)
547      if not s.update(options.version):      if not s.update(options.version):
548          sys.exit(1)          sys.exit(1)
549    
550        # We can even checkin and submit :-)
551      if options.submit:      if options.submit:
552          try:          try:
553              # checkin changes              # checkin changes
554              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version'], cwd=cwd)              subprocess.check_call(['mgarepo', 'ci', '-m', 'new version %s' % options.version], cwd=cwd)
555              # and submit              # and submit
556              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)              subprocess.check_call(['mgarepo', 'submit'], cwd=cwd)
557          except subprocess.CalledProcessError:          except subprocess.CalledProcessError:
Legend:
Removed from v.3086  
changed lines
  Added in v.3090
  ViewVC Help
Powered by ViewVC 1.1.30