diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-02-09 16:47:46 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-02-09 16:47:46 +0000 |
| commit | 28ce6d1434e5e5d4461a11b59a555733a300343c (patch) | |
| tree | 7076e2e77e710741d82284854c032cf4bb0aef98 /cpp | |
| parent | Fixed 2005 conversion (diff) | |
| download | ice-28ce6d1434e5e5d4461a11b59a555733a300343c.tar.bz2 ice-28ce6d1434e5e5d4461a11b59a555733a300343c.tar.xz ice-28ce6d1434e5e5d4461a11b59a555733a300343c.zip | |
Fixed bug #1796
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/Ice/throughput/Makefile | 11 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cpp/demo/Ice/throughput/Makefile b/cpp/demo/Ice/throughput/Makefile index 1ef9e7494bf..d4020cb48e3 100644 --- a/cpp/demo/Ice/throughput/Makefile +++ b/cpp/demo/Ice/throughput/Makefile @@ -29,7 +29,16 @@ SLICE_SRCS = Throughput.ice include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. $(CPPFLAGS) +ifeq ($(CXX),aCC) +# +# Work-around 'quadrant warning' in aCC A.03.56 +# Puts string literals in read-write memory +# +EXTRA_CPPFLAGS := +ESnolit +endif + +CPPFLAGS := -I. $(CPPFLAGS) $(EXTRA_CPPFLAGS) + $(CLIENT): $(OBJS) $(COBJS) rm -f $@ diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 5e5ddc90058..145a43f3cdc 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -157,6 +157,7 @@ def getInstallFiles(cvsTag, buildDir, version, mmVersion): runprog('cvs -d cvs.zeroc.com:/home/cvsroot export -r ' + cvsTag + ' ice/install/common') runprog('cvs -d cvs.zeroc.com:/home/cvsroot export -r ' + cvsTag + ' ice/install/rpm') runprog('cvs -d cvs.zeroc.com:/home/cvsroot export -r ' + cvsTag + ' ice/install/thirdparty') + fixVersion('ice/install/common/README.DEMOS', version, mmVersion) snapshot = os.walk('./ice/install/unix') for dirInfo in snapshot: for f in dirInfo[2]: @@ -179,6 +180,7 @@ def getInstallFilesFromLocalDirectory(cvsTag, buildDir, version, mmVersion): os.makedirs(target) for f in ['unix', 'common', 'rpm', 'thirdparty']: shutil.copytree(os.path.join(iceloc, f), os.path.join(target, f)) + fixVersion('ice/install/common/README.DEMOS', version, mmVersion) snapshot = os.walk('./ice/install/unix') for dirInfo in snapshot: for f in dirInfo[2]: |