Windows build instructions updates

3 files changed, 19 insertions, 62 deletions

diff --git a/cpp/BuildInstructionsWindows.md b/cpp/BuildInstructionsWindows.md
index 1af06f0ee81..136740cf5d0 100644
--- a/cpp/BuildInstructionsWindows.md
+++ b/cpp/BuildInstructionsWindows.md
@@ -85,11 +85,7 @@ certificate password respectivelly before build.
 
 It is also possible to build the test suite using the binary Nuget packages, use:
 
-    MSbuild msbuild\ice.proj /p:UseNugetBinDist=yes
-
-Finally to build the test suite using the MSI binary distribution use:
-
-    MSbuild msbuild\ice.proj /p:UseBinDist=yes /p:"IceHome=C:\Program Files (x86)\Ice-3.7.0"
+    MSbuild msbuild\ice.proj /p:UseBinDist=yes
 
 ## Building Ice for UWP
 
@@ -128,10 +124,10 @@ For example to build release binaries and libraries for Windows `x64` platform u
 
     MSbuild msbuild\ice.proj /t:UWPBuild /p:Configuration=Release /p:Platform=x64
 
-If you want to skip building the test suite you can use the `WPBuildDist` MSbuild
+If you want to skip building the test suite you can use the `UWPBuildDist` MSbuild
 target:
 
-    MSbuild msbuild\ice.proj /t:UWPBuildDist  /p:Configuration=Release /p:Platform=x64
+    MSbuild msbuild\ice.proj /t:UWPBuildDist /p:Configuration=Release /p:Platform=x64
 
 It is also possible to build all supported platforms and configurations at once,
 with the following command:
@@ -142,26 +138,21 @@ It is also possible to build the test suite using the binary Nuget packages, use
 
     MSbuild msbuild\ice.proj /t:UWPBuild /p:UseNugetBinDist=yes
 
-Finally to build the test suite using the MSI binary distribution use:
-
-    MSbuild msbuild\ice.proj /t:UWPBuild /p:UseBinDist=yes /p:"IceHome=C:\Program Files (x86)\Ice-3.7.0"
-
-
 ## Nuget packages
 
 To create a Nuget package for the distribution use the following command:
 
     MSbuild msbuild\ice.proj /t:NugetPack /p:BuildAllConfigurations=yes
 
-This will create `zeroc.ice.v120\zeroc.ice.v120.nuckpkg` or `zeroc.ice.v140\zeroc.ice.v140.nuckpkg`
+This will create `zeroc.ice.v120\zeroc.ice.v120.nupkg` or `zeroc.ice.v140\zeroc.ice.v140.nupkg`
 depending of the compiler version you are using to build the package.
 
 To create UWP Nuget packages you must use the `UWPNugetPack` target instead:
 
     MSbuild msbuild\ice.proj /t:UWPNugetPack /p:BuildAllConfigurations=yes
 
-This will create `zeroc.ice.uwp\zeroc.ice.uwp.nuckpkg`, `zeroc.ice.uwp.arm\zeroc.ice.uwp.arm.nuckpkg`,
-`zeroc.ice.uwp.x64\zeroc.ice.uwp.x64.nuckpkg` and `zeroc.ice.uwp.x86\zeroc.ice.uwp.x96.nuckpkg packages`.
+This will create `zeroc.ice.uwp\zeroc.ice.uwp.nupkg`, `zeroc.ice.uwp.arm\zeroc.ice.uwp.arm.nupkg`,
+`zeroc.ice.uwp.x64\zeroc.ice.uwp.x64.nupkg` and `zeroc.ice.uwp.x86\zeroc.ice.uwp.x96.nupkg` packages.
 
 ## Running the Test Suite
 
@@ -172,11 +163,11 @@ require the Python module `passlib`, which you can install with the command:
 
 After a successful source build, you can run the tests as follows:
 
-    python allTests.py --mode=debug --x86
+    python allTests.py
 
-For C++11 mapping you need to use the `--c++11` argument:
+For C++11 mapping you need to use the `Cpp11-Debug` or `Cpp11-Release` configuration:
 
-    $ python allTests.py --mode=debug --x86 --c++11
+    $ python allTests.py --config Cpp11-Debug
 
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
diff --git a/java-compat/BuildInstructions.md b/java-compat/BuildInstructions.md
index fed287e85c4..3321f176185 100644
--- a/java-compat/BuildInstructions.md
+++ b/java-compat/BuildInstructions.md
@@ -71,20 +71,15 @@ on Unix:
 
 On Windows:
 
-    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a3
+    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a3 (MSI installation)
 
-You will also need to set `CPP_PLATFORM` and `CPP_CONFIGURATION` to much your C++
-build configuration in order for gradle o locate the slice2java compiler
-
-For example if you build C++ sources for `x64` platform in `Release` mode set
-this properties as:
+On Windows if you are using Ice for C++ from a source distribution, you must
+set `CPP_PLATFORM` and `CPP_CONFIGURATION` environment variables to match the
+platform and configuration used in your C++ builds:
 
     > set CPP_PLATFORM=x64
     > set CPP_CONFIGURATION=Debug
 
-The supported values for `CPP_PLATFORM` are `Win32` and `x64`and the supported
-values for `CPP_CONFIGURATION` are `Debug` and `Release`
-
 Before building Ice for Java, review the settings in the file
 `gradle.properties` and edit as necessary.
 
@@ -136,30 +131,16 @@ Ice installation. On Unix:
 
 On Windows:
 
-    > set ICE_HOME=c:\Program Files (x86)\ZeroC\Ice-3.7a3
+    > set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7a3
 
 Python is required to run the test suite. To run the tests, open a command
 window and change to the top-level directory. At the command prompt, execute:
 
     > python allTests.py
 
-You can also run tests individually by changing to the test directory and
-running this command:
-
-    > python run.py
-
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
 
-## Test Controller
-
-The test Controller is an Ice server that starts servers for languages that
-don't provide a full server side implementation. This is currently used by
-the JavaScript and WinRT test suites to start the required servers.
-
-    > gradlew :testController:assemble
-
-
 [1]: https://zeroc.com/download.html
 [2]: https://doc.zeroc.com/display/Ice37/Supported+Platforms+for+Ice+3.7.0
 [3]: http://gradle.org
diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md
index 27d0c0a0978..13dc5b87ce3 100644
--- a/java/BuildInstructions.md
+++ b/java/BuildInstructions.md
@@ -107,13 +107,11 @@ on Unix:
 
 On Windows:
 
-    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a3
+    > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.7a3 (MSI installation)
 
-You will also need to set `CPP_PLATFORM` and `CPP_CONFIGURATION` to much your C++
-build configuration in order for gradle o locate the slice2java compiler
-
-For example if you build C++ sources for `x64` platform in `Release` mode set
-this properties as:
+On Windows if you are using Ice for C++ from a source distribution, you must
+set `CPP_PLATFORM` and `CPP_CONFIGURATION` environment variables to match the
+platform and configuration used in your C++ builds:
 
     > set CPP_PLATFORM=x64
     > set CPP_CONFIGURATION=Debug
@@ -172,18 +170,13 @@ Ice installation. On Unix:
 
 On Windows:
 
-    > set ICE_HOME=c:\Program Files (x86)\ZeroC\Ice-3.7a3
+    > set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7a3
 
 Python is required to run the test suite. To run the tests, open a command
 window and change to the top-level directory. At the command prompt, execute:
 
     > python allTests.py
 
-You can also run tests individually by changing to the test directory and
-running this command:
-
-    > python run.py
-
 If everything worked out, you should see lots of `ok` messages. In case of a
 failure, the tests abort with `failed`.
 
@@ -200,14 +193,6 @@ You can start the tool with the following command:
 In OS X there is also an application bundle named IceGrid Admin. You can start
 the IceGrid Admin tool by double-clicking the IceGrid Admin icon in Finder.
 
-## Test Controller
-
-The test Controller is an Ice server that starts servers for languages that
-don't provide a full server side implementation. This is currently used by
-the JavaScript and WinRT test suites to start the required servers.
-
-    > gradlew :testController:assemble
-
 
 [1]: https://zeroc.com/download.html
 [2]: https://doc.zeroc.com/display/Ice37/Supported+Platforms+for+Ice+3.7.0