diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/RPMTools.py | 2 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index c9ff7fc0a55..8d0359bcae4 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -229,6 +229,7 @@ class Subpackage(Package): # NOTE: File transforms should be listed before directory transforms. # transforms = [ ('file', 'lib/Ice.jar', 'lib/Ice-%version%/Ice.jar' ), + ('dir', 'config', 'share/doc/Ice-%version%/config'), ('dir', 'slice', 'share/slice'), ('dir', 'ant', 'lib/Ice-%version%/ant'), ('dir', 'python', 'lib/Ice-%version%/python'), @@ -239,6 +240,7 @@ transforms = [ ('file', 'lib/Ice.jar', 'lib/Ice-%version%/Ice.jar' ), ] x64_transforms = [ + ('dir', 'config', 'share/doc/Ice-%version%/config'), ('dir', 'slice', 'share/slice'), ('dir', 'doc', 'share/doc/Ice-%version%/doc'), ('file', 'README', 'share/doc/Ice-%version%/README'), 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) # |