Changeset 664 for CMT/v1r25-branch/mgr

Timestamp:

Jan 13, 2014, 4:09:37 PM (10 years ago)

Author:

rybkin

Message:

merge -r 646:663 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• mgr/CMT.dtd (modified) (1 diff)
• mgr/cmt-make-time-sub-mem-io.awk (copied) (copied from CMT/HEAD/mgr/cmt-make-time-sub-mem-io.awk)
• mgr/cmt_dcc_version.sh (modified) (1 prop)
• mgr/cmt_svn_checkout.py (modified) (10 diffs)
• mgr/fragments/application (modified) (1 diff)
• mgr/fragments/constituent (modified) (1 prop)
• mgr/fragments/constituent_lock (modified) (1 prop)
• mgr/fragments/jar (modified) (1 prop)
• mgr/fragments/java (modified) (1 prop)
• mgr/fragments/nmake/check_application (modified) (1 prop)
• mgr/fragments/nmake/constituent (modified) (1 prop)
• mgr/fragments/nmake/constituent_lock (modified) (1 prop)
• mgr/fragments/nmake/jar (modified) (1 prop)
• mgr/fragments/nmake/java (modified) (1 prop)
• mgr/fragments/nmake/library (modified) (1 prop)
• mgr/fragments/nmake/library_no_static (modified) (1 prop)
• mgr/fragments/nmake/package (modified) (11 diffs)
• mgr/fragments/nmake/packages_header (modified) (1 diff)
• mgr/fragments/package (modified) (8 diffs)
• mgr/fragments/packages_header (modified) (1 diff)
• mgr/requirements (modified) (2 diffs)

CMT/v1r25-branch/mgr/CMT.dtd

@@ -1 @@
-<!ENTITY  % cmtns   "xmlns CDATA #FIXED 'http://www.cmtsite.org/cmt'">
+<!ENTITY  % cmtns   "xmlns CDATA #FIXED 'http://www.cmtsite.net/cmt'">
 <!ATTLIST setup     %cmtns;>
 <!ATTLIST projects  %cmtns;>

CMT/v1r25-branch/mgr/cmt_svn_checkout.py

@@ -15 +15 @@
       --with_version_directory create version directory upon PATH checkout (default)
       --url=URL                checkout PATH from repository URL
+      --debug                  print lots of debugging information
   -h, --help                   display this help and exit
       --version                output version information and exit
 
-The SVNROOT, SVNTRUNK, SVNTAGS, and SVNBRANCHES environment variables specify repository URL of PATH, location of PATH trunk, tags, and branches (relatively to PATH) respectively.
+The SVNROOT, SVNTRUNK, SVNTAGS, and SVNBRANCHES (also SVNDEVBRANCHES) environment variables specify repository URL of PATH, location of PATH trunk, tags, and branches (also devbranches) (relatively to PATH) respectively.
 
 Report bugs to <CMT-L@IN2P3.FR>.
 """
 
-__version__ = '0.6.0'
-__date__ = 'Fri Mar 09 2012'
+__version__ = '0.8.0'
+__date__ = 'Wed Jul 31 2013'
 __author__ = 'Grigory Rybkin'
 
@@ -40 +41 @@
 import tempfile
 import re
+
+import logging
 
 self = 'cmt_svn_checkout.py'
@@ -298 +301 @@
                  tags = None,
                  branches = None,
+                 devbranches = None,
                  version = None,
                  version_dir = None,
@@ -307 +311 @@
         self.tags = tags
         self.branches = branches
+        self.devbranches = devbranches
         self.version = version
         self.version_dir = version_dir
@@ -327 +332 @@
         if self.branches is None:
             self.branches = os.getenv('SVNBRANCHES', 'branches')
+        if self.devbranches is None:
+            self.devbranches = os.getenv('SVNDEVBRANCHES', 'devbranches')
 
     def cmtRepos(self):
@@ -333 +340 @@
         self.tags= '.'
         self.branches = '.'
+        self.devbranches = '.'
 
     def add(self, module):
@@ -378 +386 @@
         """Attempt to determine the tag of the module's trunk.
         
-        Return the tag if its contents are the same as those of the trunk, and
-        its last_changed_rev is greater than the trunk created_rev, None otherwise.
+        Return the tag if its files are copied from the trunk and
+        their last_changed_rev numbers are the same as those of the trunk files.
         """
         trunk = posixpath.join(module.url, self.trunk)
 #        trunk = posixpath.normpath(posixpath.join(module.url, self.trunk))
+        cmd = 'svn ls -vR %s' % trunk
+        sc, out = Utils.getstatusoutput(cmd)
+        logger.debug('%s\n%s' % (cmd, out))
+        if sc != 0:
+            return None
+        trunk_dirent = [line.split() for line in out.splitlines()]
+        trunk_revs = dict([(line[-1], int(line[0])) for line in trunk_dirent if not line[-1].endswith(posixpath.sep)])
+        logger.debug('%s' % trunk_revs)
+
+        curdir = posixpath.curdir + posixpath.sep
+        for line in trunk_dirent:
+            if line[-1] == curdir:
+                class info(object): pass
+                info.last_changed_rev = int(line[0])
+                self.info_receiver(trunk, info, module)
+                logger.debug('last_changed_rev: %d' % info.last_changed_rev)
+                break
+
+#        cmd = 'svn info %s' % trunk
+#         p = r'last\s+changed\s+rev:\s+(?P<rev>\d+)'
+#         m = re.search(p, out, re.I)
+#         if m:
+#             class info(object): pass
+#             info.last_changed_rev = int(m.group('rev'))
+#             self.info_receiver(trunk, info, module)
+# #            self.info_receiver(trunk, info, None)
+# #             print >>sys.stderr, '%s: last_changed_rev %i' % \
+# #                   (trunk, self.info.last_changed_rev)
+# #            last_changed_rev = int(m.group('rev'))
+#         else:
+#             return None
+
+        tags = posixpath.join(module.url, self.tags)
+#        tags = posixpath.normpath(posixpath.join(module.url, self.tags))
+        cmd = 'svn ls -vR %s' % tags
+#        cmd = 'svn ls -v %s' % tags
+        sc, out = Utils.getstatusoutput(cmd)
+        logger.debug('%s\n%s' % (cmd, out))
+        if sc != 0:
+            return None
+        tags_dirent = [line.split() for line in out.splitlines()]
+        tags_revs = dict()
+        for ent in tags_dirent:
+            try:
+                tag, path = ent[-1].split(posixpath.sep, 1)
+            except ValueError:
+                continue
+            if tag not in tags_revs:
+                tags_revs[tag] = dict()
+            if path and not path.endswith(posixpath.sep):
+                # assume there are no empty directories in the tag
+                tags_revs[tag][path] = int(ent[0])
+        logger.debug('%s' % tags_revs)
+
         cmd = 'svn info %s' % trunk
         sc, out = Utils.getstatusoutput(cmd)
+        logger.debug('%s\n%s' % (cmd, out))
         if sc != 0:
             return None
-        p = r'last\s+changed\s+rev:\s+(?P<rev>\d+)'
+        p = r'repository\s+root:\s+(?P<root>%s://\S+)' % \
+            ('(?:' + '|'.join(map(re.escape, client_context.schemes)) + ')')
         m = re.search(p, out, re.I)
+        logger.debug('pattern: %r' % (p))
         if m:
-            class info(object): pass
-            info.last_changed_rev = int(m.group('rev'))
-            self.info_receiver(trunk, info, module)
-#            self.info_receiver(trunk, info, None)
-#             print >>sys.stderr, '%s: last_changed_rev %i' % \
-#                   (trunk, self.info.last_changed_rev)
-#            last_changed_rev = int(m.group('rev'))
+            root = m.group('root')
         else:
             return None
-
-        tags = posixpath.join(module.url, self.tags)
-#        tags = posixpath.normpath(posixpath.join(module.url, self.tags))
-        cmd = 'svn ls -v %s' % tags
+        logger.debug('root: %s' % root)
+        trunk_path = trunk[len(root):]
+        tags_path = tags[len(root):]
+        logger.debug('trunk_path: %s' % trunk_path)
+        logger.debug('tags_path: %s' % tags_path)
+        offset = len(trunk) - len(root) + len(posixpath.sep)
+        
+        # Usually, a tag is created as a server-side copy.
+        # Sometimes, a tag is created as a copy of WC (working copy)
+        # after commit.
+        # Below, we try to take into account the latter case.
+        cmd = 'svn log -v -q %s' % tags
         sc, out = Utils.getstatusoutput(cmd)
+        logger.debug('%s\n%s' % (cmd, out))
         if sc != 0:
             return None
-
-        tags_dirent = [line.split() for line in out.splitlines()]
-        rev_tag = dict([(int(line[0]), line[-1].rstrip(posixpath.sep)) for line in tags_dirent if line[-1].endswith(posixpath.sep)])
-        revs = rev_tag.keys()
-        revs.sort()
-        revs.reverse()
-
-        for rev in revs:
-            if rev < self.info.last_changed_rev: break
-#            if rev < last_changed_rev: break
-            tag = posixpath.join(tags, rev_tag[rev])
-#            tag = posixpath.normpath(posixpath.join(tags, rev_tag[rev]))
-            if 0 == self.cmp(trunk, tag, client_context):
-                return rev_tag[rev]
+        p = re.compile(
+            r'^-{5,}$\s^r\d+.+$\s^Changed paths:$\s^\s+A\s+%s%s(?P<tag>[^%s]+)\s+\(from %s:\d+\)$(?P<replaced>(?:\s^\s+(?:R|A|D)\s+%s%s(?P=tag)%s(?P<path>.+)(?:\s+\(from %s%s(?P=path):\d+\))?$)*)' % (re.escape(tags_path), posixpath.sep, posixpath.sep, re.escape(trunk_path), re.escape(tags_path), posixpath.sep, posixpath.sep, re.escape(trunk_path), posixpath.sep)
+            , re.M
+            )
+        tags_copied = list()
+        tags_replaced_revs = dict()
+        for m in p.finditer(out):
+            logger.debug('tag: %s replaced: %r' % (m.group('tag'), m.group('replaced')))
+            tags_copied.append(m.group('tag'))
+            for line in m.group('replaced').strip().splitlines():
+                l = line.split()
+                if len(l) == 2: continue # action code D - deleted paths
+                repl = l[3].rstrip(')')
+                i = repl.rindex(':')
+                path = repl[offset:i]
+                rev = int(repl[i + 1:])
+                logger.debug('path: %s rev: %d' % (path, rev))
+
+                if m.group('tag') not in tags_replaced_revs:
+                    tags_replaced_revs[m.group('tag')] = dict()
+                if path and not path.endswith(posixpath.sep):
+                    # assume there are no empty directories in the tag
+                    tags_replaced_revs[m.group('tag')][path] = rev
+
+        logger.debug('copied: %s' % tags_copied)
+        logger.debug('replaced: %s' % tags_replaced_revs)
+
+        for t in tags_revs.keys():
+            if t not in tags_copied:
+                del tags_revs[t]
+                logger.debug('%s: Not a trunk copy' % t)
+
+        for t in tags_replaced_revs:
+            if t in tags_revs:
+                tags_revs[t].update(tags_replaced_revs[t])
+                
+        for tag in tags_revs:
+            logger.debug('Compare: %s -> %s' % (tag, tags_revs[tag]))
+            if trunk_revs == tags_revs[tag]:
+                return tag
 
         return None
+
+#         tags_dirent = [line.split() for line in out.splitlines()]
+#         rev_tag = dict([(int(line[0]), line[-1].rstrip(posixpath.sep)) for line in tags_dirent if line[-1].endswith(posixpath.sep)])
+#         revs = rev_tag.keys()
+#         revs.sort()
+#         revs.reverse()
+
+#         for rev in revs:
+#             logger.debug('rev: %s' % rev)
+#             if rev < self.info.last_changed_rev: break
+# #            if rev < last_changed_rev: break
+#             tag = posixpath.join(tags, rev_tag[rev])
+# #            tag = posixpath.normpath(posixpath.join(tags, rev_tag[rev]))
+#             logger.debug('comparing: %s %s(%d)' % (trunk, tag, rev))
+#             if 0 == self.cmp(trunk, tag, client_context):
+#                 return rev_tag[rev]
+
+#         return None
 
 #         try:
@@ -496 +608 @@
             else:
                 m.URL = [posixpath.join(m.url, p, m.version)
-                         for p in (self.tags, self.branches)]
+                         for p in (self.tags, self.branches, self.devbranches)]
             m.URL = [client_context.svn_path_canonicalize(url) for url in m.URL]
 #            m.URL = [core.svn_path_canonicalize(url) for url in m.URL]
@@ -572 +684 @@
                                     "offset=", "no_config",
                                     "with_version_directory",
-                                    "without_version_directory", "url="])
+                                    "without_version_directory", "url=", "debug"])
     except getopt.error, e:
         print >>sys.stderr, '%s: %s' % (self, str(e))
         print >>sys.stderr, "Try '%s --help' for more information." % self
         return 1
+
+    global logger
+    logging.basicConfig()
+    logger = logging.getLogger(self)
+    logger.setLevel(logging.INFO)
+    if os.getenv('SVNDEBUG'):
+        logger.setLevel(logging.DEBUG)
 
     cmt_context = CmtContext()
@@ -605 +724 @@
         elif o in ("--url",):
             checkout.url = v
+        elif o in ("--debug",):
+            logger.setLevel(logging.DEBUG)
 
     if not args:

CMT/v1r25-branch/mgr/fragments/application

@@ -5 +5 @@
         $(link_silent) ${LINKMACRO} -o $(@).new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) && mv -f $(@).new $(@)
 
-ifdef use_stamps
+ifneq ($(strip $(use_stamps)),)
 # Work around Make errors if stamps files do not exist
 $(use_stamps) :

CMT/v1r25-branch/mgr/fragments/nmake/package

@@ -1 +1 @@
 
+cmt_${PACKAGE}_${ISINCLUDED} = 1
 cmt_${PACKAGE}_${ISLOCAL} = 1
 
@@ -6 +7 @@
 
 !if "$(LOG_LOCATION)" != ""
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
 ${PACKAGE}OutErr = >>$(LOG_LOCATION)\$(${PACKAGE}FullName)$(LOG_SUFFIX) 2>&1
@@ -11 +13 @@
 !if "$(BCAST_GLOBAL)" != ""
 ${PACKAGE}OutErr = >>$(LOG_LOCATION)\$(${PACKAGE}FullName)$(LOG_SUFFIX) 2>&1
+!endif
 !endif
 !endif
@@ -20 +23 @@
 ${PACKAGE} : $(${PACKAGE}MgrPath)\NMake
 !endif
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -73 +77 @@
 !endif
 !endif
+!else
+        
+!endif
 
 $(${PACKAGE}MgrPath)\NMake :
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         $(echo) configuring ${PACKAGE}
@@ -85 +93 @@
         
 !endif
+!endif
+!else
+        
 !endif
 
@@ -96 +107 @@
 
 ${PACKAGE}clean : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -125 +137 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE}binclean : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -156 +172 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE}uninstall : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -187 +207 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE}check : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -218 +242 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE} ${PACKAGE}clean ${PACKAGE}binclean ${PACKAGE}uninstall ${PACKAGE}check : FORCE

CMT/v1r25-branch/mgr/fragments/nmake/packages_header

@@ -27 +27 @@
 #    ignore: try all the groups even if one fails before going to the next package
 #            (may result in duplicated errors within a package)
-# Unix version taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified)
+# Unix version taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified by Grigory Rybkin)
 Package_failure_handler = || exit
 !if "$(PACKAGE_FAILURE_POLICY)" != ""

CMT/v1r25-branch/mgr/fragments/package

@@ -1 +1 @@
 
+cmt_${PACKAGE}_${ISINCLUDED} = 1
 cmt_${PACKAGE}_${ISLOCAL} = 1
 
@@ -6 +7 @@
 
 ifdef LOG_LOCATION
+ifdef cmt_${PACKAGE}_is_included
 ifdef cmt_${PACKAGE}_is_local
 ${PACKAGE}OutErr = >>$(LOG_LOCATION)/$(${PACKAGE}FullName)$(LOG_SUFFIX) 2>&1
@@ -11 +13 @@
 ifdef BCAST_GLOBAL
 ${PACKAGE}OutErr = >>$(LOG_LOCATION)/$(${PACKAGE}FullName)$(LOG_SUFFIX) 2>&1
+endif
 endif
 endif
@@ -20 +23 @@
 ${PACKAGE} : $(${PACKAGE}MgrPath)/Makefile
 endif
+ifdef cmt_${PACKAGE}_is_included
 ifdef cmt_${PACKAGE}_is_local
         @echo "#--------------------------------------------------------------" \
@@ -67 +71 @@
 endif
 endif
+else
+        
+endif
 
 $(${PACKAGE}MgrPath)/Makefile :
+ifdef cmt_${PACKAGE}_is_included
 ifdef cmt_${PACKAGE}_is_local
         $(echo) configuring ${PACKAGE}
@@ -80 +88 @@
 endif
 endif
+else
+        
+endif
 
 ifndef BCAST_ONLY
@@ -90 +101 @@
 
 ${PACKAGE}clean ${PACKAGE}binclean ${PACKAGE}uninstall ${PACKAGE}check : $(${PACKAGE}MgrPath)/Makefile
+ifdef cmt_${PACKAGE}_is_included
 ifdef cmt_${PACKAGE}_is_local
         @echo "#--------------------------------------------------------------" \
@@ -119 +131 @@
 endif
 endif
+else
+        
+endif
 
 ${PACKAGE} ${PACKAGE}clean ${PACKAGE}binclean ${PACKAGE}uninstall ${PACKAGE}check : FORCE

CMT/v1r25-branch/mgr/fragments/packages_header

@@ -42 +42 @@
 #    ignore: try all the groups even if one fails before going to the next package
 #            (may result in duplicated errors within a package)
-# Taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified)
+# Taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified by Grigory Rybkin)
 Package_failure_handler = || exit
 ifdef PACKAGE_FAILURE_POLICY

CMT/v1r25-branch/mgr/requirements

@@ -6 +6 @@
 tag CMTr16 CMTr14
 tag CMTr18 CMTr16
-tag CMTr0  CMTr18
-
+tag CMTr0  CMTr25
+
+tag CMTv0  CMTv1
 #
 #  Automatic detection of some system features.
@@ -125 +126 @@
              WIN32     "CMT\v"
 
-path_prepend PATH      "${CMTROOT}/${CMTBIN}" \
+path_append  PATH      "${CMTROOT}/${CMTBIN}" \
              WIN32     "%CMTROOT%\%CMTBIN%"