diff options
| -rw-r--r-- | config/Make.common.rules | 1 | ||||
| -rw-r--r-- | config/Make.common.rules.mak | 1 | ||||
| -rw-r--r-- | distribution/lib/DistUtils.py | 4 | ||||
| -rwxr-xr-x | makedist.py | 8 |
4 files changed, 4 insertions, 10 deletions
diff --git a/config/Make.common.rules b/config/Make.common.rules index c6282c70810..abf92ee6cbe 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -156,6 +156,7 @@ $(warning Found $(slice_translator) in both /usr/bin and /opt/Ice-$(VERSION)/bin $(error Unable to find a valid Ice distribution, please verify ICE_HOME is properly configured and Ice is correctly installed.) endif ice_bin_dist = 1 + ice_cpp_dir = $(ice_dir) endif # diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index aaf735b1b3e..5553f8abefb 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -111,6 +111,7 @@ ice_dir = C:\Ice-$(VERSION) !error Unable to find a valid Ice distribution, please verify ICE_HOME is properly configured and Ice is correctly installed. !endif ice_bin_dist = 1 +ice_cpp_dir = $(ice_dir) !endif # diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py index 58ffd0e391f..c95297d5795 100644 --- a/distribution/lib/DistUtils.py +++ b/distribution/lib/DistUtils.py @@ -161,10 +161,10 @@ def move(src, dest, warnDestExists = True): # # Copy files from srcpath and matching the given patterns to destpath # -def copyMatchingFiles(srcpath, destpath, patterns): +def copyMatchingFiles(srcpath, destpath, patterns, warnDestExists = True): for p in patterns: for f in glob.glob(os.path.join(srcpath, p)): - copy(f, os.path.join(destpath, os.path.basename(f))) + copy(f, os.path.join(destpath, os.path.basename(f)), warnDestExists) # # Get the language mapping directory for a given suffix. diff --git a/makedist.py b/makedist.py index 58883ac2c2e..e7c791642c3 100755 --- a/makedist.py +++ b/makedist.py @@ -38,15 +38,7 @@ filesToRemove = [ \ "fixCopyright.py", \ "fixVersion.py", \ "makedist.py", \ - "makesldist.py", \ - "cpp/iceemakedist.py", \ "cpp/config/makegitignore.py", \ - "cpp/config/Make.rules.icee", \ - "cpp/config/Make.rules.mak.icee", \ - "cpp/config/Make.rules.mak.icesl", \ - "cpp/src/slice2cppe", \ - "cpp/src/slice2javae", \ - "cpp/src/slice2sl", \ "rb/config/Make.rules.Darwin", \ ] |