Minor fixes related to ICE-5193

6 files changed, 27 insertions, 27 deletions

diff --git a/config/Make.common.rules b/config/Make.common.rules
index b61c1da56ad..d4431ad0edc 100644
--- a/config/Make.common.rules
+++ b/config/Make.common.rules
@@ -244,7 +244,7 @@ install_slicedir = $(prefix)/slice
 ifneq ($(ice_dir), /usr)
     ifdef ice_src_dist
 	ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
-	    ice_lib_dir = $(ice_cpp_dir)/lib$(cpp11suffix)
+	    ice_lib_dir = $(ice_cpp_dir)/lib
 	else
     	ice_lib_dir = $(ice_cpp_dir)/$(libsubdir)
 	endif
diff --git a/cpp/bin/c++11/.gitignore b/cpp/bin/c++11/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cpp/bin/c++11/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 83c9b68191d..d9a94226f81 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -161,8 +161,8 @@ else
     include $(top_srcdir)/../config/Make.common.rules
 endif
 
-bindir			= $(top_srcdir)/bin$(cpp11suffix)
-libdir			= $(top_srcdir)/lib$(cpp11suffix)
+bindir			= $(top_srcdir)/bin
+libdir			= $(top_srcdir)/lib
 headerdir		= $(top_srcdir)/include
 
 #
diff --git a/cpp/lib/c++11/.gitignore b/cpp/lib/c++11/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cpp/lib/c++11/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/demoscript/Util.py b/demoscript/Util.py
index 2d2efda917b..d8650fc22dd 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -135,15 +135,12 @@ def configurePaths():
     libDir = None
     if not isWin32():
         libDir = os.path.join(getIceDir("cpp"), "lib")
-        if isDarwin() and cpp11:
-            libDir = os.path.join(libDir, "c++11")
 
     # 64-bits binaries are located in a subdirectory with binary
     # distributions.
     binDir = os.path.join(getIceDir("cpp"), "bin")
-    if isDarwin():
-        binDir = os.path.join(binDir, "c++11")
     addenv("PATH", binDir)
+
     if iceHome:
         if isWin32():
             subdir = None
@@ -169,6 +166,10 @@ def configurePaths():
                 libDir = libDir + "64"
                 binDir = binDir + "64"
             addenv("PATH", binDir)
+        elif isDarwin() and cpp11:
+            libDir = os.path.join(libDir, "c++11")
+            binDir = os.path.join(binDir, "c++11")
+            addenv("PATH", binDir)
 
     # Only add the lib directory to the shared library path if we're
     # not using the embedded location.
@@ -393,7 +394,7 @@ def run(demos, protobufDemos = [], root = False):
         --continue              Keep running when a demo fails."
         --ice-home=<path>       Use the binary distribution from the given path."
         --x64                   Binary distribution is 64-bit."
-        --cpp11                 Binary distribution is C++11."
+        --c++11                 Binary distribution is C++11."
         --preferIPv4            Prefer IPv4 stack (java only)."
         --fast                  Run an abbreviated version of the demos."
         --script                Generate a script to run the demos.
@@ -407,7 +408,7 @@ def run(demos, protobufDemos = [], root = False):
     try:
         opts, args = getopt.getopt(sys.argv[1:], "lr:R:", [
                 "filter=", "rfilter=", "start=", "loop", "fast", "trace=", "debug", "host=", "mode=",
-                "continue", "ice-home=", "x64", "preferIPv4", "env", "noenv", "script", "protobuf", "service-dir=", "cpp11"])
+                "continue", "ice-home=", "x64", "preferIPv4", "env", "noenv", "script", "protobuf", "service-dir=", "c++11"])
     except getopt.GetoptError:
         usage()
 
@@ -427,7 +428,7 @@ def run(demos, protobufDemos = [], root = False):
             global x64
             x64 = True
             arg += " " + o
-        elif o == "--cpp11":
+        elif o == "--c++11":
             global cpp11
             cpp11 = True
             arg += " " + o
@@ -659,10 +660,10 @@ def addLdPath(libpath):
 
 def processCmdLine():
     def usage():
-        print("usage: " + sys.argv[0] + " --x64 --preferIPv4 --env --noenv --fast --trace=output --debug --host host --mode=[debug|release] --ice-home=<dir> --service-dir=<dir>", "--cpp11")
+        print("usage: " + sys.argv[0] + " --x64 --preferIPv4 --env --noenv --fast --trace=output --debug --host host --mode=[debug|release] --ice-home=<dir> --service-dir=<dir>", "--c++11")
         sys.exit(2)
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "", ["env", "noenv", "x64", "preferIPv4", "fast", "trace=", "debug", "host=", "mode=", "ice-home=", "--servicedir=", "cpp11"])
+        opts, args = getopt.getopt(sys.argv[1:], "", ["env", "noenv", "x64", "preferIPv4", "fast", "trace=", "debug", "host=", "mode=", "ice-home=", "--servicedir=", "c++11"])
     except getopt.GetoptError:
         usage()
 
@@ -705,8 +706,7 @@ def processCmdLine():
             fast = True
         if o == "--x64":
             x64 = True
-        if o == "--cpp11":
-
+        if o == "--c++11":
             cpp11 = True
         if o == "--preferIPv4":
             preferIPv4 = True
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 1c8e59a4caa..b0f18ae0f5b 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -272,7 +272,7 @@ def run(tests, root = False):
           --no-ipv6               Don't use IPv6 addresses.
           --ice-home=<path>       Use the binary distribution from the given path.
           --x64                   Binary distribution is 64-bit.
-          --cpp11                 Binary distribution is C++11.
+          --c++11                 Binary distribution is c++11.
           --cross=lang            Run cross language test.
           --client-home=<dir>     Run cross test clients from the given Ice source distribution.
           --script                Generate a script to run the tests.
@@ -298,7 +298,7 @@ def run(tests, root = False):
                                     "debug", "protocol=", "compress", "valgrind", "host=", "serialize", "continue",
                                     "ipv6", "no-ipv6", "ice-home=", "cross=", "client-home=", "x64", "script", "env", 
                                     "sql-type=", "sql-db=", "sql-host=", "sql-port=", "sql-user=", "sql-passwd=", 
-                                    "service-dir=", "appverifier", "compact", "silverlight", "winrt", "server", "mx", "cpp11"])
+                                    "service-dir=", "appverifier", "compact", "silverlight", "winrt", "server", "mx", "c++11"])
     except getopt.GetoptError:
         usage()
 
@@ -364,7 +364,7 @@ def run(tests, root = False):
         if o in ( "--cross", "--protocol", "--host", "--debug", "--compress", "--valgrind", "--serialize", "--ipv6", \
                   "--ice-home", "--x64", "--env", "--sql-type", "--sql-db", "--sql-host", "--sql-port", "--sql-user", \
                   "--sql-passwd", "--service-dir", "--appverifier", "--compact", "--silverlight", "--winrt", \
-                  "--server", "--mx", "--client-home", "--cpp11"):
+                  "--server", "--mx", "--client-home", "--c++11"):
             arg += " " + o
             if len(a) > 0:
                 arg += " " + a
@@ -1409,8 +1409,6 @@ def createConfig(path, lines, enc=None):
 
 def getCppBinDir(lang = None):
     binDir = os.path.join(getIceDir("cpp"), "bin")
-    if isDarwin() and cpp11:
-        binDir = os.path.join(binDir, "c++11")
     if iceHome:
         if lang == None:
             lang = getDefaultMapping()
@@ -1424,6 +1422,8 @@ def getCppBinDir(lang = None):
                     binDir = os.path.join(binDir, "amd64")
             elif isWin32():
                 binDir = os.path.join(binDir, "x64")
+        if isDarwin() and cpp11:
+          binDir = os.path.join(binDir, "c++11")
     return binDir
 
 def getServiceDir():
@@ -1468,9 +1468,8 @@ def getTestEnv(lang, testdir):
         libDir = getCppBinDir(lang)
     else:
         libDir = os.path.join(getIceDir("cpp", testdir), "lib")
-        if isDarwin() and cpp11:
-            libDir = os.path.join(libDir, "c++11")
-        if iceHome and x64:
+        if iceHome:
+          if x64:
             if isSolaris():
                 if isSparc():
                     libDir = os.path.join(libDir, "64")
@@ -1478,6 +1477,9 @@ def getTestEnv(lang, testdir):
                     libDir = os.path.join(libDir, "amd64")
             elif not isDarwin():
                 libDir = libDir + "64"
+          if isDarwin() and cpp11:
+            libDir = os.path.join(libDir, "c++11")
+
     addLdPath(libDir, env)
 
     if lang == "javae":
@@ -1602,7 +1604,7 @@ def processCmdLine():
           --ipv6                  Use IPv6 addresses.
           --ice-home=<path>       Use the binary distribution from the given path.
           --x64                   Binary distribution is 64-bit.
-          --cpp11                 Binary distribution is c++11.
+          --c++11                 Binary distribution is c++11.
           --env                   Print important environment variables.
           --cross=lang            Run cross language test.
           --client-home=<dir>      Run cross test clients from the given Ice source distribution.
@@ -1626,7 +1628,7 @@ def processCmdLine():
             sys.argv[1:], "", ["debug", "trace=", "protocol=", "compress", "valgrind", "host=", "serialize", "ipv6", \
                                "ice-home=", "x64", "cross=", "client-home=", "env", "sql-type=", "sql-db=", \
                                "sql-host=", "sql-port=", "sql-user=", "sql-passwd=", "service-dir=", "appverifier", \
-                               "compact", "silverlight", "winrt", "server", "mx", "cpp11"])
+                               "compact", "silverlight", "winrt", "server", "mx", "c++11"])
     except getopt.GetoptError:
         usage()
 
@@ -1654,7 +1656,7 @@ def processCmdLine():
         elif o == "--x64":
             global x64
             x64 = True
-        elif o == "--cpp11":
+        elif o == "--c++11":
             global cpp11
             cpp11 = True
         elif o == "--compress":