diff options
Diffstat (limited to 'cpp/install/common/makewindist.py')
| -rwxr-xr-x | cpp/install/common/makewindist.py | 892 |
1 files changed, 446 insertions, 446 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index c37757baa7d..b711d68d45d 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -23,21 +23,21 @@ ExpatVer = '2.0.0' DBVer = '4.5.20' DistPrefixes = ["Ice-%s", "IceJ-%s-java2", "IceJ-%s-java5", "IceCS-%s", "IcePy-%s", "IcePHP-%s", "IceVB-%s", - "IceRuby-%s"] + "IceRuby-%s"] class DistEnvironmentError: def __init__(self, msg = None): - self.msg = msg + self.msg = msg def __str__(self): - return repr(self.msg) + return repr(self.msg) class ExtProgramError: def __init__(self, msg): - self.msg = msg + self.msg = msg def __str__(self): - return repr(self.msg) + return repr(self.msg) def prependEnvPath(name, path): """Prepend a path to an existing environment variable.""" @@ -47,17 +47,17 @@ def prependEnvPath(name, path): def prependEnvPathList(name, list): """Prepend a list of paths to an existing environment variable.""" for path in list: - prependEnvPath(name, path) + prependEnvPath(name, path) def runprog(command, haltOnError = True): logging.debug('Running external command: %s' % command) result = os.system(command) if not result == 0: - msg = 'Command %s failed with error code %d' % (command, result) - if haltOnError: - raise ExtProgramError('Command %s failed with error code %d' % (command, result)) - else: - logging.error(msg) + msg = 'Command %s failed with error code %d' % (command, result) + if haltOnError: + raise ExtProgramError('Command %s failed with error code %d' % (command, result)) + else: + logging.error(msg) def usage(): """Print usage/help information""" @@ -68,57 +68,57 @@ def usage(): print " --skip-build Do not build any sources." print " --clean Clean compiled or staged files." print " --skip-installer Do not build any installers or merge modules." - print "-i, --info Log information messages" - print "-d, --debug Log debug messages" - print "-l, --logfile Specify the destination log file" + print "-i, --info Log information messages" + print "-d, --debug Log debug messages" + print "-l, --logfile Specify the destination log file" def environmentCheck(target): """Warning: uses global environment.""" required = ["SOURCES", "BUILD_DIR", "DB_HOME", "BZIP2_HOME", "EXPAT_HOME", "OPENSSL_HOME"] if target == "vc60": - required.append("STLPORT_HOME") + required.append("STLPORT_HOME") elif target == "vc80": - required.extend(["PHP_BIN_HOME", "PHP_SRC_HOME", "PYTHON_HOME"]) + required.extend(["PHP_BIN_HOME", "PHP_SRC_HOME", "PYTHON_HOME"]) fail = False for f in required: - if not os.environ.has_key(f): - logging.error("Environment variable %s is missing" % f) - fail = True - continue + if not os.environ.has_key(f): + logging.error("Environment variable %s is missing" % f) + fail = True + continue - if not os.path.isdir(os.environ[f]): - logging.error("Value %s for env var %s is not a valid directory." % (os.environ[f], f)) - fail = True - continue + if not os.path.isdir(os.environ[f]): + logging.error("Value %s for env var %s is not a valid directory." % (os.environ[f], f)) + fail = True + continue if fail: - logging.error("Invalid environment. Please consult error log and repair environment/command line settings.") - sys.exit(2) + logging.error("Invalid environment. Please consult error log and repair environment/command line settings.") + sys.exit(2) def maxVersion(a, b): """Compares to version strings. The version strings should be trimmed of leading and trailing whitespace.""" if a == b: - return a + return a avalues = a.split('.') bvalues = b.split('.') diff = len(avalues) - len(bvalues) if not diff == 0: - if diff < 0: - for f in range(0, abs(diff)): - avalues.append('0') - else: - for f in range(0, abs(diff)): - bvalues.append('0') + if diff < 0: + for f in range(0, abs(diff)): + avalues.append('0') + else: + for f in range(0, abs(diff)): + bvalues.append('0') for i in range(0, len(avalues)): - if int(avalues[i]) > int(bvalues[i]): - return a - elif int(avalues[i]) < int(bvalues[i]): - return b + if int(avalues[i]) > int(bvalues[i]): + return a + elif int(avalues[i]) < int(bvalues[i]): + return b return a @@ -127,10 +127,10 @@ def testMaxVersion(): cases = [ ("1.0", "1.0.0", "1.0"), ("0.0", "0.1", "0.1"), ("2.1.0", "2.0.1", "2.1.0"), ("2.1", "2.0.1", "2.1"), ("2.1.9", "2.1.12", "2.1.12")] for a, b, expected in cases: - result = maxVersion(a, b) - if not expected == result: - print "Expected %s from %s and %s, got %s" % (expected, a, b, result) - assert(False) + result = maxVersion(a, b) + if not expected == result: + print "Expected %s from %s and %s, got %s" % (expected, a, b, result) + assert(False) print "testMaxVersion() succeeded" def checkSources(sourceDir): @@ -138,29 +138,29 @@ def checkSources(sourceDir): icezip = glob.glob(os.path.join(sourceDir, "Ice-*.zip")) if len(icezip) == 0: - msg = "Source directory %s does not contain a zip archive for any version of Ice for C++" % sourceDir - logging.error(msg) - raise DistEnvironmentError(msg) + msg = "Source directory %s does not contain a zip archive for any version of Ice for C++" % sourceDir + logging.error(msg) + raise DistEnvironmentError(msg) keyVersion = '0.0.0' exp = re.compile("Ice-([0-9.]*).*.zip") current = None for d in icezip: - m = exp.match(os.path.split(d)[1]) - if m == None: - print icezip - current = m.group(1) - keyVersion = maxVersion(keyVersion, current) + m = exp.match(os.path.split(d)[1]) + if m == None: + print icezip + current = m.group(1) + keyVersion = maxVersion(keyVersion, current) print keyVersion prefixes = list(DistPrefixes) prefixes.remove("Ice-%s") for prefix in prefixes: - pkg = prefix % keyVersion + ".zip" - if not os.path.exists(os.path.join(sourceDir, pkg)): - msg = "Source directory %s does not contain archive for %s." % (sourceDir, pkg) - logging.error(msg) - raise DistEnvironmentError(msg) + pkg = prefix % keyVersion + ".zip" + if not os.path.exists(os.path.join(sourceDir, pkg)): + msg = "Source directory %s does not contain archive for %s." % (sourceDir, pkg) + logging.error(msg) + raise DistEnvironmentError(msg) return keyVersion @@ -168,14 +168,14 @@ def setMakefileOption(filename, optionName, value): optre = re.compile("^\#?\s*?%s\s*?=.*" % optionName) optionString = "no" if value: - optionString = "yes" + optionString = "yes" f = fileinput.input(filename, True) for line in f: - l = line.rstrip('\n') - if optre.search(l): + l = line.rstrip('\n') + if optre.search(l): print "%s = %s" % (optionName, optionString) - else: - print l + else: + print l f.close() def setOptimize(filename, optimizeOn): @@ -192,35 +192,35 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # building Ice for C++. # path = [ - os.path.join(stageDir, "berkeley", "dev", "bin"), - os.path.join(stageDir, "berkeley", "runtime", "bin"), - os.path.join(stageDir, "berkeley", "java", "bin"), - os.path.join(stageDir, "expat", "runtime", "bin"), - os.path.join(stageDir, "openssl", "runtime", "bin") + os.path.join(stageDir, "berkeley", "dev", "bin"), + os.path.join(stageDir, "berkeley", "runtime", "bin"), + os.path.join(stageDir, "berkeley", "java", "bin"), + os.path.join(stageDir, "expat", "runtime", "bin"), + os.path.join(stageDir, "openssl", "runtime", "bin") ] if installVersion == "vc60": - path.append(os.path.join(stageDir, "stlport", "dev", "bin")) - path.append(os.path.join(stageDir, "stlport", "runtime", "bin")) + path.append(os.path.join(stageDir, "stlport", "dev", "bin")) + path.append(os.path.join(stageDir, "stlport", "runtime", "bin")) prependEnvPathList('PATH', path) lib = [ - os.path.join(stageDir, "berkeley", "dev", "lib"), - os.path.join(stageDir, "bzip2", "dev", "lib"), - os.path.join(stageDir, "expat", "dev", "lib"), - os.path.join(stageDir, "openssl", "dev", "lib"), + os.path.join(stageDir, "berkeley", "dev", "lib"), + os.path.join(stageDir, "bzip2", "dev", "lib"), + os.path.join(stageDir, "expat", "dev", "lib"), + os.path.join(stageDir, "openssl", "dev", "lib"), ] if installVersion == "vc60": - lib.append(os.path.join(stageDir, "stlport", "dev", "lib")) + lib.append(os.path.join(stageDir, "stlport", "dev", "lib")) prependEnvPathList('LIB', lib) include = [ - os.path.join(stageDir, "berkeley", "dev", "include"), - os.path.join(stageDir, "bzip2", "dev", "include"), - os.path.join(stageDir, "expat", "dev", "include"), - os.path.join(stageDir, "openssl", "dev", "include"), + os.path.join(stageDir, "berkeley", "dev", "include"), + os.path.join(stageDir, "bzip2", "dev", "include"), + os.path.join(stageDir, "expat", "dev", "include"), + os.path.join(stageDir, "openssl", "dev", "include"), ] if installVersion == "vc60": - include.append(os.path.join(stageDir, "stlport", "dev", "include", "stlport")) + include.append(os.path.join(stageDir, "stlport", "dev", "include", "stlport")) prependEnvPathList('INCLUDE', include) # @@ -244,60 +244,60 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): runprog("nmake /f Makefile.mak") if installVersion in ["vc80"]: - # - # Ice for C# - # - os.chdir(os.path.join(sourcesDir, "debug", "IceCS-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." + # + # Ice for C# + # + os.chdir(os.path.join(sourcesDir, "debug", "IceCS-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False) setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - runprog("nmake /f Makefile.mak") + runprog("nmake /f Makefile.mak") - # - # Ice for Visual Basic - # - os.chdir(os.path.join(sourcesDir, "debug", "IceVB-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." + # + # Ice for Visual Basic + # + os.chdir(os.path.join(sourcesDir, "debug", "IceVB-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False) - f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - for l in f: - i = l.find("icecs") - if i <> -1: - print l.rstrip('\n').replace("icecs", "IceCS-%s" % sourcesVersion) - else: - print l.rstrip('\n') - - f.close() - - runprog("nmake /f Makefile.mak") - - # - # Ice for C# - # - os.chdir(os.path.join(sourcesDir, "release", "IceCS-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." + f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) + for l in f: + i = l.find("icecs") + if i <> -1: + print l.rstrip('\n').replace("icecs", "IceCS-%s" % sourcesVersion) + else: + print l.rstrip('\n') + + f.close() + + runprog("nmake /f Makefile.mak") + + # + # Ice for C# + # + os.chdir(os.path.join(sourcesDir, "release", "IceCS-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False) - runprog("nmake /f Makefile.mak") + runprog("nmake /f Makefile.mak") - # - # Ice for Visual Basic - # - os.chdir(os.path.join(sourcesDir, "release", "IceVB-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." + # + # Ice for Visual Basic + # + os.chdir(os.path.join(sourcesDir, "release", "IceVB-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - for l in f: - i = l.find("icecs") - if i <> -1: - print l.rstrip('\n').replace("icecs", "IceCS-%s" % sourcesVersion) - else: - print l.rstrip('\n') + f = fileinput.input(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) + for l in f: + i = l.find("icecs") + if i <> -1: + print l.rstrip('\n').replace("icecs", "IceCS-%s" % sourcesVersion) + else: + print l.rstrip('\n') - f.close() + f.close() - runprog("nmake /f Makefile.mak") + runprog("nmake /f Makefile.mak") # @@ -318,61 +318,61 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): runprog("nmake /f Makefile.mak") if installVersion == "vc71": - # - # Ice for Python - # - pythonHome = os.environ['PYTHON_HOME'] - prependEnvPath('LIB', os.path.join(pythonHome, "libs")) - prependEnvPath('INCLUDE', os.path.join(pythonHome, "include")) - - os.chdir(os.path.join(sourcesDir, "release", "IcePy-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." + # + # Ice for Python + # + pythonHome = os.environ['PYTHON_HOME'] + prependEnvPath('LIB', os.path.join(pythonHome, "libs")) + prependEnvPath('INCLUDE', os.path.join(pythonHome, "include")) + + os.chdir(os.path.join(sourcesDir, "release", "IcePy-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - runprog("nmake /f Makefile.mak") + runprog("nmake /f Makefile.mak") if installVersion == "vc60": - # - # Ice for C++ - # - os.chdir(os.path.join(sourcesDir, "release", "Ice-" + sourcesVersion)) + # + # Ice for C++ + # + os.chdir(os.path.join(sourcesDir, "release", "Ice-" + sourcesVersion)) setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - print "Building in " + os.getcwd() + "..." - runprog("nmake /f Makefile.mak") - # - # Ice for PHP - # - phpBinHome = os.environ['PHP_BIN_HOME'] - phpLib = [ - os.path.join(phpBinHome, "lib"), - os.path.join(phpBinHome, "dev") - ] - prependEnvPathList('LIB', phpLib) - - phpSrcHome = os.environ['PHP_SRC_HOME'] - phpInc = [ - phpSrcHome, - os.path.join(phpSrcHome, "main"), - os.path.join(phpSrcHome, "Zend"), - os.path.join(phpSrcHome, "TSRM") - ] - prependEnvPathList('INCLUDE', phpInc) - - os.chdir(os.path.join(sourcesDir, "release", "IcePHP-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." + print "Building in " + os.getcwd() + "..." + runprog("nmake /f Makefile.mak") + # + # Ice for PHP + # + phpBinHome = os.environ['PHP_BIN_HOME'] + phpLib = [ + os.path.join(phpBinHome, "lib"), + os.path.join(phpBinHome, "dev") + ] + prependEnvPathList('LIB', phpLib) + + phpSrcHome = os.environ['PHP_SRC_HOME'] + phpInc = [ + phpSrcHome, + os.path.join(phpSrcHome, "main"), + os.path.join(phpSrcHome, "Zend"), + os.path.join(phpSrcHome, "TSRM") + ] + prependEnvPathList('INCLUDE', phpInc) + + os.chdir(os.path.join(sourcesDir, "release", "IcePHP-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - runprog("nmake /f Makefile.mak") - os.chdir(os.path.join(sourcesDir, "release", "IceRuby-%s" % sourcesVersion)) - setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - print "Building in " + os.getcwd() + "..." - runprog("nmake /f Makefile.mak") + runprog("nmake /f Makefile.mak") + os.chdir(os.path.join(sourcesDir, "release", "IceRuby-%s" % sourcesVersion)) + setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) + print "Building in " + os.getcwd() + "..." + runprog("nmake /f Makefile.mak") def list2english(l): if len(l) == 1: - return l[0] + return l[0] elif len(l) == 2: - return l[0] + " and " + list2english(l[1:]) + return l[0] + " and " + list2english(l[1:]) else: - return l[0] + ", " + list2english(l[1:]) + return l[0] + ", " + list2english(l[1:]) def convertLicensesToRTF(toolDir, installTarget): openssl = (os.path.join(os.environ["OPENSSL_HOME"], "LICENSE"), "OpenSSL", "OPENSSL_LICENSE.rtf") @@ -392,15 +392,15 @@ def convertLicensesToRTF(toolDir, installTarget): collection = core jgoodies =[(os.path.join(os.environ["JGOODIES_FORMS"], "license.txt"), "JGoodies Forms", - "JGOODIES_FORMS_LICENSE.rtf"), - (os.path.join(os.environ["JGOODIES_LOOKS"], "license.txt"), "JGoodies Looks", - "JGOODIES_LOOKS_LICENSE.rtf")] + "JGOODIES_FORMS_LICENSE.rtf"), + (os.path.join(os.environ["JGOODIES_LOOKS"], "license.txt"), "JGoodies Looks", + "JGOODIES_LOOKS_LICENSE.rtf")] if installTarget == "vc60": - collection.append((os.path.join(os.environ["STLPORT_HOME"], "doc", "license.html"), - "STLport", "STLPORT_LICENSE.rtf")) - collection.extend(jgoodies) + collection.append((os.path.join(os.environ["STLPORT_HOME"], "doc", "license.html"), + "STLport", "STLPORT_LICENSE.rtf")) + collection.extend(jgoodies) elif installTarget in ["vc71", "vc80", "vc80_x64"]: - collection.extend(jgoodies) + collection.extend(jgoodies) third_party_sources_file_hdr = """Source Code ----------- @@ -408,12 +408,12 @@ def convertLicensesToRTF(toolDir, installTarget): """ if not os.path.exists(os.path.join(toolDir, "docs")): - os.mkdir(os.path.join(toolDir, "docs")) + os.mkdir(os.path.join(toolDir, "docs")) if not os.path.exists(os.path.join(toolDir, "docs", installTarget)): - os.mkdir(os.path.join(toolDir, "docs", installTarget)) + os.mkdir(os.path.join(toolDir, "docs", installTarget)) names = [] for e in collection: - names.append(e[1]) + names.append(e[1]) text = "The source distributions of " + list2english(names) text = text + " used to build this distribution can be downloaded at no cost from http://www.zeroc.com/download.html." @@ -432,41 +432,41 @@ def convertLicensesToRTF(toolDir, installTarget): # SOURCES is used by the third party installer. # shutil.copy(os.path.join(toolDir, "docs", installTarget, "THIRD_PARTY_SOURCES"), - os.path.join(toolDir, "docs", installTarget, "SOURCES")) + os.path.join(toolDir, "docs", installTarget, "SOURCES")) licensefile = file(os.path.join(toolDir, "docs", installTarget, "LICENSE"), "w") for f in collection: - contents = None - if f[0].endswith(".html"): - # - # Here's me wishing the Python standard library had a class - # for converting HTML to plain text. In the meantime, we'll - # have to leverage 'links' in cygwin. - # - pipe_stdin, pipe_stdout = os.popen2("cygpath %s" % f[0]) - lines = pipe_stdout.readlines() - pipe_stdin.close() - pipe_stdout.close() - cygname = lines[0].strip() - pipe_stdin, pipe_stdout = os.popen2("links -dump %s" % cygname) - lines = pipe_stdout.readlines() - contents = lines[2:] - else: - contents = file(f[0]).readlines() - hdr = section_header % f[1] - - licensefile.write(hdr) - licensefile.write(line_string[:len(hdr)] + "\n\n") - licensefile.writelines(contents) - licensefile.write("\n\n") - rtffile = file(os.path.join(toolDir, "docs", installTarget, os.path.basename(f[2])), "w") - rtffile.writelines(rtfhdr) - rtffile.write(hdr + "\\par") - rtffile.write(line_string[:len(hdr)] + "\\par\n") - for l in contents: - rtffile.write(l.rstrip("\n") + "\\par\n") - rtffile.writelines(rtfftr) - rtffile.close() + contents = None + if f[0].endswith(".html"): + # + # Here's me wishing the Python standard library had a class + # for converting HTML to plain text. In the meantime, we'll + # have to leverage 'links' in cygwin. + # + pipe_stdin, pipe_stdout = os.popen2("cygpath %s" % f[0]) + lines = pipe_stdout.readlines() + pipe_stdin.close() + pipe_stdout.close() + cygname = lines[0].strip() + pipe_stdin, pipe_stdout = os.popen2("links -dump %s" % cygname) + lines = pipe_stdout.readlines() + contents = lines[2:] + else: + contents = file(f[0]).readlines() + hdr = section_header % f[1] + + licensefile.write(hdr) + licensefile.write(line_string[:len(hdr)] + "\n\n") + licensefile.writelines(contents) + licensefile.write("\n\n") + rtffile = file(os.path.join(toolDir, "docs", installTarget, os.path.basename(f[2])), "w") + rtffile.writelines(rtfhdr) + rtffile.write(hdr + "\\par") + rtffile.write(line_string[:len(hdr)] + "\\par\n") + for l in contents: + rtffile.write(l.rstrip("\n") + "\\par\n") + rtffile.writelines(rtfftr) + rtffile.close() # # Technically, the JGoodies stuff isn't part of the Ice 6.0.0 target @@ -474,58 +474,58 @@ def convertLicensesToRTF(toolDir, installTarget): # IceJ builders. # if installTarget == "vc60": - for f in jgoodies: - contents = file(f[0]).readlines() - hdr = section_header % f[1] - rtffile = file(os.path.join(toolDir, "docs", installTarget, os.path.basename(f[2])), "w") - rtffile.writelines(rtfhdr) - rtffile.write(hdr + "\\par") - rtffile.write(line_string[:len(hdr)] + "\\par\n") - for l in contents: - rtffile.write(l.rstrip("\n") + "\\par\n") - rtffile.writelines(rtfftr) - rtffile.close() + for f in jgoodies: + contents = file(f[0]).readlines() + hdr = section_header % f[1] + rtffile = file(os.path.join(toolDir, "docs", installTarget, os.path.basename(f[2])), "w") + rtffile.writelines(rtfhdr) + rtffile.write(hdr + "\\par") + rtffile.write(line_string[:len(hdr)] + "\\par\n") + for l in contents: + rtffile.write(l.rstrip("\n") + "\\par\n") + rtffile.writelines(rtfftr) + rtffile.close() licensefile.close() shutil.copyfile(os.path.join(toolDir, "docs", installTarget, "LICENSE"), \ - os.path.join(toolDir, "docs", installTarget, "THIRD_PARTY_LICENSE")) + os.path.join(toolDir, "docs", installTarget, "THIRD_PARTY_LICENSE")) lines = file(os.path.join(toolDir, "docs", installTarget, "LICENSE")).readlines() rtflicense = file(os.path.join(toolDir, "docs", installTarget, "LICENSE.rtf"), "w") rtflicense.writelines(rtfhdr) for l in lines: - rtflicense.write(l.rstrip("\n") + "\\par\n") + rtflicense.write(l.rstrip("\n") + "\\par\n") rtflicense.writelines(rtfftr) rtflicense.close() def buildMergeModules(startDir, stageDir, sourcesVersion, installVersion): """Build third party merge modules.""" modules = [ - ("BerkeleyDBDevKit", "BERKELEYDB_DEV_KIT"), - ("BerkeleyDBRuntime", "BERKELEYDB_RUNTIME"), - ("BZip2DevKit", "BZIP2_DEV_KIT"), - ("BZip2Runtime", "BZIP2_RUNTIME"), - ("ExpatDevKit", "EXPAT_DEV_KIT"), - ("ExpatRuntime", "EXPAT_RUNTIME"), - ("OpenSSLDevKit", "OPENSSL_DEV_KIT"), - ("OpenSSLRuntime", "OPENSSL_RUNTIME"), - ("JGoodies", "JGOODIES_RUNTIME"), - ("BerkeleyDBJava", "BERKELEYDB_JAVA") + ("BerkeleyDBDevKit", "BERKELEYDB_DEV_KIT"), + ("BerkeleyDBRuntime", "BERKELEYDB_RUNTIME"), + ("BZip2DevKit", "BZIP2_DEV_KIT"), + ("BZip2Runtime", "BZIP2_RUNTIME"), + ("ExpatDevKit", "EXPAT_DEV_KIT"), + ("ExpatRuntime", "EXPAT_RUNTIME"), + ("OpenSSLDevKit", "OPENSSL_DEV_KIT"), + ("OpenSSLRuntime", "OPENSSL_RUNTIME"), + ("JGoodies", "JGOODIES_RUNTIME"), + ("BerkeleyDBJava", "BERKELEYDB_JAVA") ] if installVersion == "vc60": - extras = [ ("STLPortDevKit", "STLPORT_DEV_KIT"), ("STLPortRuntime", "STLPORT_RUNTIME") ] - modules.extend(extras) + extras = [ ("STLPortDevKit", "STLPORT_DEV_KIT"), ("STLPortRuntime", "STLPORT_RUNTIME") ] + modules.extend(extras) # # Build modules. # os.chdir(startDir) for project, release in modules: - # - # The -w -x flags indicate that the build should stop on any - # warning or error. This is preferable since it catches staging - # errors and forces us to keep our projects clean. - # - runprog(os.environ['INSTALLSHIELD_HOME'] + "\IsCmdBld -x -w -c COMP -a ZEROC -p " + project + ".ism -r " + release) + # + # The -w -x flags indicate that the build should stop on any + # warning or error. This is preferable since it catches staging + # errors and forces us to keep our projects clean. + # + runprog(os.environ['INSTALLSHIELD_HOME'] + "\IsCmdBld -x -w -c COMP -a ZEROC -p " + project + ".ism -r " + release) # # Archive modules in the stage directory root. @@ -539,38 +539,38 @@ def buildMergeModules(startDir, stageDir, sourcesVersion, installVersion): zipPath = "ThirdPartyMergeModules-" + sourcesVersion + "-" + installVersion.upper() + ".zip" zip = zipfile.ZipFile(os.path.join(stageDir, zipPath), 'w') for project, release in modules: - msm = project + "." + installVersion.upper() + ".msm" - msmPath = os.path.join(os.getcwd(), project, "ZEROC", release, "DiskImages/DISK1", msm) - zip.write(msmPath, os.path.basename(msmPath)) + msm = project + "." + installVersion.upper() + ".msm" + msmPath = os.path.join(os.getcwd(), project, "ZEROC", release, "DiskImages/DISK1", msm) + zip.write(msmPath, os.path.basename(msmPath)) zip.close() def buildInstallers(startDir, stageDir, sourcesVersion, installVersion, installers): if installVersion == "vc80_x64": - installVersion = "VC80-x64" + installVersion = "VC80-x64" else: - installVersion = installVersion.upper() + installVersion = installVersion.upper() # # Build and copy to the stage directory root. # os.chdir(startDir) for project, release in installers: - runprog(os.environ['INSTALLSHIELD_HOME'] + "\ISCmdBld -x -w -c COMP -a ZEROC -p " + project + ".ism -r " + release) - msi = project + "-" + sourcesVersion + "-" + installVersion + ".msi" - msiPath = os.path.join(os.getcwd(), project, "ZEROC", release, "DiskImages/DISK1", msi) - shutil.copy(msiPath, stageDir) + runprog(os.environ['INSTALLSHIELD_HOME'] + "\ISCmdBld -x -w -c COMP -a ZEROC -p " + project + ".ism -r " + release) + msi = project + "-" + sourcesVersion + "-" + installVersion + ".msi" + msiPath = os.path.join(os.getcwd(), project, "ZEROC", release, "DiskImages/DISK1", msi) + shutil.copy(msiPath, stageDir) def environToString(tbl): '''Convert an environment hashtable to the typical k=v format''' ofile = cStringIO.StringIO() result = '' try: - for k, v in tbl.iteritems(): - ofile.write('%s=%s\n' % (k, v)) - result = ofile.getvalue() - finally: - ofile.close() + for k, v in tbl.iteritems(): + ofile.write('%s=%s\n' % (k, v)) + result = ofile.getvalue() + finally: + ofile.close() return result def main(): @@ -590,207 +590,207 @@ def main(): os.environ['INSTALL_TOOLS'] = installDir try: - # - # Process args. - # - try: - optionList, args = getopt.getopt( - sys.argv[1:], "dhil:", [ "help", "clean", "skip-build", "skip-installer", "info", "debug", - "logfile", "vc60", "vc71", "vc80", "vc80_x64", "sslhome=", "expathome=", "dbhome=", "stlporthome=", - "bzip2home=", "thirdparty="]) - except getopt.GetoptError: - usage() - sys.exit(2) - - # - # Set a few defaults. - # - clean = False - build = True - installer = True - debugLevel = logging.NOTSET - logFile = None - target = None - - for o, a in optionList: - if o in ("-h", "--help"): - usage() - sys.exit() - elif o == "--clean": - clean = True - elif o == "--skip-build": - build = False - elif o == "--skip-installer": - installer = False - elif o in ('-l', '--logfile'): - logFile = a - elif o in ('-d', '--debug'): - debugLevel = logging.DEBUG - elif o in ('-', '--info'): - debugLevel = logging.INFO - elif o == '--vc60': - target = 'vc60' - elif o == '--vc71': - target = 'vc71' - elif o == '--vc80': - target = 'vc80' - elif o == '--vc80_x64': - target = 'vc80_x64' - elif o == '--sources': - os.environ['SOURCES'] = a - elif o == '--buildDir': - os.environ['BUILD_DIR'] = a - elif o == '--sslhome': - os.environ['OPENSSL_HOME'] = a - elif o == '--expathome': - os.environ['EXPAT_HOME'] = a - elif o == '--dbhome': - os.environ['DB_HOME'] = a - elif o == '--stlporthome': - os.environ['STLPORT_HOME'] = a - elif o == '--bzip2home': - os.environ['BZIP2_HOME'] = a - elif o == '--thirdparty': - os.environ['OPENSSL_HOME'] = os.path.join(a, 'openssl-%s' % OpenSSLVer) - os.environ['BZIP2_HOME'] = os.path.join(a, 'bzip2-%s' % Bzip2Ver) - os.environ['EXPAT_HOME'] = os.path.join(a, 'expat-%s' % ExpatVer) - os.environ['DB_HOME'] = os.path.join(a, 'db-%s' % DBVer) - os.environ['STLPORT_HOME'] = os.path.join(a, 'STLPort-%s' % STLPortVer) - - if debugLevel != logging.NOTSET: - if a != None: - logging.basicConfig(level = debugLevel, format='%(asctime)s %(levelname)s %(message)s', filename = a) - else: - logging.basicConfig(level = debugLevel, format='%(asctime)s %(levelname)s %(message)s') - - if target == None: - print 'The development target must be specified' - sys.exit(2) - - os.environ['target'] = target - - # - # Where all the files will be staged so that the install projects - # can find them. - # - targetDir = os.path.join(installDir, target) - stageDir = os.path.join(targetDir, "install") - - logging.info("Install Tool: " + installDir) - logging.info("Target Directory: " + targetDir) - logging.info("Stage Directory: " + stageDir) - - if clean: - print('You have indicated you want to ''clean'' files, starting from scratch.') - confirm = '' - while not confirm in ['y', 'n']: - confirm = raw_input('Are you sure? [y/N]') - if confirm == '': - confirm = 'n' - if confirm == 'n': - sys.exit() - else: - logging.info('Deleting intermediate files and rebuilding from scratch!') - - logging.info('Starting windows installer creation.') - - environmentCheck(target) - - buildDir = os.environ['BUILD_DIR'] - - logging.debug(environToString(os.environ)) - - sourcesVersion = checkSources(os.environ['SOURCES']) - - defaults = os.environ - defaults['dbver'] = '45' - defaults['version'] = sourcesVersion - defaults['dllversion'] = sourcesVersion.replace('.', '')[:2] - - if target == "vc80_x64": - defaults['OutDir'] = "x64/" - else: - defaults['OutDir'] = '' - - if os.path.exists(stageDir): - try: - shutil.rmtree(stageDir) - except IOError: - print """ + # + # Process args. + # + try: + optionList, args = getopt.getopt( + sys.argv[1:], "dhil:", [ "help", "clean", "skip-build", "skip-installer", "info", "debug", + "logfile", "vc60", "vc71", "vc80", "vc80_x64", "sslhome=", "expathome=", "dbhome=", "stlporthome=", + "bzip2home=", "thirdparty="]) + except getopt.GetoptError: + usage() + sys.exit(2) + + # + # Set a few defaults. + # + clean = False + build = True + installer = True + debugLevel = logging.NOTSET + logFile = None + target = None + + for o, a in optionList: + if o in ("-h", "--help"): + usage() + sys.exit() + elif o == "--clean": + clean = True + elif o == "--skip-build": + build = False + elif o == "--skip-installer": + installer = False + elif o in ('-l', '--logfile'): + logFile = a + elif o in ('-d', '--debug'): + debugLevel = logging.DEBUG + elif o in ('-', '--info'): + debugLevel = logging.INFO + elif o == '--vc60': + target = 'vc60' + elif o == '--vc71': + target = 'vc71' + elif o == '--vc80': + target = 'vc80' + elif o == '--vc80_x64': + target = 'vc80_x64' + elif o == '--sources': + os.environ['SOURCES'] = a + elif o == '--buildDir': + os.environ['BUILD_DIR'] = a + elif o == '--sslhome': + os.environ['OPENSSL_HOME'] = a + elif o == '--expathome': + os.environ['EXPAT_HOME'] = a + elif o == '--dbhome': + os.environ['DB_HOME'] = a + elif o == '--stlporthome': + os.environ['STLPORT_HOME'] = a + elif o == '--bzip2home': + os.environ['BZIP2_HOME'] = a + elif o == '--thirdparty': + os.environ['OPENSSL_HOME'] = os.path.join(a, 'openssl-%s' % OpenSSLVer) + os.environ['BZIP2_HOME'] = os.path.join(a, 'bzip2-%s' % Bzip2Ver) + os.environ['EXPAT_HOME'] = os.path.join(a, 'expat-%s' % ExpatVer) + os.environ['DB_HOME'] = os.path.join(a, 'db-%s' % DBVer) + os.environ['STLPORT_HOME'] = os.path.join(a, 'STLPort-%s' % STLPortVer) + + if debugLevel != logging.NOTSET: + if a != None: + logging.basicConfig(level = debugLevel, format='%(asctime)s %(levelname)s %(message)s', filename = a) + else: + logging.basicConfig(level = debugLevel, format='%(asctime)s %(levelname)s %(message)s') + + if target == None: + print 'The development target must be specified' + sys.exit(2) + + os.environ['target'] = target + + # + # Where all the files will be staged so that the install projects + # can find them. + # + targetDir = os.path.join(installDir, target) + stageDir = os.path.join(targetDir, "install") + + logging.info("Install Tool: " + installDir) + logging.info("Target Directory: " + targetDir) + logging.info("Stage Directory: " + stageDir) + + if clean: + print('You have indicated you want to ''clean'' files, starting from scratch.') + confirm = '' + while not confirm in ['y', 'n']: + confirm = raw_input('Are you sure? [y/N]') + if confirm == '': + confirm = 'n' + if confirm == 'n': + sys.exit() + else: + logging.info('Deleting intermediate files and rebuilding from scratch!') + + logging.info('Starting windows installer creation.') + + environmentCheck(target) + + buildDir = os.environ['BUILD_DIR'] + + logging.debug(environToString(os.environ)) + + sourcesVersion = checkSources(os.environ['SOURCES']) + + defaults = os.environ + defaults['dbver'] = '45' + defaults['version'] = sourcesVersion + defaults['dllversion'] = sourcesVersion.replace('.', '')[:2] + + if target == "vc80_x64": + defaults['OutDir'] = "x64/" + else: + defaults['OutDir'] = '' + + if os.path.exists(stageDir): + try: + shutil.rmtree(stageDir) + except IOError: + print """ If you are getting a permission error here, try running 'attrib -r /s' on both the stage directory and the source location for the third party libraries.""" - raise - os.mkdir(stageDir) - - # - # Gather and generate license files. - # - convertLicensesToRTF(os.path.dirname(__file__), target) - - # - # The third party packages need to be staged before building the - # distributions. This ordering is important because it adds an - # additional check that the third party packages that are - # included in the installer are suitable for use with Ice. - # - components.stage(os.path.join(os.path.dirname(components.__file__), "components", "components.ini"), - os.path.join(os.path.dirname(components.__file__), "components"), stageDir, "packages", defaults) - - # - # Build the merge module projects. - # - if installer: - buildMergeModules(targetDir, stageDir, sourcesVersion, target) - buildInstallers(targetDir, stageDir, sourcesVersion, target, [("ThirdParty", "THIRD_PARTY_MSI")]) - - # - # Screw clean rules, run the ultimate clean! - # - if clean: - shutil.rmtree(buildDir) - - if not os.path.exists(buildDir): - os.mkdir(buildDir) - if not os.path.exists(os.path.join(buildDir, "debug")): - os.mkdir(os.path.join(buildDir, "debug")) - if not os.path.exists(os.path.join(buildDir, "release")): - os.mkdir(os.path.join(buildDir, "release")) - - for z in DistPrefixes: + raise + os.mkdir(stageDir) + + # + # Gather and generate license files. + # + convertLicensesToRTF(os.path.dirname(__file__), target) + + # + # The third party packages need to be staged before building the + # distributions. This ordering is important because it adds an + # additional check that the third party packages that are + # included in the installer are suitable for use with Ice. + # + components.stage(os.path.join(os.path.dirname(components.__file__), "components", "components.ini"), + os.path.join(os.path.dirname(components.__file__), "components"), stageDir, "packages", defaults) + + # + # Build the merge module projects. + # + if installer: + buildMergeModules(targetDir, stageDir, sourcesVersion, target) + buildInstallers(targetDir, stageDir, sourcesVersion, target, [("ThirdParty", "THIRD_PARTY_MSI")]) + + # + # Screw clean rules, run the ultimate clean! + # + if clean: + shutil.rmtree(buildDir) + + if not os.path.exists(buildDir): + os.mkdir(buildDir) + if not os.path.exists(os.path.join(buildDir, "debug")): + os.mkdir(os.path.join(buildDir, "debug")) + if not os.path.exists(os.path.join(buildDir, "release")): + os.mkdir(os.path.join(buildDir, "release")) + + for z in DistPrefixes: + # + # TODO: See if this can be replaced by ZipFile and native + # Python code somehow. # - # TODO: See if this can be replaced by ZipFile and native - # Python code somehow. - # - filename = os.path.join(os.environ['SOURCES'], z % sourcesVersion + ".zip") - if not os.path.exists(os.path.join(buildDir, "debug", z % sourcesVersion)): - runprog("unzip -o -q %s -d %s" % (filename, os.path.join(buildDir, "debug"))) - if not os.path.exists(os.path.join(buildDir, "release", z % sourcesVersion)): - runprog("unzip -o -q %s -d %s" % (filename, os.path.join(buildDir, "release"))) - - # - # Build the Ice distributions. - # - if build: - buildIceDists(stageDir, buildDir, sourcesVersion, target) - - # - # Stage Ice! - # - components.stage(os.path.join(os.path.dirname(components.__file__), "components", "components.ini"), - os.path.join(os.path.dirname(components.__file__), "components"), stageDir, "ice", defaults) - - # - # Build the installer projects. - # - if installer: - buildInstallers(targetDir, stageDir, sourcesVersion, target, [("Ice", "ICE_MSI")]) + filename = os.path.join(os.environ['SOURCES'], z % sourcesVersion + ".zip") + if not os.path.exists(os.path.join(buildDir, "debug", z % sourcesVersion)): + runprog("unzip -o -q %s -d %s" % (filename, os.path.join(buildDir, "debug"))) + if not os.path.exists(os.path.join(buildDir, "release", z % sourcesVersion)): + runprog("unzip -o -q %s -d %s" % (filename, os.path.join(buildDir, "release"))) + + # + # Build the Ice distributions. + # + if build: + buildIceDists(stageDir, buildDir, sourcesVersion, target) + + # + # Stage Ice! + # + components.stage(os.path.join(os.path.dirname(components.__file__), "components", "components.ini"), + os.path.join(os.path.dirname(components.__file__), "components"), stageDir, "ice", defaults) + + # + # Build the installer projects. + # + if installer: + buildInstallers(targetDir, stageDir, sourcesVersion, target, [("Ice", "ICE_MSI")]) finally: - # - # Return the user to where they started. - # - os.chdir(startDir) + # + # Return the user to where they started. + # + os.chdir(startDir) if __name__ == "__main__": main() |