diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-10-12 15:26:16 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-10-12 15:26:16 +0000 |
| commit | f788c4d340f1b7627bcc70709c7737dfefcabaf6 (patch) | |
| tree | 114d831c2da821406cd31ee5c57397f07fc5e16c /cpp/makebindist.py | |
| parent | 64 bit fixes (diff) | |
| download | ice-f788c4d340f1b7627bcc70709c7737dfefcabaf6.tar.bz2 ice-f788c4d340f1b7627bcc70709c7737dfefcabaf6.tar.xz ice-f788c4d340f1b7627bcc70709c7737dfefcabaf6.zip | |
fix config directory installation xform
Diffstat (limited to 'cpp/makebindist.py')
| -rwxr-xr-x | cpp/makebindist.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 74b4569a636..12bc43d1d43 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -383,6 +383,7 @@ def makeInstall(sources, buildDir, installDir, distro, clean, version): filesToCopy.append(os.path.join('config', 'Make.rules')) filesToCopy.append(os.path.join('config', 'Make.rules.' + getMakeRulesSuffix())) for f in filesToCopy: + print('Copying ' + f + ' to ' + destDir) shutil.copy(f, destDir) editMakeRules(os.path.join(destDir, 'Make.rules'), version) @@ -1016,13 +1017,21 @@ def main(): # massaged the permissions on /usr/src/redhat/. # if getPlatform().startswith('linux') and not cvsMode: - os.system('cp ' + installDir + '/Ice-' + version + '-demos.tar.gz /usr/src/redhat/SOURCES') - os.system('cp ' + sources + '/Ice*.tar.gz /usr/src/redhat/SOURCES') shutil.copy(installFiles + '/unix/README.Linux-RPM', '/usr/src/redhat/SOURCES/README.Linux-RPM') shutil.copy(installFiles + '/unix/README.Linux-RPM', installDir + '/Ice-' + version + '/README') if getPlatform() == 'linux64': + # + # The demo archive isn't constructed on 64 bit linux so we + # need to rely on the archive being in the sources + # directory. + # + os.system('cp ' + sources + '/Ice-' + version + '-demos.tar.gz /usr/src/redhat/SOURCES') + os.system('cp ' + sources + '/Ice-' + version + '-demos.tar.gz ' + installDir) + os.system('cp ' + sources + '/Ice*.tar.gz /usr/src/redhat/SOURCES') RPMTools.createRPMSFromBinaries64(buildDir, installDir, version, soVersion) else: + os.system('cp ' + installDir + '/Ice-' + version + '-demos.tar.gz /usr/src/redhat/SOURCES') + os.system('cp ' + sources + '/Ice*.tar.gz /usr/src/redhat/SOURCES') RPMTools.createRPMSFromBinaries(buildDir, installDir, version, soVersion) # |