- Updates so that the new chatdemo repository can build from master.

- Moved various scripts to distribution.
- Fixes caused by the move.
- Fixed copyright headers.

1 files changed, 0 insertions, 400 deletions

diff --git a/FixUtil.py b/FixUtil.py
deleted file mode 100755
index ffe97a91cac..00000000000
--- a/FixUtil.py
+++ /dev/null
@@ -1,400 +0,0 @@
-#!/usr/bin/env python
-
-import os, sys, shutil, fnmatch, re, glob, getopt
-from stat import *
-
-def copyright(commentMark, product, license):
-    result = [ ]
-    result.append(commentMark + " **********************************************************************\n")
-    result.append(commentMark + "\n")
-    result.append(commentMark + " Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.\n")
-    result.append(commentMark + "\n")
-    line1 = commentMark + (" This copy of %s is licensed to you under the terms described in the") % product
-    line2 = commentMark
-    if len(line1) >= 72:
-        line2 = commentMark + line1[line1.rfind(" ", 0, 72):]
-        line1 = line1[:line1.rfind(" ", 0, 72)]
-    line2 += (" %s file included in this distribution.") % license
-    line3 = commentMark
-    if len(line2) >= 72:
-        line3 = commentMark + line2[line2.rfind(" ", 0, 72):]
-        line2 = line2[:line2.rfind(" ", 0, 72)]
-    result.append(line1 + "\n")
-    result.append(line2 + "\n")
-    if line3 != commentMark:
-        result.append(line3 + "\n")
-    result.append(commentMark + "\n")
-    result.append(commentMark + " **********************************************************************\n")
-    return result
-
-# **********************************************************************
-#
-# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLines):
-    oldFile = open(file, "r")
-    oldLines = oldFile.readlines()
-
-    done = 0
-    commentFound = 0
-    copyrightFound = 0
-
-    beforeCopyrightLines = []
-    oldCopyrightLines = []
-    newLines = []
-
-    justDone = 0
-    isWindowsEOL = False
-
-    if commentBegin == "":
-        for x in oldLines:
-            if not commentFound and (not x.startswith(commentMark) or x.startswith("#!/usr/bin/env")):
-                beforeCopyrightLines.append(x)
-            elif not done and x.startswith(commentMark):
-                commentFound = 1
-                if not copyrightFound and x.lower().find("copyright") != -1:
-                    copyrightFound = 1
-                    if x.endswith("\r\n"):
-                        isWindowsEOL = True
-                # skip this comment line 
-                oldCopyrightLines.append(x)            
-            else:
-                if not done:
-                    done = 1
-                    justDone = 1
-                
-                # Eliminate double blank lines after copyright (bug introduced by previous fixCopyright script)
-                if justDone == 1:
-                    newLines.append(x)
-                    if x != "\n":
-                        justDone = 0
-                    else:
-                        justDone = 2
-                elif justDone == 2:
-                    if x != "\n":
-                         newLines.append(x)
-                    justDone = 0                    
-                else:
-                    newLines.append(x)
-    else:
-         for x in oldLines:
-            if not done:
-                if x.startswith(commentBegin):
-                    commentFound = 1
-                if commentFound:
-                   if not copyrightFound and x.find("Copyright") != -1:
-                       copyrightFound = 1
-                       if x.endswith("\r\n"):
-                           isWindowsEOL = True
-
-                   # skip this comment line 
-                   if x.find(commentEnd) != -1:
-                       done = 1
-                       justDone = 1
-                else:
-                    beforeCopyrightLines.append(x)    
-            else:
-                # Eliminate double blank lines after copyright (bug introduced by previous fixCopyright script)
-                if justDone == 1:
-                    newLines.append(x)
-                    if x != "\n":
-                        justDone = 0
-                    else:
-                        justDone = 2
-                elif justDone == 2:
-                    if x != "\n":
-                         newLines.append(x)
-                    justDone = 0                    
-                else:
-                    newLines.append(x)
-
-
-    oldFile.close()
-
-    if copyrightFound and newCopyrightLines != oldCopyrightLines:
-
-        mode = os.stat(file)[ST_MODE]
-
-        #origFile = file + ".orig"
-        #shutil.copy2(file, origFile)
-
-        newFile = open(file, "w")
-        newFile.writelines(beforeCopyrightLines)
-        if isWindowsEOL:
-            newFile.writelines([l.replace('\n', '\r\n') for l in newCopyrightLines])
-        else:
-            newFile.writelines(newCopyrightLines)
-
-        #
-        # Hack to keep the .err files
-        #
-        if fnmatch.fnmatch(file, "*test/Slice/errorDetection/*.ice") > 0: 
-                newFile.write("\n")
-
-        newFile.writelines(newLines)
-        newFile.close()        
-
-        os.chmod(file, S_IMODE(mode))
-        print "------ Replaced copyright in " + file + " -------"
-
-    return copyrightFound
-
-#
-# Replace alls copyrights
-#
-def replaceAllCopyrights(path, product, license, recursive):
-
-    cppCopyright = copyright("//", product, license)
-    mcCopyright = copyright("; //", product, license)
-    makefileCopyright = copyright("#", product, license)
-    vbCopyright = copyright("'", product, license)
-    pythonCopyright = makefileCopyright
-    rubyCopyright = makefileCopyright
-    xmlCopyright = []
-    xmlCopyright.append("<!--\n");
-    xmlCopyright.extend(copyright("", product, license))
-    xmlCopyright.append("-->\n");
-    
-    files = os.listdir(path)
-    for x in files:
-        fullpath = os.path.join(path, x);
-        if os.path.isdir(fullpath) and not os.path.islink(fullpath):
-            if recursive:
-                replaceAllCopyrights(fullpath, product, license, True)
-        else:
-            
-            commentMark = ""
-            commentBegin = ""
-            commentEnd = ""
-            copyrightLines = []
-            skip = 0
-
-            if x == "config" or x == ".depend" or x == ".dummy" or fnmatch.fnmatch(x, "*.dsp")   or fnmatch.fnmatch(x, "*.sln") or fnmatch.fnmatch(x, "*.vdproj") or fnmatch.fnmatch(x, "*.err") or fnmatch.fnmatch(x, "*.class") or fnmatch.fnmatch(x, "*.ico") or fnmatch.fnmatch(x, "*.gif") or fnmatch.fnmatch(x, "*.jpg") or fnmatch.fnmatch(x, "*.orig"):
-                print "Skipping file " + fullpath + ": no copyright needed"
-                skip = 1  
-            elif fnmatch.fnmatch(x, "Make*") or fnmatch.fnmatch(x, "*.properties"):
-                commentMark = "#"
-                copyrightLines = makefileCopyright
-            elif fnmatch.fnmatch(x, "*.h") or fnmatch.fnmatch(x, "*.cpp") or fnmatch.fnmatch(x, "*.cs") or \
-                 fnmatch.fnmatch(x, "*.java") or fnmatch.fnmatch(x, "*.l") or fnmatch.fnmatch(x, "*.y") or \
-                 fnmatch.fnmatch(x, "*.m") or fnmatch.fnmatch(x, "*.mm"):
-                commentMark = "//"
-                copyrightLines = cppCopyright
-            elif fnmatch.fnmatch(x, "*.ice") and not fnmatch.fnmatch(x, "IllegalIdentifier.ice"):
-                commentMark = "//"
-                copyrightLines = cppCopyright
-            elif fnmatch.fnmatch(x, "*.py"):
-                commentMark = "#"
-                copyrightLines = pythonCopyright
-            elif fnmatch.fnmatch(x, "*.def"):
-                commentMark = "#"
-                copyrightLines = pythonCopyright
-            elif fnmatch.fnmatch(x, "*.cnf"):
-                commentMark = "#"
-                copyrightLines = pythonCopyright
-            elif fnmatch.fnmatch(x, "*.rb"):
-                commentMark = "#"
-                copyrightLines = rubyCopyright
-            elif fnmatch.fnmatch(x, "*.mc"):
-                commentMark = "; //"
-                copyrightLines = mcCopyright
-            elif fnmatch.fnmatch(x, "*.vb"):
-                commentMark = "'"
-                copyrightLines = vbCopyright
-            elif fnmatch.fnmatch(x, "*.xml") or fnmatch.fnmatch(x, "*.xaml"):
-                commentBegin = "<!--"
-                commentEnd = "-->"
-                copyrightLines = xmlCopyright
-            else:
-                print "***** Skipping file " + fullpath + ": unknown type" 
-                skip = 1
-
-            if not skip:
-                if replaceCopyright(fullpath, commentMark, commentBegin, commentEnd, copyrightLines) == 0:
-                    print "***** WARNING: Did not find copyright in " + fullpath                   
-
-#
-# Version patterns
-#
-vpatCheck = "[0-9]+\.[0-9]+(\.[0-9]+|b[0-9]*)$"
-vpatParse = "([0-9]+)\.([0-9]+)(\.[0-9]+|b[0-9]*)"
-vpatMatch = "([0-9]+\.[0-9]+(\.[0-9]+|b[0-9]*))"
-
-def commaVersion(version):
-    major = majorVersion(version)
-    minor = minorVersion(version)
-    patch = patchVersion(version)
-    return ("%s,%s,%s" % (major, minor, patch))
-
-def intVersion(version):
-    r = re.search(vpatParse, version)
-    major = int(r.group(1))
-    minor = int(r.group(2))
-    gr3 = r.group(3)
-    patch = -1
-    if gr3.startswith("."):
-        patch = int(gr3[1:])
-    else:
-        if len(gr3) > 1:
-            patch = 50 + int(gr3[1:])
-        else:
-            patch = 51
-    return ("%2d%02d%02d" % (major, minor, patch)).strip()        
-
-def betaVersion(version):
-    r = re.search(vpatParse, version)
-    if r.group(3).startswith("b"):
-        return "b"
-    else:
-        return ""
-
-def soVersion(version):
-    r = re.search(vpatParse, version)
-    major = int(r.group(1))
-    minor = int(r.group(2))
-    v = ("%d%d" % (major, minor)).strip()
-    if r.group(3).startswith("b"):
-        return v + "b"
-    else:
-        return v
-
-def majorVersion(version):
-    r = re.search(vpatParse, version)
-    major = int(r.group(1))
-    return ("%d" % (major)).strip()
-
-def minorVersion(version):
-    r = re.search(vpatParse, version)
-    minor = int(r.group(2))
-    return ("%d" % (minor)).strip()
-
-def shortVersion(version):
-    r = re.search(vpatParse, version)
-    major = int(r.group(1))
-    minor = int(r.group(2))
-    return ("%d.%d" % (major, minor)).strip()
-
-def patchVersion(version):
-    r = re.search(vpatParse, version)
-    
-    gr3 = r.group(3)
-    patch = -1
-    if gr3.startswith("."):
-        patch = int(gr3[1:])
-    else:
-        if len(gr3) > 1:
-            patch = 50 + int(gr3[1:])
-        else:
-            patch = 51
-
-    return ("%d" % (patch)).strip()
-
-#
-# Find files matching a pattern.
-#
-def find(path, patt):
-    result = [ ]
-    files = os.listdir(path)
-    for x in files:
-        fullpath = os.path.join(path, x);
-        if os.path.isdir(fullpath) and not os.path.islink(fullpath):
-            result.extend(find(fullpath, patt))
-        elif fnmatch.fnmatch(x, patt):
-            result.append(fullpath)
-    return result
-
-
-#
-# Replace a string matched by the first group of regular expression.
-#
-# For example: the regular expression "ICE_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\""
-# will match the string version in "ICE_STRING_VERSION "2.1.0"" and will replace it with
-# the given version.
-#
-def fileMatchAndReplace(filename, matchAndReplaceExps, warn=True):
-
-    mode = os.stat(filename).st_mode
-    oldConfigFile = open(filename, "r")
-    newConfigFile = open(filename + ".new", "w")
-
-    #
-    # Compile the regular expressions
-    #
-    regexps = [ ]
-    for (regexp, replace) in matchAndReplaceExps:
-        regexps.append((re.compile(regexp), replace))
-
-    #
-    # Search for the line with the given regular expressions and
-    # replace the matching string
-    #
-    updated = False
-    for line in oldConfigFile.readlines():
-        for (regexp, replace) in regexps:
-            match = regexp.search(line)
-            if match != None:
-                oldLine = line
-                line = oldLine.replace(match.group(1), replace)
-#                print oldLine + line
-                updated = True
-                break
-        newConfigFile.write(line)
-
-    newConfigFile.close()
-    oldConfigFile.close()
-
-    if updated:
-        print "updated " + filename
-        os.rename(filename + ".new", filename)
-        os.chmod(filename, S_IMODE(mode))
-    elif warn:
-        print "warning: " + filename + " didn't contain any version"
-        os.unlink(filename + ".new")
-
-#
-# Replace all occurences of a regular expression in a file
-#
-def fileMatchAllAndReplace(filename, matchAndReplaceExps):
-
-    oldFile = open(filename, "r")
-    newFile = open(filename + ".new", "w")
-
-    #
-    # Compile the regular expressions
-    #
-    regexps = [ ]
-    for (regexp, replace) in matchAndReplaceExps:
-        regexps.append((re.compile(regexp), replace))
-
-    #
-    # Search for all lines with the given regular expressions and
-    # replace the matching string
-    #
-    updated = False
-    for line in oldFile.readlines():
-        for (regexp, replace) in regexps:
-            match = regexp.search(line)
-            if match != None:
-                oldLine = line
-                line = oldLine.replace(match.group(1), replace)
-                updated = True
-        newFile.write(line)
-
-    newFile.close()
-    oldFile.close()
-
-    if updated:
-        print "updated " + filename
-        os.rename(filename + ".new", filename)
-    else:
-        print "warning: " + filename + " didn't contain any version"
-        os.unlink(filename + ".new")
-
-def checkVersion(version):
-    if not re.match(vpatCheck, version):
-        print "invalid version number: " + version + " (it should have the form 3.2.1 or 3.2b or 3.2b2)"
-        sys.exit(0)