summaryrefslogtreecommitdiff
path: root/cpp/makebindist.py
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2006-06-07 11:13:16 +0000
committerBrent Eagles <brent@zeroc.com>2006-06-07 11:13:16 +0000
commitf38c5f1fb13cca3c7004853e44c0e91ed34e0ead (patch)
tree13bb8048562c4683928b2c03d84ed831088633b1 /cpp/makebindist.py
parentBug 901. (diff)
downloadice-f38c5f1fb13cca3c7004853e44c0e91ed34e0ead.tar.bz2
ice-f38c5f1fb13cca3c7004853e44c0e91ed34e0ead.tar.xz
ice-f38c5f1fb13cca3c7004853e44c0e91ed34e0ead.zip
Updates to distribution tools and RPM scripting
Diffstat (limited to 'cpp/makebindist.py')
-rwxr-xr-xcpp/makebindist.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py
index e56e7854de6..06093c4b643 100755
--- a/cpp/makebindist.py
+++ b/cpp/makebindist.py
@@ -713,7 +713,7 @@ def makePHPbinary(sources, buildDir, installDir, version, clean):
# runprog('gzip -dc ' + buildDir + '/ice/install/thirdparty/php/configure*.gz > configure', False)
else:
- runprog('gzip -dc ' + buildDir + '/IcePHP-' + version + '/configure-5.1.2.gz > configure', False)
+ runprog('gzip -dc ' + buildDir + '/IcePHP-' + version + '/configure.gz > configure', False)
if platform == 'hpux':
#
@@ -724,7 +724,7 @@ def makePHPbinary(sources, buildDir, installDir, version, clean):
#
# Everything else should be dynamic and pretty much basic.
#
- runprog('./configure-5.1.2 --without-pcre-regex --without-pear --with-ice=shared,' + installDir + '/Ice-' + version)
+ runprog('./configure --with-ice=shared,' + installDir + '/Ice-' + version)
#
# Need to make some changes to the PHP distribution.
@@ -1240,8 +1240,8 @@ def main():
shutil.copy(installDir + '/Ice-' + version + '-demos.tar.gz', '/usr/src/redhat/SOURCES')
shutil.copy(sources + '/php-5.1.4.tar.bz2', '/usr/src/redhat/SOURCES')
shutil.copy(installFiles + '/thirdparty/php/ice.ini', '/usr/src/redhat/SOURCES')
-# shutil.copy(installFiles + '/thirdparty/php/configure.5.0.4.gz',
-# '/usr/src/redhat/SOURCES')
+ shutil.copy(buildDir + '/IcePHP-' + version + '/configure.gz',
+ '/usr/src/redhat/SOURCES')
shutil.copy(installFiles + '/common/iceproject.xml', '/usr/src/redhat/SOURCES')
iceArchives = glob.glob(sources + '/Ice*' + version + '*.gz')
for f in iceArchives: