diff options
| -rwxr-xr-x | distribution/bin/makebindist.py | 1 | ||||
| -rwxr-xr-x | distribution/bin/makegem.py | 4 | ||||
| -rwxr-xr-x | distribution/bin/makejspackages.py | 63 | ||||
| -rwxr-xr-x | distribution/bin/makepy.py | 4 | ||||
| -rwxr-xr-x | distribution/bin/makeubuntupackages.py | 6 | ||||
| -rwxr-xr-x | distribution/bin/makeubunturepo.py | 83 | ||||
| -rw-r--r-- | distribution/lib/DistUtils.py | 30 |
7 files changed, 99 insertions, 92 deletions
diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py index 955c364b08d..d66cd8a6ce0 100755 --- a/distribution/bin/makebindist.py +++ b/distribution/bin/makebindist.py @@ -17,6 +17,7 @@ from stat import * # iceVersion = "3.6.0" + distDir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) sys.path.append(os.path.join(distDir, "lib")) import DistUtils diff --git a/distribution/bin/makegem.py b/distribution/bin/makegem.py index 17df20b667a..024cba0f805 100755 --- a/distribution/bin/makegem.py +++ b/distribution/bin/makegem.py @@ -77,12 +77,12 @@ print "Building Ice " + iceVersion + " gem" # # Ensure that the source archive or directory exists and create the build directory. # -buildRootDir = os.path.join(distDir, "..", os.path.join("build-gem-" + iceVersion)) +buildRootDir = os.path.join(distDir, "..", "build-gem-" + iceVersion) srcDir = os.path.join(buildRootDir, "Ice-" + iceVersion + "-src") if forceclean or not os.path.exists(srcDir): if os.path.exists(buildRootDir): - print "Removing previous build from " + os.path.join("build-gem-" + iceVersion) + "...", + print "Removing previous build from build-gem-" + iceVersion + "...", sys.stdout.flush() shutil.rmtree(buildRootDir) print "ok" diff --git a/distribution/bin/makejspackages.py b/distribution/bin/makejspackages.py index 987fe55e52a..6cde01a9653 100755 --- a/distribution/bin/makejspackages.py +++ b/distribution/bin/makejspackages.py @@ -35,24 +35,25 @@ iceVersion = "3.6.0" mmVersion = "3.6" os.chdir(os.path.join(os.path.dirname(__file__), "..", "..")) -if not os.path.isfile("Ice-" + iceVersion + ".tar.gz"): - print("Could not find Ice-" + iceVersion + ".tar.gz") +if not os.path.isfile("Ice-%s.tar.gz" % iceVersion): + print("Could not find Ice-%s.tar.gz" % iceVersion) sys.exit(1) -thirdPartyPackage = "ThirdParty-Sources-" + iceVersion -downloadUrl = "http://www.zeroc.com/download/Ice/" + mmVersion + "/" +thirdPartyPackage = "ThirdParty-Sources-%s" % iceVersion +downloadUrl = "http://www.zeroc.com/download/Ice/%s/" % mmVersion if not os.path.isfile(os.path.expanduser("~/Downloads/%s.tar.gz" % thirdPartyPackage)): - runCommand(os.path.expanduser("cd ~/Downloads && wget http://www.zeroc.com/download/Ice/" + mmVersion + "/%s.tar.gz" % thirdPartyPackage)) + runCommand(os.path.expanduser("cd ~/Downloads && wget http://www.zeroc.com/download/Ice/%(mmver)s/%(thirdParty)s.tar.gz" % + {"thirdParty": thirdPartyPackage, "mmver": mmVersion})) runCommand(os.path.expanduser( "rm -rf %(thirdParty)s && tar zxf ~/Downloads/%(thirdParty)s.tar.gz && cd %(thirdParty)s && tar zxf mcpp-2.7.2.tar.gz && " "cd mcpp-2.7.2 && patch -p0 < ../mcpp/patch.mcpp.2.7.2" % {"thirdParty": thirdPartyPackage})) -runCommand("tar zxf Ice-" + iceVersion + ".tar.gz") +runCommand("tar zxf Ice-%s.tar.gz" % iceVersion) for d in ["IceUtil", "Slice", "slice2js"]: - runCommand("cd Ice-" + iceVersion + "/cpp/src/%s && make -j8" % d) -runCommand("cd Ice-" + iceVersion + "/js && npm install && npm run gulp:dist") + runCommand("cd Ice-%(version)s/cpp/src/%(dir)s && make -j8" % { "dir": d, "version": iceVersion }) +runCommand("cd Ice-%s/js && npm install && npm run gulp:dist" % iceVersion) packages = ["zeroc-icejs", "icejs-demos", "zeroc-slice2js", "gulp-zeroc-slice2js"] @@ -71,14 +72,15 @@ for package in packages: # # copy dist files to repositories # - runCommand("cp -rf distfiles-" + iceVersion + "/src/js/%(package)s/* packages/%(package)s/" % {"package": package}) + runCommand("cp -rf distfiles-%(version)s/src/js/%(package)s/* packages/%(package)s/" % + { "package": package, "version": iceVersion }) # # copy license files to each package # for f in ["LICENSE", "ICE_LICENSE"]: - copy("Ice-" + iceVersion + "/%(file)s" % {"file": f}, - "packages/%(package)s/%(file)s" % {"package": package, "file": f}) + copy("Ice-%(version)s/%(file)s" % { "file": f, "version": iceVersion }, + "packages/%(package)s/%(file)s" % { "package": package, "file": f }) # @@ -87,48 +89,51 @@ for package in packages: copy("%s/mcpp-2.7.2/src" % thirdPartyPackage, "packages/zeroc-slice2js/mcpp/src") for d in ["IceUtil", "Slice", "slice2js"]: - copyMatchingFiles(os.path.join("Ice-" + iceVersion + "/cpp/src", d), os.path.join("packages/zeroc-slice2js/src", d), ["*.cpp", "*.h"]) + copyMatchingFiles(os.path.join("Ice-%s/cpp/src" % iceVersion, d), + os.path.join("packages/zeroc-slice2js/src", d), ["*.cpp", "*.h"]) for d in ["IceUtil", "Slice"]: - copyMatchingFiles(os.path.join("Ice-" + iceVersion + "/cpp/include", d), os.path.join("packages/zeroc-slice2js/include", d), ["*.h"]) + copyMatchingFiles(os.path.join("Ice-%s/cpp/include" % iceVersion, d), + os.path.join("packages/zeroc-slice2js/include", d), ["*.h"]) for d in ["Glacier2", "Ice", "IceGrid", "IceSSL", "IceStorm"]: - copyMatchingFiles(os.path.join("Ice-" + iceVersion + "/slice", d), os.path.join("packages/zeroc-slice2js/slice", d), ["*.ice"]) + copyMatchingFiles(os.path.join("Ice-%s/slice" % iceVersion, d), + os.path.join("packages/zeroc-slice2js/slice", d), ["*.ice"]) -copy("distfiles-" + iceVersion + "/src/unix/MCPP_LICENSE", "packages/zeroc-slice2js/MCPP_LICENSE") +copy("distfiles-%s/src/unix/MCPP_LICENSE" % iceVersion, "packages/zeroc-slice2js/MCPP_LICENSE") # # gulp-zeroc-slice2js package # -copy("Ice-" + iceVersion + "/js/gulp/gulp-slice2js/index.js", "packages/gulp-zeroc-slice2js/index.js") +copy("Ice-%s/js/gulp/gulp-slice2js/index.js", "packages/gulp-zeroc-slice2js/index.js") # # zeroc-icejs package # -copy("Ice-" + iceVersion + "/js/src", "packages/zeroc-icejs/src") -copyMatchingFiles("Ice-" + iceVersion + "/js/gulp", "packages/zeroc-icejs/gulp", ['bundle.js', 'libTasks.js']) -copyMatchingFiles("Ice-" + iceVersion + "/js/lib", "packages/zeroc-icejs/lib", ["*.js", "*.gz"]) +copy("Ice-%s/js/src", "packages/zeroc-icejs/src" % iceVersion) +copyMatchingFiles("Ice-%s/js/gulp" % iceVersion, "packages/zeroc-icejs/gulp", ['bundle.js', 'libTasks.js']) +copyMatchingFiles("Ice-%s/js/lib" % iceVersion, "packages/zeroc-icejs/lib", ["*.js", "*.gz"]) # # zeroc-icejs-demo package # -for f in os.listdir("Ice-" + iceVersion + "/js/demo"): +for f in os.listdir("Ice-%s/js/demo" % iceVersion): if f == "README": continue - copy(os.path.join("Ice-" + iceVersion + "/js/demo", f), os.path.join("packages/icejs-demos", f)) -copy("Ice-" + iceVersion + "/js/bin", "packages/icejs-demos/bin") -copy("Ice-" + iceVersion + "/certs", "packages/icejs-demos/certs") -copy("Ice-" + iceVersion + "/js/assets", "packages/icejs-demos/assets") -copy("Ice-" + iceVersion + "/js/.jshintrc", "packages/icejs-demos/.jshintrc") + copy(os.path.join("Ice-%s/js/demo" % iceVersion, f), os.path.join("packages/icejs-demos", f)) +copy("Ice-%s/js/bin" % iceVersion, "packages/icejs-demos/bin") +copy("Ice-%s/certs" % iceVersion, "packages/icejs-demos/certs") +copy("Ice-%s/js/assets" % iceVersion, "packages/icejs-demos/assets") +copy("Ice-%s/js/.jshintrc" % iceVersion, "packages/icejs-demos/.jshintrc") -jshint = json.load(open("Ice-" + iceVersion + "/js/.jshintrc_browser", "r")) -jshintDemo = json.load(open("Ice-" + iceVersion + "/js/demo/.jshintrc_browser", "r")) +jshint = json.load(open("Ice-%s/js/.jshintrc_browser" % iceVersion, "r")) +jshintDemo = json.load(open("Ice-%s/js/demo/.jshintrc_browser" % iceVersion, "r")) for key, value in jshintDemo["globals"].iteritems(): jshint["globals"][key] = value json.dump(jshint, open("packages/icejs-demos/.jshintrc_browser", "w"), indent = 4, separators=(',', ': ')) for package in packages: - runCommand("cd packages/%(package)s && git add . && git commit . -m '%(package)s version " + iceVersion + "'" % - {"package": package}) + runCommand("cd packages/%(package)s && git add . && git commit . -m '%(package)s version %(version)s'" % + { "package": package, "version": iceVersion }) diff --git a/distribution/bin/makepy.py b/distribution/bin/makepy.py index b91441acc72..8e3f620b446 100755 --- a/distribution/bin/makepy.py +++ b/distribution/bin/makepy.py @@ -78,12 +78,12 @@ print "Building Ice " + iceVersion # # Ensure that the source archive or directory exists and create the build directory. # -buildRootDir = os.path.join(distDir, "..", os.path.join("build-py-" + iceVersion)) +buildRootDir = os.path.join(distDir, "..", "build-py-" + iceVersion) srcDir = os.path.join(buildRootDir, "Ice-" + iceVersion + "-src") if forceclean or not os.path.exists(srcDir): if os.path.exists(buildRootDir): - print "Removing previous build from " + os.path.join("build-py-" + iceVersion) + "...", + print "Removing previous build from build-py-" + iceVersion + "...", sys.stdout.flush() shutil.rmtree(buildRootDir) print "ok" diff --git a/distribution/bin/makeubuntupackages.py b/distribution/bin/makeubuntupackages.py index 4dff176f302..bf507b09049 100755 --- a/distribution/bin/makeubuntupackages.py +++ b/distribution/bin/makeubuntupackages.py @@ -71,9 +71,9 @@ if distributionDir == None: buildpackageOps = ("-k%s" % keyid) if keyid != None else "-us -uc" -sourceDir = "zeroc-ice" + mmVersion + "-" + debVersion -distFile = "zeroc-ice" + mmVersion + "_" + debVersion + ".orig.tar.gz" -distFiles = "distfiles-" + iceVersion + ".tar.gz" +sourceDir = "zeroc-ice%(mmver)s-%(debver)s" % { "mmver": mmVersion, "debver": debVersion } +distFile = "zeroc-ice%(mmver)s_%(debver)s.orig.tar.gz" % { "mmver": mmVersion, "debver": debVersion } +distFiles = "distfiles-%s.tar.gz" % iceVersion buildDir = os.path.abspath(os.path.join(os.getcwd(), buildDir)) sourceDir = os.path.abspath(os.path.join(buildDir, sourceDir)) diff --git a/distribution/bin/makeubunturepo.py b/distribution/bin/makeubunturepo.py index a46f9394778..f6a142495de 100755 --- a/distribution/bin/makeubunturepo.py +++ b/distribution/bin/makeubunturepo.py @@ -15,43 +15,43 @@ debVersion = "3.6.0" mmVersion = "3.6" i386Packages = [ - "libzeroc-freeze" + mmVersion + "_" + debVersion + "-1000_i386.deb", - "libzeroc-ice" + mmVersion + "_" + debVersion + "-1000_i386.deb", - "libzeroc-ice-dev_" + debVersion + "-1000_i386.deb", - "libzeroc-ice-java_" + debVersion + "-1000_i386.deb", - "libzeroc-icestorm" + mmVersion + "_" + debVersion + "-1000_i386.deb", - "php5-zeroc-ice_" + debVersion + "-1000_i386.deb", - "php5-zeroc-ice-dev_" + debVersion + "-1000_i386.deb", - "zeroc-glacier2_" + debVersion + "-1000_i386.deb", - "zeroc-ice" + mmVersion + "_" + debVersion + "-1000_i386.changes", - "zeroc-icebox_" + debVersion + "-1000_i386.deb", - "zeroc-icegrid_" + debVersion + "-1000_i386.deb", - "zeroc-icepatch2_" + debVersion + "-1000_i386.deb", - "zeroc-ice-utils_" + debVersion + "-1000_i386.deb"] + "libzeroc-freeze%(mmver)s_%(debver)s-1000_i386.deb" % { "mmver": mmVersion, "debver": debVersion }, + "libzeroc-ice%(mmver)s_%(debver)s-1000_i386.deb" % { "mmver": mmVersion, "debver": debVersion }, + "libzeroc-ice-dev_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "libzeroc-ice-java_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "libzeroc-icestorm%(mmver)s_%(debver)s-1000_i386.deb" % { "mmver": mmVersion, "debver": debVersion }, + "php5-zeroc-ice_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "php5-zeroc-ice-dev_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "zeroc-glacier2_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "zeroc-ice%(mmver)s_%(debver)s-1000_i386.changes" % { "mmver": mmVersion, "debver": debVersion }, + "zeroc-icebox_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "zeroc-icegrid_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "zeroc-icepatch2_%(debver)s-1000_i386.deb" % { "debver": debVersion }, + "zeroc-ice-utils_%(debver)s-1000_i386.deb" % { "debver": debVersion }] amd64Packages = [ - "libzeroc-freeze" + mmVersion + "_" + debVersion + "-1000_amd64.deb", - "libzeroc-ice" + mmVersion + "_" + debVersion + "-1000_amd64.deb", - "libzeroc-ice-dev_" + debVersion + "-1000_amd64.deb", - "libzeroc-ice-java_" + debVersion + "-1000_amd64.deb", - "libzeroc-icestorm" + mmVersion + "_" + debVersion + "-1000_amd64.deb", - "php5-zeroc-ice_" + debVersion + "-1000_amd64.deb", - "php5-zeroc-ice-dev_" + debVersion + "-1000_amd64.deb", - "zeroc-glacier2_" + debVersion + "-1000_amd64.deb", - "zeroc-ice" + mmVersion + "_" + debVersion + "-1000_amd64.changes", - "zeroc-icebox_" + debVersion + "-1000_amd64.deb", - "zeroc-icegrid_" + debVersion + "-1000_amd64.deb", - "zeroc-icepatch2_" + debVersion + "-1000_amd64.deb", - "zeroc-ice-utils_" + debVersion + "-1000_amd64.deb"] + "libzeroc-freeze%(mmver)s_%(debver)s-1000_amd64.deb" % { "mmver": mmVersion, "debver": debVersion }, + "libzeroc-ice%(mmver)s_%(debver)s-1000_amd64.deb" % { "mmver": mmVersion, "debver": debVersion }, + "libzeroc-ice-dev_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "libzeroc-ice-java_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "libzeroc-icestorm%(mmver)s_%(debver)s-1000_amd64.deb" % { "mmver": mmVersion, "debver": debVersion }, + "php5-zeroc-ice_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "php5-zeroc-ice-dev_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "zeroc-glacier2_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "zeroc-ice%(mmver)s_%(debver)s-1000_amd64.changes" % { "mmver": mmVersion, "debver": debVersion }, + "zeroc-icebox_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "zeroc-icegrid_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "zeroc-icepatch2_%(debver)s-1000_amd64.deb" % { "debver": debVersion }, + "zeroc-ice-utils_%(debver)s-1000_amd64.deb" % { "debver": debVersion }] noarchPackages = [ - "zeroc-ice" + mmVersion + "_" + debVersion + "-1000.debian.tar.gz", - "zeroc-ice" + mmVersion + "_" + debVersion + "-1000.dsc", - "zeroc-ice" + mmVersion + "_" + debVersion + ".orig.tar.gz", - "zeroc-ice-utils-java_" + debVersion + "-1000_all.deb", - "zeroc-ice-slice_" + debVersion + "-1000_all.deb", - "zeroc-ice-all-runtime_" + debVersion + "-1000_all.deb", - "zeroc-ice-all-dev_" + debVersion + "-1000_all.deb"] + "zeroc-ice%(mmver)s_%(debver)s-1000.debian.tar.gz" % { "mmver": mmVersion, "debver": debVersion }, + "zeroc-ice%(mmver)s_%(debver)s-1000.dsc" % { "mmver": mmVersion, "debver": debVersion }, + "zeroc-ice%(mmver)s_%(debver)s.orig.tar.gz" % { "mmver": mmVersion, "debver": debVersion }, + "zeroc-ice-utils-java_%(debver)s-1000_all.deb" % { "debver": debVersion }, + "zeroc-ice-slice_%(debver)s-1000_all.deb" % { "debver": debVersion }, + "zeroc-ice-all-runtime_%(debver)s-1000_all.deb" % { "mmver": mmVersion, "debver": debVersion }, + "zeroc-ice-all-dev_%(debver)s-1000_all.deb" % { "debver": debVersion }] def runCommand(cmd, verbose = False): @@ -107,7 +107,7 @@ buildCommand = """ %(scpCommand)s %(sourceDist)s %(sshUser)s@%(sshBuildHost)s:/home/%(sshUser)s/%(buildDir)s && \\ %(scpCommand)s %(keystore)s %(sshUser)s@%(sshBuildHost)s:/home/%(sshUser)s/%(buildDir)s/keystore.jks && \\ %(sshCommand)s %(sshUser)s@%(sshBuildHost)s \\ - 'cd %(buildDir)s && tar zxf %(distFiles)s && SIGNJARS=yes JARSIGNER_KEYSTORE=/home/%(sshUser)s/%(buildDir)s/keystore.jks JARSIGNER_KEYSTORE_PASSWORD="%(storepass)s" python distfiles-' + iceVersion + '/bin/makeubuntupackages.py -b %(codename)s -d . > build-log.txt 2>&1 && rm /home/%(sshUser)s/%(buildDir)s/keystore.jks' + 'cd %(buildDir)s && tar zxf %(distFiles)s && SIGNJARS=yes JARSIGNER_KEYSTORE=/home/%(sshUser)s/%(buildDir)s/keystore.jks JARSIGNER_KEYSTORE_PASSWORD="%(storepass)s" python distfiles-%(version)s/bin/makeubuntupackages.py -b %(codename)s -d . > build-log.txt 2>&1 && rm /home/%(sshUser)s/%(buildDir)s/keystore.jks' """ class Builder(threading.Thread): @@ -127,7 +127,7 @@ class Builder(threading.Thread): # codename = "trusty" sourceDist = "zeroc-ice" + mmVersion + "_" + debVersion + ".orig.tar.gz" -distFiles = "distfiles-" + iceVersion + ".tar.gz" +distFiles = "distfiles-%s.tar.gz" % iceVersion signKey = "A62B38F8" if iceVersion.endswith("b") else "53A473EE" sshKey = None sshUser = os.environ.get('USER') @@ -232,7 +232,8 @@ if not skipBuild: "distFiles": distFiles, "sourceDist": sourceDist, "keystore": keystore, - "storepass": storepass}) + "storepass": storepass, + "version": iceVersion}) thread.start() buildThreads.append(thread) @@ -259,8 +260,8 @@ for host in [i386BuildHost, amd64BuildHost]: # # Sign the source package # -for command in ["cd ubuntu && echo \"y\" | debsign -k %(signKey)s pool/%(codename)s/main/i/ice" + mmVersion + "/zeroc-ice" + mmVersion + "_" + debVersion + "-1000.dsc"]: - runCommand(command % {"signKey": signKey, "codename": codename}, verbose) +for command in ["cd ubuntu && echo \"y\" | debsign -k %(signKey)s pool/%(codename)s/main/i/ice%(mmver)s/zeroc-ice%(mmver)s_%(debver)s-1000.dsc"]: + runCommand(command % {"signKey": signKey, "codename": codename, "mmver": mmVersion, "debver": debVersion}, verbose) f = open('ubuntu/aptftp.conf', 'w') f.write(aptftpConf % {"codename": codename}) @@ -277,10 +278,10 @@ runCommand("cd ubuntu && apt-ftparchive release -c=aptftp.conf dists/%(codename) # # Sign changes and release files # -for command in ["cd ubuntu && echo \"y\" | debsign -k %(signKey)s pool/%(codename)s/main/i/ice" + mmVersion + "/zeroc-ice" + mmVersion + "_" + debVersion + "-1000_i386.changes", - "cd ubuntu && echo \"y\" | debsign -k %(signKey)s pool/%(codename)s/main/i/ice" + mmVersion + "/zeroc-ice" + mmVersion + "_" + debVersion + "-1000_amd64.changes", +for command in ["cd ubuntu && echo \"y\" | debsign -k %(signKey)s pool/%(codename)s/main/i/ice%(mmver)s/zeroc-ice%(mmver)s_%(debver)s-1000_i386.changes", + "cd ubuntu && echo \"y\" | debsign -k %(signKey)s pool/%(codename)s/main/i/ice%(mmver)s/zeroc-ice%(mmver)s_%(debver)s-1000_amd64.changes", "cd ubuntu && gpg --yes -u %(signKey)s -bao dists/%(codename)s/Release.gpg dists/%(codename)s/Release"]: - runCommand(command % {"signKey": signKey, "codename": codename}, verbose) + runCommand(command % {"signKey": signKey, "codename": codename, "mmver": mmVersion, "debver": debVersion}, verbose) runCommand("rm -f ubuntu/aptftp.conf ubuntu/aptgenerate.conf", verbose) runCommand("tar cjf ubuntu.tar.bz2 ubuntu", verbose) diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py index a1d2c9a8b7f..a05d471d7ae 100644 --- a/distribution/lib/DistUtils.py +++ b/distribution/lib/DistUtils.py @@ -802,8 +802,8 @@ class Darwin(Platform): print("Fixing python location") move(buildDir + '/python', buildDir + '/../python') - runCommand("install_name_tool -rpath %s/lib /Library/Developer/Ice-" + iceVersion + "/lib %s/../python/IcePy.so" % - (buildDir, buildDir)) + runCommand("install_name_tool -rpath %s/lib /Library/Developer/Ice-%s/lib %s/../python/IcePy.so" % + (buildDir, iceVersion, buildDir)) print("ok") print("Fixing IceGrid Admin.app location") @@ -811,8 +811,8 @@ class Darwin(Platform): print("ok") print("Fixing Freeze RPATH") - for name in ["lib/libFreeze." + iceVersion + ".dylib", "bin/transformdb", "bin/dumpdb"]: - runCommand("install_name_tool -delete_rpath /Library/Developer/Ice-" + iceVersion + "-ThirdParty/lib %s/%s" % (buildDir, name)) + for name in ["lib/libFreeze.%s.dylib" % iceVersion, "bin/transformdb", "bin/dumpdb"]: + runCommand("install_name_tool -delete_rpath /Library/Developer/Ice-%s-ThirdParty/lib %s/%s" % (iceVersion, buildDir, name)) def createArchive(self, cwd, buildRootDir, distDir, version, quiet): @@ -829,7 +829,7 @@ class Darwin(Platform): shutil.rmtree(packagesDir) os.mkdir(packagesDir) - iceRootDir = ("%s/Ice-" + iceVersion) % buildRootDir + iceRootDir = "%s/Ice-%s" % (buildRootDir, iceVersion) for name in ["freeze", "glacier2", "ice", "icebox", "icediscovery", "icegrid", "icepatch2", "icestorm", "ice-gradle-plugin", "ant-ice"]: runCommand("cd %s/lib && rm -f %s.jar" % (iceRootDir, name)) runCommand("cd %s/lib && ln -s %s-%s.jar %s.jar" % (iceRootDir, name, iceVersion, name)) @@ -839,25 +839,25 @@ class Darwin(Platform): runCommand("cd %s/lib && ln -s %s-%s-source.jar %s-source.jar" % (iceRootDir, name, iceVersion, name)) package = "com.zeroc.ice" - packageRoot = os.path.join(buildRootDir, "Ice-" + iceVersion) - packageInstallLocation = "/Library/Developer/Ice-" + iceVersion + packageRoot = os.path.join(buildRootDir, "Ice-%s" % iceVersion) + packageInstallLocation = "/Library/Developer/Ice-%s" % iceVersion - runCommand("pkgbuild --root %s --identifier=%s --install-location=%s --version " + iceVersion + " %s/%s.pkg" % - (packageRoot, package, packageInstallLocation, packagesDir, package)) + runCommand("pkgbuild --root %s --identifier=%s --install-location=%s --version %s %s/%s.pkg" % + (packageRoot, package, packageInstallLocation, iceVersion, packagesDir, package)) package = "com.zeroc.icepython" packageRoot = os.path.join(buildRootDir, "python") packageInstallLocation = "/Library/Python/2.7/site-packages" - runCommand("pkgbuild --root %s --identifier=%s --install-location=%s --version " + iceVersion + " %s/%s.pkg" % - (packageRoot, package, packageInstallLocation, packagesDir, package)) + runCommand("pkgbuild --root %s --identifier=%s --install-location=%s --version %s %s/%s.pkg" % + (packageRoot, package, packageInstallLocation, iceVersion, packagesDir, package)) package = "com.zeroc.icegridadmin" packageRoot = os.path.join(buildRootDir, "IceGrid Admin.app") packageInstallLocation = "/Applications/IceGrid Admin.app" - runCommand("pkgbuild --root \"%s\" --identifier=%s --install-location=\"%s\" --version " + iceVersion + " %s/%s.pkg" % - (packageRoot, package, packageInstallLocation, packagesDir, package)) + runCommand("pkgbuild --root \"%s\" --identifier=%s --install-location=\"%s\" --version %s %s/%s.pkg" % + (packageRoot, package, packageInstallLocation, iceVersion, packagesDir, package)) distribution = os.path.join(distDir, "src", "mac", "Ice", "distribution.xml") @@ -865,8 +865,8 @@ class Darwin(Platform): scripts = os.path.join(distDir, "src", "mac", "Ice", "scripts") - runCommand("productbuild --distribution=%s --resources=%s --scripts=%s --package-path=%s %s/Ice-" + iceVersion + ".pkg" % - (distribution, resources, scripts, packagesDir, installerDir)) + runCommand("productbuild --distribution=%s --resources=%s --scripts=%s --package-path=%s %s/Ice-%s.pkg" % + (distribution, resources, scripts, packagesDir, installerDir, iceVersion)) copy(os.path.join(distDir, "src", "mac", "Ice", "README.txt"), installerDir) |