CPP-452 - Allow OpenSSL to build DLL when static libs requested

--- vc_build.bat
+++ vc_build.bat
@@ -39,6 +39,7 @@
 SET ARGUMENT_USE_BOOST_ATOMIC=--USE-BOOST-ATOMIC
 SET ARGUMENT_LIBRARY_TYPE_SHARED=--SHARED
 SET ARGUMENT_LIBRARY_TYPE_STATIC=--STATIC
+SET ARGUMENT_ENABLE_SHARED_OPENSSL=--ENABLE-SHARED-OPENSSL
 SET ARGUMENT_TARGET_ARCHITECTURE_32BIT=--X86
 SET ARGUMENT_TARGET_ARCHITECTURE_64BIT=--X64
 SET ARGUMENT_TARGET_COMPILER=--TARGET-COMPILER
@@ -152,6 +153,7 @@
 SET ENABLE_ZLIB=%FALSE%
 SET GENERATE_SOLUTION=%FALSE%
 SET LIBRARY_TYPE=%LIBRARY_TYPE_SHARED%
+SET ENABLE_SHARED_OPENSSL=%FALSE%
 SET TARGET_ARCHITECTURE=%SYSTEM_ARCHITECTURE%
 SET USE_BOOST_ATOMIC=%FALSE%
 SET ARGUMENT_IS_TEST=%FALSE%
@@ -178,6 +180,9 @@
   )
   IF "!ARGUMENT!" == "!ARGUMENT_LIBRARY_TYPE_STATIC!" (
     SET LIBRARY_TYPE=!LIBRARY_TYPE_STATIC!
+  )
+  IF "!ARGUMENT!" == "!ARGUMENT_ENABLE_SHARED_OPENSSL!" (
+    SET ENABLE_SHARED_OPENSSL=!TRUE!
   )

   REM Target architecture (32/64 bit)
@@ -324,6 +329,9 @@
 REM Ensure static builds are enabled and packages are disabled (if tests)
 IF !IS_TESTING_ENABLED! EQU !TRUE! (
   REM Force static for static linking
+  IF "!LIBRARY_TYPE!" == "!LIBRARY_TYPE_SHARED!" (
+    ECHO Force Static Linking: Testing overrides shared linking
+  )
   SET LIBRARY_TYPE=!LIBRARY_TYPE_STATIC!

   REM Determine if package build should be disabled
@@ -666,7 +674,7 @@
 IF NOT EXIST "!ABSOLUTE_DEPENDENCIES_CASSANDRA_CPP_DRIVER_SOURCE_DIRECTORY!\include\cassandra.h" (
   PUSHD "!ABSOLUTE_BATCH_DIRECTORY!" > NUL
   ECHO Update cpp-driver submodule > "!LOG_DRIVER_BUILD!"
-  ECHO | SET /P=Update cpp-driver submodule ...
+  ECHO | SET /P=Update cpp-driver submodule ...
   !GIT! submodule update --init --recursive >> "!LOG_DRIVER_BUILD!" 2>&1
   IF !ERRORLEVEL! EQU 0 (
     ECHO done.
@@ -684,7 +692,7 @@
   IF !IS_TESTING_ENABLED! EQU !FALSE! (
     REM Clone Boost atomic and checkout the appropriate tag
     ECHO Gathering Boost atomic ^(and dependencies^) !BOOST_BRANCH_TAG_VERSION! > "!LOG_BOOST_CLONE!"
-    ECHO | SET /P=Gathering Boost atomic ^(and dependencies^) !BOOST_BRANCH_TAG_VERSION! ...
+    ECHO | SET /P=Gathering Boost atomic ^(and dependencies^) !BOOST_BRANCH_TAG_VERSION! ...
     SET "BOOST_ATOMIC_DEPENDENCIES=atomic assert config mpl preprocessor static_assert type_traits"
     IF NOT EXIST "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!BOOST_DIRECTORY!\include" MKDIR "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!BOOST_DIRECTORY!\include"
     REM Store current Visual Studio tools environment variables
@@ -710,14 +718,14 @@
 REM Clone libuv and checkout the appropriate tag
 IF NOT EXIST "!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBUV_DIRECTORY!" (
   ECHO Cloning libuv !LIBUV_BRANCH_TAG_VERSION! > "!LOG_LIBUV_BUILD!"
-  ECHO | SET /P=Cloning libuv !LIBUV_BRANCH_TAG_VERSION! ...
+  ECHO | SET /P=Cloning libuv !LIBUV_BRANCH_TAG_VERSION! ...
   !GIT! clone --depth 1 --branch !LIBUV_BRANCH_TAG_VERSION! --single-branch !LIBUV_REPOSITORY_URL! "!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBUV_DIRECTORY!" >> "!LOG_LIBUV_BUILD!" 2>&1
   IF !ERRORLEVEL! EQU 0 (
     ECHO done.
     REM Clone GYP (libuv dependency) to correctly use googlesource URL
     ECHO. >> "!LOG_LIBUV_BUILD!"
     ECHO Cloning gyp >> "!LOG_LIBUV_BUILD!"
-    ECHO | SET /P=Cloning gyp ...
+    ECHO | SET /P=Cloning gyp ...
     !GIT! clone --depth 1 --single-branch !GYP_REPOSITORY_URL! "!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBUV_DIRECTORY!\build\gyp" >> "!LOG_LIBUV_BUILD!" 2>&1
     IF !ERRORLEVEL! EQU 0 (
       ECHO done.
@@ -737,7 +745,7 @@
 IF !ENABLE_ZLIB! EQU !TRUE! (
   IF NOT EXIST "!DEPENDENCIES_SOURCE_DIRECTORY!\!ZLIB_DIRECTORY!" (
     ECHO Cloning zlib !ZLIB_BRANCH_TAG_VERSION! > "!LOG_ZLIB_BUILD!"
-    ECHO | SET /P=Cloning zlib !ZLIB_BRANCH_TAG_VERSION! ...
+    ECHO | SET /P=Cloning zlib !ZLIB_BRANCH_TAG_VERSION! ...
     !GIT! clone --depth 1 --branch !ZLIB_BRANCH_TAG_VERSION! --single-branch !ZLIB_REPOSITORY_URL! "!DEPENDENCIES_SOURCE_DIRECTORY!\!ZLIB_DIRECTORY!" >> "!LOG_ZLIB_BUILD!" 2>&1
     IF !ERRORLEVEL! EQU 0 (
       ECHO done.
@@ -754,7 +762,7 @@
   REM Clone libssh2
   IF NOT EXIST "!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBSSH2_DIRECTORY!" (
     ECHO Cloning libssh2 !LIBSSH2_BRANCH_TAG_VERSION! > "!LOG_LIBSSH2_BUILD!"
-    ECHO | SET /P=Cloning libssh2 !LIBSSH2_BRANCH_TAG_VERSION! ...
+    ECHO | SET /P=Cloning libssh2 !LIBSSH2_BRANCH_TAG_VERSION! ...
     !GIT! clone --depth 1 --branch !LIBSSH2_BRANCH_TAG_VERSION! --single-branch !LIBSSH2_REPOSITORY_URL! "!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBSSH2_DIRECTORY!" >> "!LOG_LIBSSH2_BUILD!" 2>&1
     IF !ERRORLEVEL! EQU 0 (
       ECHO done.
@@ -769,7 +777,7 @@
 REM Clone OpenSSL and checkout the appropriate tag
 IF NOT EXIST "!DEPENDENCIES_SOURCE_DIRECTORY!\!OPENSSL_DIRECTORY!" (
   ECHO Cloning OpenSSL !OPENSSL_BRANCH_TAG_VERSION! > "!LOG_OPENSSL_BUILD!"
-  ECHO | SET /P=Cloning OpenSSL !OPENSSL_BRANCH_TAG_VERSION! ...
+  ECHO | SET /P=Cloning OpenSSL !OPENSSL_BRANCH_TAG_VERSION! ...
   !GIT! clone --depth 1 --branch !OPENSSL_BRANCH_TAG_VERSION! --single-branch !OPENSSL_REPOSITORY_URL! "!DEPENDENCIES_SOURCE_DIRECTORY!\!OPENSSL_DIRECTORY!" >> "!LOG_OPENSSL_BUILD!" 2>&1
   IF !ERRORLEVEL! EQU 0 (
     ECHO done.
@@ -809,8 +817,7 @@

   REM Determine if OpenSSL needs to be built
   IF NOT EXIST "!ABSOLUTE_OPENSSL_LIBRARY_DIRECTORY!" (
-    REM Determine if OpenSSL should be built with zlib support
-    CALL :BUILDOPENSSL "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!OPENSSL_DIRECTORY!" "!ABSOLUTE_OPENSSL_LIBRARY_DIRECTORY!" "!ABSOLUTE_ZLIB_LIBRARY_DIRECTORY!" !TARGET_ARCHITECTURE! !LIBRARY_TYPE! !FALSE! "!LOG_OPENSSL_BUILD!"
+    CALL :BUILDOPENSSL "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!OPENSSL_DIRECTORY!" "!ABSOLUTE_OPENSSL_LIBRARY_DIRECTORY!" "!ABSOLUTE_ZLIB_LIBRARY_DIRECTORY!" !TARGET_ARCHITECTURE! !LIBRARY_TYPE! !ENABLE_SHARED_OPENSSL! !FALSE! "!LOG_OPENSSL_BUILD!"
     IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
   )

@@ -847,7 +854,7 @@
     REM Determine if dependencies should be copied
     IF !DRIVER_INSTALLATION_DIRECTORY_OVERRIDDEN! EQU !TRUE! (
       IF EXIST "!DRIVER_INSTALLATION_DIRECTORY!\..\" (
-        ECHO | SET /P=Installing cpp-driver dependencies ...
+        ECHO | SET /P=Installing cpp-driver dependencies ...
         XCOPY /E /Y "!ABSOLUTE_DEPENDENCIES_LIBRARIES_DIRECTORY!" "!DRIVER_INSTALLATION_DIRECTORY!\..\" >> "!LOG_DRIVER_BUILD!" 2>&1
         IF NOT !ERRORLEVEL! EQU 0 (
           ECHO FAILED!
@@ -932,7 +939,7 @@
         REM Build the dependencies and driver
         CALL :BUILDLIBUV "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!LIBUV_DIRECTORY!" "!ABSOLUTE_DEPENDENCY_PACKAGE_LIBUV_INSTALLATION_DIRECTORY!" %%C %%D !FALSE! !TRUE! "!LOG_LIBUV_BUILD!"
         IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
-        CALL :BUILDOPENSSL "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!OPENSSL_DIRECTORY!" "!ABSOLUTE_DEPENDENCY_PACKAGE_OPENSSL_INSTALLATION_DIRECTORY!" "" %%C %%D !TRUE! "!LOG_OPENSSL_BUILD!"
+        CALL :BUILDOPENSSL "!ABSOLUTE_DEPENDENCIES_DIRECTORY!\!DEPENDENCIES_SOURCE_DIRECTORY!\!OPENSSL_DIRECTORY!" "!ABSOLUTE_DEPENDENCY_PACKAGE_OPENSSL_INSTALLATION_DIRECTORY!" "" %%C %%D !FALSE! !TRUE! "!LOG_OPENSSL_BUILD!"
         IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
         IF !BUILD_DEPENDENCIES_ONLY! EQU !FALSE! (
           IF EXIST "!ABSOLUTE_BUILD_DIRECTORY!\!DRIVER_DRIVER_DIRECTORY!" CALL :CLEANDIRECTORY "!ABSOLUTE_BUILD_DIRECTORY!\!DRIVER_DRIVER_DIRECTORY!" "Cleaning driver library directory"
@@ -975,7 +982,7 @@

       REM Build the zip packages for the current target architecture and Visual Studio version
       IF !BUILD_DEPENDENCIES_ONLY! EQU !FALSE! (
-        ECHO | SET /P=Building the driver package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
+        ECHO | SET /P=Building the driver package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
         ECHO !ZIP! a -tzip !ABSOLUTE_PACKAGES_DIRECTORY!\!BUILD_PACKAGE_PREFIX!-!BUILD_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip -r !ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\ -xr^^!!DEPENDENCIES_DIRECTORY! >> "!LOG_PACKAGE_BUILD!"
         !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\!BUILD_PACKAGE_PREFIX!-!BUILD_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r "!ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\*" -xr^^!!DEPENDENCIES_DIRECTORY! >> "!LOG_PACKAGE_BUILD!" 2>&1
         IF NOT !ERRORLEVEL! EQU 0 (
@@ -985,7 +992,7 @@
         )
         ECHO done.
       )
-      ECHO | SET /P=Building the libuv package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
+      ECHO | SET /P=Building the libuv package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
       ECHO !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\libuv-!LIBUV_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r !ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!LIBUV_DIRECTORY!\ >> "!LOG_PACKAGE_BUILD!"
       !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\libuv-!LIBUV_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r "!ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!LIBUV_DIRECTORY!\*" >> "!LOG_PACKAGE_BUILD!" 2>&1
       IF NOT !ERRORLEVEL! EQU 0 (
@@ -994,7 +1001,7 @@
         EXIT /B !EXIT_CODE_PACKAGE_FAILED!
       )
       ECHO done.
-      ECHO | SET /P=Building the OpenSSL package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
+      ECHO | SET /P=Building the OpenSSL package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
       ECHO !ZIP! a -tzip !ABSOLUTE_PACKAGES_DIRECTORY!\openssl-!OPENSSL_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip -r !ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!OPENSSL_DIRECTORY!\ >> "!LOG_PACKAGE_BUILD!"
       !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\openssl-!OPENSSL_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r "!ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!OPENSSL_DIRECTORY!\*" >> "!LOG_PACKAGE_BUILD!" 2>&1
       IF NOT !ERRORLEVEL! EQU 0 (
@@ -1004,7 +1011,7 @@
       )
       ECHO done.
       IF !ENABLE_LIBSSH2! EQU !TRUE! (
-        ECHO | SET /P=Building the libssh2 package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
+        ECHO | SET /P=Building the libssh2 package for Win%%C MSVC!VISUAL_STUDIO_INTERNAL_VERSION! ...
         ECHO !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\libssh2-!LIBSSH2_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r !ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!LIBSSH2_DIRECTORY!\ >> "!LOG_PACKAGE_BUILD!"
         !ZIP! a -tzip "!ABSOLUTE_PACKAGES_DIRECTORY!\libssh2-!LIBSSH2_PACKAGE_VERSION!-win%%C-msvc!VISUAL_STUDIO_INTERNAL_VERSION!.zip" -r "!ABSOLUTE_DRIVER_PACKAGE_INSTALLATION_DIRECTORY!\!DEPENDENCIES_DIRECTORY!\!LIBSSH2_DIRECTORY!\*" >> "!LOG_PACKAGE_BUILD!" 2>&1
         IF NOT !ERRORLEVEL! EQU 0 (
@@ -1067,6 +1074,7 @@
   ECHO     !ARGUMENT_INSTALLATION_DIRECTORY! [install-dir]       Override installation directory
   ECHO     !ARGUMENT_LIBRARY_TYPE_SHARED!                          Build shared library ^(default^)
   ECHO     !ARGUMENT_LIBRARY_TYPE_STATIC!                          Build static library
+  ECHO     !ARGUMENT_ENABLE_SHARED_OPENSSL!           Force shared OpenSSL library
   IF !SYSTEM_ARCHITECTURE! EQU !ARCHITECTURE_32BIT! (
     ECHO     !ARGUMENT_TARGET_ARCHITECTURE_32BIT!                             Target 32-bit build ^(default^)
     ECHO     !ARGUMENT_TARGET_ARCHITECTURE_64BIT!                             Target 64-bit build
@@ -1186,7 +1194,7 @@
 REM @param message Message to display during clean
 :CLEANDIRECTORY [directory] [message]
   IF EXIST "%~1" (
-    ECHO | SET /P=%~2 ...
+    ECHO | SET /P=%~2 ...
     RMDIR /S /Q "%~1" > NUL 2>&1
     IF NOT EXIST "%~1" (
       ECHO done.
@@ -1245,7 +1253,7 @@
   ) ELSE (
     SET LIBUV_LIBRARY_TYPE=static
   )
-  ECHO | SET /P=Configuring libuv ...
+  ECHO | SET /P=Configuring libuv ...
   REM Modify the libuv build script to ensure proper Visual Studio detection
   SET LIBUV_VCBUILD_SCRIPT=vcbuild.bat
   IF "!LIBUV_IS_WINDOWS_SDK_BUILD!" == "!FALSE!" (
@@ -1294,7 +1302,7 @@
     SET "PATH=!BEFORE_BATCH_CALL_PATH!"
     SET BEFORE_BATCH_CALL_PATH=
   )
-  ECHO | SET /P=Building libuv ...
+  ECHO | SET /P=Building libuv ...
   ECHO !MSBUILD! uv.sln /T:libuv /P:Configuration=Release /P:Platform=!LIBUV_VC_TARGET_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO >> "!LIBUV_LOG_FILENAME!"
   !MSBUILD! uv.sln /T:libuv /P:Configuration=Release /P:Platform=!LIBUV_VC_TARGET_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO >> "!LIBUV_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
@@ -1303,7 +1311,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Installing libuv ...
+  ECHO | SET /P=Installing libuv ...
   MKDIR "!LIBUV_INSTALL_DIRECTORY!\!LIBRARY_INCLUDE_DIRECTORY!"
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1334,7 +1342,7 @@
   )
   ECHO done.
   IF "!LIBUV_IS_CLEAN_AFTER_INSTALL!" == "!TRUE!" (
-    ECHO | SET /P=Cleaning libuv build ...
+    ECHO | SET /P=Cleaning libuv build ...
     ECHO !MSBUILD! uv.sln /T:Clean /P:Configuration=Release /P:Platform=!LIBUV_VC_TARGET_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO >> "!LIBUV_LOG_FILENAME!"
     !MSBUILD! uv.sln /T:Clean /P:Configuration=Release /P:Platform=!LIBUV_VC_TARGET_ARCHITECTURE! /CLP:NoSummary;NoItemAndPropertyList;Verbosity=minimal /NOLOGO >> "!LIBUV_LOG_FILENAME!" 2>&1
     IF EXIST Release RMDIR /S /Q Release >> "!LIBUV_LOG_FILENAME!" 2>&1
@@ -1353,8 +1361,13 @@
 REM @param library-type Shared or static
 REM @param is-clean-after-install True if clean should be performed after
 REM                               install; false otherwise
+REM @param is-force-shared True if OpenSSL library should be built as a shared
+REM                        library; false otherwise
+REM                        NOTE: If [library-type] is static and
+REM                              [zlib-library-directory] is valid then zlib
+REM                              will be statically linked
 REM @param log-filename Absolute path and filename for log output
-:BUILDOPENSSL [source-directory] [install-directory] [zlib-library-directory] [target-architecture] [library-type] [is-clean-after-install] [log-filename]
+:BUILDOPENSSL [source-directory] [install-directory] [zlib-library-directory] [target-architecture] [library-type] [is-force-shared] [is-clean-after-install] [log-filename]
   REM Create library variables from arguments
   SET "OPENSSL_SOURCE_DIRECTORY=%~1"
   SHIFT
@@ -1365,6 +1378,8 @@
   SET OPENSSL_TARGET_ARCHITECTURE=%~1
   SHIFT
   SET "OPENSSL_LIBRARY_TYPE=%~1"
+  SHIFT
+  SET OPENSSL_IS_FORCE_SHARED=%~1
   SHIFT
   SET OPENSSL_IS_CLEAN_AFTER_INSTALL=%~1
   SHIFT
@@ -1373,7 +1388,7 @@
   REM Build OpenSSL dependency
   ECHO Building OpenSSL
   PUSHD "!OPENSSL_SOURCE_DIRECTORY!" > NUL
-  ECHO | SET /P=Configuring OpenSSL ...
+  ECHO | SET /P=Configuring OpenSSL ...
   SET "OPENSSL_CONFIGURE_OPTIONS=Configure"
   IF !OPENSSL_TARGET_ARCHITECTURE! EQU !ARCHITECTURE_32BIT! (
     SET "OPENSSL_CONFIGURE_OPTIONS=!OPENSSL_CONFIGURE_OPTIONS! VC-WIN32 no-asm"
@@ -1389,6 +1404,7 @@
     CALL :SHORTENPATH "!DEPENDENCY_ZLIB_LIBRARY_DIRECTORY!" SHORTENED_DEPENDENCY_ZLIB_LIBRARY_DIRECTORY
     SET "OPENSSL_CONFIGURE_OPTIONS=!OPENSSL_CONFIGURE_OPTIONS! zlib --with-zlib-include=^"!SHORTENED_DEPENDENCY_ZLIB_LIBRARY_DIRECTORY!\!LIBRARY_INCLUDE_DIRECTORY!^" --with-zlib-lib=^"!SHORTENED_DEPENDENCY_ZLIB_LIBRARY_DIRECTORY!\!LIBRARY_BINARY_DIRECTORY!\!DEPENDENCY_ZLIB_LIBRARY_FILENAME!^""
   )
+  IF !OPENSSL_IS_FORCE_SHARED! EQU !TRUE! SET OPENSSL_LIBRARY_TYPE=!LIBRARY_TYPE_SHARED!
   CALL :SHORTENPATH "!OPENSSL_INSTALL_DIRECTORY!" SHORTENED_OPENSSL_INSTALL_DIRECTORY
   !PERL! !OPENSSL_CONFIGURE_OPTIONS! enable-static-engine --openssldir=!SHORTENED_OPENSSL_INSTALL_DIRECTORY! --prefix=!SHORTENED_OPENSSL_INSTALL_DIRECTORY! >> "!OPENSSL_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
@@ -1397,7 +1413,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Building OpenSSL ...
+  ECHO | SET /P=Building OpenSSL ...
   IF !OPENSSL_TARGET_ARCHITECTURE! EQU !ARCHITECTURE_32BIT! (
     CALL ms\do_ms.bat >> "!OPENSSL_LOG_FILENAME!" 2>&1
   ) ELSE (
@@ -1415,7 +1431,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Installing OpenSSL ...
+  ECHO | SET /P=Installing OpenSSL ...
   !NMAKE! /F !OPENSSL_MAKEFILE! install >> "!OPENSSL_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1424,7 +1440,7 @@
   )
   ECHO done.
   IF !OPENSSL_IS_CLEAN_AFTER_INSTALL! EQU !TRUE! (
-    ECHO | SET /P=Cleaning OpenSSL build ...
+    ECHO | SET /P=Cleaning OpenSSL build ...
     !NMAKE! /F !OPENSSL_MAKEFILE! clean >> "!OPENSSL_LOG_FILENAME!" 2>&1
     ECHO done.
   )
@@ -1449,7 +1465,7 @@
   PUSHD "!ZLIB_SOURCE_DIRECTORY!" > NUL
   IF NOT EXIST build MKDIR build
   PUSHD build > NUL
-  ECHO | SET /P=Configuring zlib ...
+  ECHO | SET /P=Configuring zlib ...
   !CMAKE! -G "NMake Makefiles" -DCMAKE_C_FLAGS_RELEASE="/MT /NDEBUG" -DCMAKE_INSTALL_PREFIX="!ZLIB_INSTALL_DIRECTORY!" -DCMAKE_BUILD_TYPE=!BUILD_TYPE_RELEASE! .. >> "!ZLIB_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1457,7 +1473,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Building zlib ...
+  ECHO | SET /P=Building zlib ...
   !CMAKE! --build . --config !BUILD_TYPE_RELEASE! >> "!ZLIB_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1465,7 +1481,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Installing zlib ...
+  ECHO | SET /P=Installing zlib ...
   !CMAKE! --build . --config !BUILD_TYPE_RELEASE! --target install\fast >> "!ZLIB_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1511,7 +1527,7 @@
   REM Build libssh2 dependency
   IF NOT EXIST "!LIBSSH2_SOURCE_DIRECTORY!\build" MKDIR "!LIBSSH2_SOURCE_DIRECTORY!\build"
   PUSHD "!LIBSSH2_SOURCE_DIRECTORY!\build" > NUL
-  ECHO | SET /P=Configuring libssh2 ...
+  ECHO | SET /P=Configuring libssh2 ...
   IF NOT "!LIBSSH2_VISUAL_STUDIO_VERSION!" == "" (
     SET "LIBSSH2_CMAKE_COMMAND_LINE=-G ^"Visual Studio !LIBSSH2_VISUAL_STUDIO_VERSION!"
     IF !LIBSSH2_TARGET_ARCHITECTURE! EQU !ARCHITECTURE_64BIT! (
@@ -1531,7 +1547,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Building libssh2 ...
+  ECHO | SET /P=Building libssh2 ...
   !CMAKE! --build . --config !BUILD_TYPE_RELEASE! >> "!LIBSSH2_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1539,7 +1555,7 @@
     EXIT /B !EXIT_CODE_BUILD_DEPENDENCY_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Installing libssh2 ...
+  ECHO | SET /P=Installing libssh2 ...
   !CMAKE! --build . --config !BUILD_TYPE_RELEASE! --target install >> "!LIBSSH2_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1548,7 +1564,7 @@
   )
   ECHO done.
   IF !LIBSSH2_IS_CLEAN_AFTER_INSTALL! EQU !TRUE! (
-    ECHO | SET /P=Cleaning libssh2 build ...
+    ECHO | SET /P=Cleaning libssh2 build ...
     DEL /S /Q * >> "!LIBSSH2_LOG_FILENAME!" 2>&1
     ECHO done.
   )
@@ -1621,9 +1637,9 @@
   IF NOT EXIST "!DRIVER_BUILD_DIRECTORY!" MKDIR "!DRIVER_BUILD_DIRECTORY!"
   PUSHD "!DRIVER_BUILD_DIRECTORY!" > NUL
   IF !DRIVER_GENERATE_SOLUTION! EQU !TRUE! (
-    ECHO | SET /P=Generating driver solution ...
-  ) ELSE (
-    ECHO | SET /P=Configuring driver ...
+    ECHO | SET /P=Generating driver solution ...
+  ) ELSE (
+    ECHO | SET /P=Configuring driver ...
   )
   IF NOT "!DRIVER_VISUAL_STUDIO_VERSION!" == "" (
     SET "DRIVER_CMAKE_COMMAND_LINE=-G ^"Visual Studio !DRIVER_VISUAL_STUDIO_VERSION!"
@@ -1674,7 +1690,7 @@
     POPD
     EXIT /B
   )
-  ECHO | SET /P=Building driver ...
+  ECHO | SET /P=Building driver ...
   !CMAKE! --build . --config !DRIVER_BUILD_TYPE! >> "!DRIVER_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!
@@ -1682,7 +1698,7 @@
     EXIT /B !EXIT_CODE_BUILD_DRIVER_FAILED!
   )
   ECHO done.
-  ECHO | SET /P=Installing driver ...
+  ECHO | SET /P=Installing driver ...
   !CMAKE! --build . --config !DRIVER_BUILD_TYPE! --target install >> "!DRIVER_LOG_FILENAME!" 2>&1
   IF NOT !ERRORLEVEL! EQU 0 (
     ECHO FAILED!


Addition of clean and build all command.

SVN-Revision: 147

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -8,6 +8,10 @@
     ant usage
     goto DONE
 )
+if "%1" == "all" (
+    ant build:all
+    goto DONE
+)
 if "%1" == "upgrade" (
     ant deploy:local:upgrade
     goto DONE
@@ -16,9 +20,17 @@
     ant deploy:hot
     goto DONE
 )
+if "%1" == "clean" (
+    ant clean
+    if exist ..\target\*.* (
+       rmdir /Q /S ..\target
+    )
+    goto DONE
+)
 if "%1" == "dev" (
     ant -Dproperties.file=C:\SVN-Projects\ncim-properties\properties\dev-upgrade.properties deploy:remote:upgrade
     goto DONE
 )
+
 :DONE
 endlocal


Addition of build all command.

Addition of build all command.

git-svn-id: 8a910031c78bbe8a754298bb28800c1494820db3@583 0604bb77-1110-461e-859e-28c50bf9b280

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -6,6 +6,10 @@
 cls
 if "%1" == "" (
     ant usage
+    goto DONE
+)
+if "%1" == "all" (
+    ant build:all
     goto DONE
 )
 if "%1" == "upgrade" (


fixed missing kernel port range

fixed missing kernel port range

--- start.cmd
+++ start.cmd
@@ -4,7 +4,8 @@

 set exe= erl.exe
 set erlpaths=-pa %CD%/apps/dderl/ebin -pa %deps%
-set kernelconfig=-kernel inet_dist_listen_min 7000 -kernel inet_dist_listen_max 7020 -kernel error_logger {file,\\\""%CD%/log/kernel.txt\\\""}
+set kernelconfig=-kernel inet_dist_listen_min 7000 -kernel inet_dist_listen_max 7020
+set kernelconfigsrv=%kernelconfig% -kernel error_logger {file,\\\""%CD%/log/kernel.txt\\\""}
 set commonparams=%erlpaths% -emu_args -setcookie dderl -dderl port 443 -imem tcp_port 8125 -imem mnesia_schema_name dderlstag -s dderl

 set name=-name dderl@%2
@@ -13,13 +14,13 @@
     @echo Cmd '%1' name '%name%' extra '%extra%'
     if "%1" == "add" (
         @echo Adding dderl service
-        erlsrv.exe add dderl -c "DDErl Service" -stopaction "init:stop()." -debugtype new -w %CD% %name% -args "%kernelconfig% %commonparams% %extra%"
+        erlsrv.exe add dderl -c "DDErl Service" -stopaction "init:stop()." -debugtype new -w %CD% %name% -args "%kernelconfigsrv% %commonparams% %extra%"
     ) else if "%1" == "gui" (
         @echo Starting dderl service
-        start /MAX werl.exe %name% %erlpaths% %commonparams% %extra%
+        start /MAX werl.exe %name% %kernelconfig% %erlpaths% %commonparams% %extra%
     ) else if "%1" == "txt" (
         @echo Starting dderl
-        start /MAX erl.exe %name% %erlpaths% %commonparams% %extra%
+        erl.exe %name% %kernelconfig% %erlpaths% %commonparams% %extra%
     ) else (
         @echo "Bad Argument '%1' '%2' '%3'"
         @echo "usage: cmd //C start.cmd [add node_host cluster_host | remove | start | stop | list | gui node_host cluster_host | txt node_host cluster_host]"


Batch file for running the ant project

Batch file for running the ant project

error: pathspec 'build/build.bat' did not match any file(s) known to git

--- build/build.bat
+++ build/build.bat
@@ -0,0 +1 @@
+ant -buildfile build.xml


Report correct name on cibuild.cmd failure


Fixed the install_home.cmd script

Fixed the install_home.cmd script

--- install_home.cmd
+++ install_home.cmd
@@ -7,27 +7,34 @@
 set P4CONFIG=.p4config
 set P4CONFIGPATH=%HOME%\%P4CONFIG%

+
+cd /d %~dp0
+Set  StartInDirectory= %cd%
+
+set CURRENTDIR=%StartInDirectory%
+
 type NUL > %P4CONFIGPATH%

 :: Install P4Python (Maya)
 md "%HOME%\My Documents\maya\scripts"

-echo Linking %cd%\P4API\windows\P4.py...
-mklink /J /d "%HOME%\My Documents\maya\scripts\P4.py" "%cd%\P4API\windows\P4.py"
-echo Linking %cd%\P4API\windows\P4API.pyd...
-mklink /J /d "%HOME%\My Documents\maya\scripts\P4API.pyd" "%cd%\P4API\windows\P4API.pyd"
+echo Linking %CURRENTDIR%\P4API\windows\P4.py...
+mklink /J /d "%HOME%\My Documents\maya\scripts\P4.py" "%CURRENTDIR%\P4API\windows\P4.py"
+
+echo Linking %CURRENTDIR%\P4API\windows\P4API.pyd...
+mklink /J /d "%HOME%\My Documents\maya\scripts\P4API.pyd" "%CURRENTDIR%\P4API\windows\P4API.pyd"

 :: Install Maya plugin
 md "%HOME%\My Documents\maya\plug-ins"
-echo Linking %cd%\Plugins\P4Maya.py...
-mklink /J /d "%HOME%\My Documents\maya\plug-ins\P4Maya.py" "%cd%\Plugins\P4Maya.py"
-echo Linking %cd%\Perforce...
-mklink /J /d "%HOME%\My Documents\maya\scripts\Perforce" "%cd%\Perforce"
+echo Linking %CURRENTDIR%\Plugins\P4Maya.py...
+mklink /J /d "%HOME%\My Documents\maya\plug-ins\P4Maya.py" "%CURRENTDIR%\Plugins\P4Maya.py"
+echo Linking %CURRENTDIR%\Perforce...
+mklink /J /d "%HOME%\My Documents\maya\scripts\Perforce" "%CURRENTDIR%\Perforce"

 :: Install P4Python (Nuke)
 ::md "%HOME%/.nuke/"
-::mklink /J /d "%HOME%\.nuke\P4.py" "%cd%\P4API\windows\P4.py"
-::mklink /J /d "%HOME%\.nuke\P4API.pyd" "%cd%\P4API\windows\P4API.pyd"
+::mklink /J /d "%HOME%\.nuke\P4.py" "%CURRENTDIR%\P4API\windows\P4.py"
+::mklink /J /d "%HOME%\.nuke\P4API.pyd" "%CURRENTDIR%\P4API\windows\P4API.pyd"

 setx P4CONFIG %P4CONFIGPATH%


build script for windows

build script for windows

error: pathspec 'm.bat' did not match any file(s) known to git

--- m.bat
+++ m.bat
@@ -0,0 +1,20 @@
+@set SRC=src
+@set TEST=test
+@set DIST=dist
+@set DIST_TEST=%DIST%\%TEST%
+
+@if not exist %DIST% mkdir %DIST%
+@if not exist %DIST%\lib mkdir %DIST%\lib
+@if not exist %DIST_TEST% mkdir %DIST_TEST%
+
+@echo building gml library...
+@pushd %SRC%
+@copy /y tsconfigs\lib.json tsconfig.json > NUL
+@call tsc
+@popd
+
+@echo building gml2d library...
+@pushd %SRC%
+@copy /y tsconfigs\lib2d.json tsconfig.json > NUL
+@call tsc
+@popd


upd installJar file for right version

upd installJar file for right version

--- lib/installJar.bat
+++ lib/installJar.bat
@@ -1,2 +1,2 @@
-mvn install:install-file -DgroupId=at.ngmpps -DartifactId=DPC -Dversion=1.0-SNAPSHOT -Dpackaging=jar -Dfile=./DPC-2.1-SNAPSHOT.jar
+mvn install:install-file -DgroupId=at.ngmpps -DartifactId=DPC -Dversion=3.2-SNAPSHOT -Dpackaging=jar -Dfile=./DPC-3.2-SNAPSHOT.jar


Tweaked cleanup script

Tweaked cleanup script

--- cleanup.cmd
+++ cleanup.cmd
@@ -29,4 +29,4 @@
 del "%~dp0TestResult.xml" > NUL 2>&1

 rem ReSharper caches
-for /D %%X in ("%~dp0src\_ReSharper*") do rd /s /q "%%X"+rd /s /q "%~dp0src\_ReSharper.Caches"


remove prefix of unix tools dirnames

remove prefix of unix tools dirnames

--- cmd.env.bat
+++ cmd.env.bat
@@ -190,12 +190,12 @@
 :: ========================================================================

 :: Set the location for unix tools as you want
-:: set "UNIX_HOME=%TEA_HOME%\vendors\x-cygwin"
-:: set "UNIX_HOME=%TEA_HOME%\vendors\x-gnuwin32"
-set "UNIX_HOME=%TEA_HOME%\vendors\x-gow-git"
-:: set "UNIX_HOME=%TEA_HOME%\vendors\x-msysgit"
-:: set "UNIX_HOME=%TEA_HOME%\vendors\x-unxutils"
-:: set "UNIX_HOME=%TEA_HOME%\vendors\x-win-bash"
+:: set "UNIX_HOME=%TEA_HOME%\vendors\cygwin"
+:: set "UNIX_HOME=%TEA_HOME%\vendors\gnuwin32"
+set "UNIX_HOME=%TEA_HOME%\vendors\gow-git"
+:: set "UNIX_HOME=%TEA_HOME%\vendors\msysgit"
+:: set "UNIX_HOME=%TEA_HOME%\vendors\unxutils"
+:: set "UNIX_HOME=%TEA_HOME%\vendors\win-bash"

 if defined UNIX_HOME set "PATH=%UNIX_HOME%\bin;%PATH%"


1. Fix the issue that rDSN source directory contains blanks. 2. Get the absolute path of %TOP_DIR%.

--- bin/Windows/pre-require.cmd
+++ bin/Windows/pre-require.cmd
@@ -1,12 +1,17 @@
+@ECHO OFF
+
 SET bin_dir=%~dp0
 IF %bin_dir:~-1%==\ SET bin_dir=%bin_dir:~0,-1%
 SET TOP_DIR=%bin_dir%\..\..
+PUSHD "%TOP_DIR%"
+SET TOP_DIR=%CD%
+POPD

 :: detect VS
 IF "%VisualStudioVersion%"=="15.0" GOTO find_vs
 IF "%VisualStudioVersion%"=="14.0" GOTO find_vs
 SET DSN_TMP_VS_INSTALL_DIR=
-FOR /f "usebackq tokens=1* delims=: " %%i in (`%bin_dir%\vswhere.exe -latest`) DO (
+FOR /f "usebackq tokens=1* delims=: " %%i in (`"%bin_dir%\vswhere.exe" -latest`) DO (
   IF /i "%%i"=="installationPath" set DSN_TMP_VS_INSTALL_DIR=%%j
 )
 IF DEFINED DSN_TMP_VS_INSTALL_DIR (


push.bat

push.bat

--- src/push.bat
+++ src/push.bat
@@ -1 +1,4 @@
-call nuget push %1\bin\Release\*.nupkg -s C:\\Nuget+FOR /D %%D IN ("C:\Nuget\%1\*") DO rmdir "%%D" /s /q
+FOR /D %%D IN ("C:\Nuget\%1\*") DO rmdir c:\nuget\%1.%%~nxD\ /s /q
+call nuget push %1\bin\Release\*.nupkg -s C:\\Nuget
+FOR /D %%D IN (C:\Nuget\%1\*) DO xcopy c:\nuget\%1\%%~nxD\* c:\nuget\%1.%%~nxD\ /s /y


Update WinSCP.bat

Update WinSCP.bat

--- repository/winscp/x86/WinSCP.bat
+++ repository/winscp/x86/WinSCP.bat
@@ -28,7 +28,7 @@

 :: Package to install. Do not use trailing slashes (\)
 set LOCATION=
-set BINARY=WinSCP v5.7.7 x86.exe
+set BINARY=WinSCP v5.9.0 x86.exe
 set FLAGS=/VERYSILENT /NOCANDY /NORESTART /MERGETASKS="!desktopicon"

 :: Create the log directory if it doesn't exist


bump fork to v5.15 for windows chrome hack

--- src/tagui.cmd
+++ src/tagui.cmd
@@ -11,7 +11,7 @@
 setlocal enableextensions enabledelayedexpansion

 if "%~1"=="" (
-echo tagui v5.14: use following options and this syntax to run - tagui flow_filename option^(s^)
+echo tagui v5.15: use following options and this syntax to run - tagui flow_filename option^(s^)
 echo.
 echo chrome   - run on visible Chrome web browser instead of invisible PhantomJS ^(first install Chrome^)
 echo headless - run on invisible Chrome web browser instead of default PhantomJS ^(first install Chrome^)


Build script - Make Mesa patch applying verbose Hopefully it will provide success confirmation too

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -131,8 +131,8 @@
 @if NOT EXIST mesa echo.
 @if NOT EXIST mesa git clone --depth=1 --branch=%branch% git://anongit.freedesktop.org/mesa/mesa mesa
 @cd mesa
-git apply ..\mesa-dist-win\patches\scons-llvm5.patch
-git apply ..\mesa-dist-win\patches\s3tc.patch
+git apply -v ..\mesa-dist-win\patches\scons-llvm5.patch
+git apply -v ..\mesa-dist-win\patches\s3tc.patch
 @echo.
 @set openswr=n
 @set sconscmd=python %mesa%Python\Scripts\scons.py build=release platform=windows machine=%longabi% libgl-gdi


Add GCC to PATH only when needed. Previously it was added 2 times in a row Both times unnecessary. Oh, boy

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -40,9 +40,9 @@
 :build_dxtn
 @if NOT EXIST "%gcc%" GOTO build_mesa
 @if NOT EXIST "%mesa%dxtn" GOTO build_mesa
-@set PATH=%gcc%\;%PATH%
 @set /p builddxtn=Do you want to build S3 texture compression library? (y/n):
 @if /i NOT %builddxtn%==y GOTO build_mesa
+@set PATH=%gcc%\;%PATH%
 @cd "%mesa%dxtn"
 @RD /S /Q %abi%
 @MD %abi%
@@ -66,7 +66,6 @@
 @set mingw=n
 @set mingwtest=0
 @if EXIST "%gcc%" @set mingwtest=1
-@if %dxtnbuilt%==0 set PATH=%gcc%\;%PATH%
 @set msys2=%mesa%msys64\msys2_shell.cmd
 @if EXIST "%msys2%" @set mingwtest=%mingwtest%2
 @rem if %mingwtest%==12 @set /p mingw=Do you want to build with MinGW-W64 instead of Visual Studio (y=yes):
@@ -80,6 +79,7 @@
 @if /i NOT %mingw%==y GOTO build_with_vs

 :build_with_mingw
+@if %dxtnbuilt%==0 set PATH=%gcc%\;%PATH%
 @set mesatoolchain=crossmingw
 @copy "%gcc%\%altabi%-w64-mingw32-gcc-ar.exe" "%gcc%\%altabi%-w64-mingw32-ar.exe"
 @copy "%gcc%\%altabi%-w64-mingw32-gcc-ranlib.exe" "%gcc%\%altabi%-w64-mingw32-ranlib.exe"
@@ -107,7 +107,8 @@
 )

 :build_mesa_exec
-@cmd /k "scons build=release platform=windows machine=%longabi% toolchain=%mesatoolchain% swr=%buildswr% libgl-gdi"
+@rem cmd /k "scons build=release platform=windows machine=%longabi% toolchain=%mesatoolchain% swr=%buildswr% libgl-gdi"
+@scons build=release platform=windows machine=%longabi% toolchain=%mesatoolchain% swr=%buildswr% libgl-gdi" ^&^& @pause

 :exit
 exit


try nose2 again

try nose2 again

--- test/run.bat
+++ test/run.bat
@@ -1,2 +1,2 @@
-nose2 --top-level-directory .. --plugin nose2.plugins.junitxml --junit-xml tests
+nose2 --top-level-directory .. --plugin nose2.plugins.junitxml --junit-xml


Not required

Not required

--- Server/delete_windows_service.cmd
+++ Server/delete_windows_service.cmd
@@ -1,4 +0,0 @@
-@echo off
-set SERVICENAME="Cuberite"
-
-sc delete %SERVICENAME%


fix(build): remove old version bump script

--- upver.cmd
+++ upver.cmd
@@ -1 +0,0 @@
-@npm version %1 -m "Version %%s"


Update doxygen script

Update doxygen script

--- 05-doxygen-VisualStudio.bat
+++ 05-doxygen-VisualStudio.bat
@@ -7,6 +7,5 @@
 git add -A .
 git commit -am "Update generated documentation"
 set remote="https://%GITHUB_TOKEN%@%remote:https://=%"
-echo %remote%
 git push %remote%
 cd ../../scripts


update changes

update changes

--- bin/ExecutePDTool.bat
+++ bin/ExecutePDTool.bat
@@ -26,9 +26,9 @@
 REM #
 REM #               arg1=-exec is used to execute a deploy plan file
 REM #	            arg2=orchestration property file path (full or relative path)
-REM #               arg3-4=[-vcsuser username] optional parameters
-REM #               arg5-6=[-vcspassword password] optional parameter
-REM #				arg7-8=[-config deploy.properties] optional parameter
+REM #               arg3-4=[-vcsuser username] optional parameter specifying the vcs username
+REM #               arg5-6=[-vcspassword password] optional parameter specifying the vcs password
+REM #				arg7-8=[-config deploy.properties] optional parameter specifying the deployment configuration property file
 REM #				arg9-10=[-release YYYYMMDD] optional parameter used to specify the release folder for the VCS
 REM #
 REM # Option 2 - Execute VCS Workspace initialization:
@@ -36,18 +36,20 @@
 REM #            ExecutePDTool.bat -vcsinit [-vcsuser username] [-vcspassword password] [-config deploy.properties] [-release RELEASE_FOLDER]
 REM #
 REM #	            arg1=-vcsinit is used to initialize the vcs workspace and link it to the repository
-REM #               arg3-4=[-vcsuser username] optional parameters
-REM #               arg5-6=[-vcspassword password] optional parameter
-REM #				arg7-8=[-config deploy.properties] optional parameter
+REM #               arg3-4=[-vcsuser username] optional parameters specifying the vcs username
+REM #               arg5-6=[-vcspassword password] optional parameter specifying the vcs password
+REM #				arg7-8=[-config deploy.properties] optional parameter specifying the deployment configuration property file
 REM #				arg9-10=[-release YYYYMMDD] optional parameter used to specify the release folder for the VCS
 REM #
 REM # Option 3 - Execute property file encryption:
 REM #
-REM #            ExecutePDTool.bat -encrypt property-file-path [-config deploy.properties]
+REM #            ExecutePDTool.bat -encrypt property-file-path [-config deploy.properties] -bypass "string1,string2"
 REM #
 REM #	            arg1=-encrypt is used to encrypt the passwords in deploy.properties or a Module XML property file
 REM #	            arg2=file path to deploy.properties or XML property file (full or relative path)
-REM #				arg3-4=[-config deploy.properties] optional parameter
+REM #				arg3-4=[-config deploy.properties] optional parameter  specifying the deployment configuration property file
+REM #				arg4-5=[-bypass "string1,string2"] optional parameter specifying a quoted, comma-separated list of strings to bypass
+REM #                                                  that are found within a variable or XML element designated for passwords.
 REM #
 REM # Option 4 - Execute an Ant build file:
 REM #
@@ -55,9 +57,9 @@
 REM #
 REM #               arg1=-ant is used to execute an Ant build file
 REM #	            arg2=orchestration build file path (full or relative path)
-REM #               arg3-4=[-vcsuser username] optional parameter
-REM #               arg5-6=[-vcspassword password] optional parameter
-REM #				arg7-8=[-config deploy.properties] optional parameter
+REM #               arg3-4=[-vcsuser username] optional parameter specifying the vcs username
+REM #               arg5-6=[-vcspassword password] optional parameter specifying the vcs password
+REM #				arg7-8=[-config deploy.properties] optional parameter specifying the deployment configuration property file
 REM #				arg9-10=[-release YYYYMMDD] optional parameter used to specify the release folder for the VCS
 REM #
 REM # Editor: Set tab=4 in your text editor for this file to format properly
@@ -79,7 +81,7 @@
 REM # Set up the execution context for invoking common scripts
 REM #=======================================
 REM # CIS version [6.2, 7.0.0]
-set DEFAULT_CIS_VERSION=7.0.0
+set DEFAULT_CIS_VERSION=@version@
 REM # Script name
 set SCRIPT=ExecutePDTool
 REM # set the print function
@@ -88,6 +90,7 @@
 set SEP=::
 SET PDTOOL_CMD=
 SET PDTOOL_PROPERTY_FILE=
+SET PDTOOL_ENCRYPT_BYPASS_STRING=
 SET PDTOOL_VCS_USERNAME=
 SET PDTOOL_VCS_PASSWORD=
 SET PDTOOL_CONFIG_PROPERTY_FILE=
@@ -146,6 +149,7 @@
 call %writeOutput% "Command Line Arguments:"																				"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   CMD=[%PDTOOL_CMD%]"																					"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   PROPERTY_FILE=[%PDTOOL_PROPERTY_FILE%]" 																"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
+call %writeOutput% "   ENCRYPT_BYPASS_STRING=[%PDTOOL_ENCRYPT_BYPASS_STRING%]" 												"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   VCS_USERNAME=[%PDTOOL_VCS_USERNAME%]" 																"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   VCS_PASSWORD=[%PR_VCS_PASSWORD%]" 																	"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   CONFIG_PROPERTY_FILE=[%PDTOOL_CONFIG_PROPERTY_FILE%]" 												"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
@@ -155,6 +159,7 @@

 REM # Assign parameters
 if defined PDTOOL_PROPERTY_FILE         set PROPERTY_FILE=%PDTOOL_PROPERTY_FILE%
+if defined ENCRYPT_BYPASS_STRING        set ENCRYPT_BYPASS_STRING=%PDTOOL_ENCRYPT_BYPASS_STRING%
 if defined PDTOOL_VCS_USERNAME          set VCS_USERNAME=%PDTOOL_VCS_USERNAME%
 if defined PDTOOL_VCS_PASSWORD          set VCS_PASSWORD=%PDTOOL_VCS_PASSWORD%
 if defined PDTOOL_CONFIG_PROPERTY_FILE  set CONFIG_PROPERTY_FILE=%PDTOOL_CONFIG_PROPERTY_FILE%
@@ -190,18 +195,20 @@
 REM #   INTERNAL VAR                 --> EXTERNAL VAR
 REM #   ---------------------------      --------------------
 REM #   PDTOOL_PROPERTY_FILE         --> PROPERTY_FILE
+REM #   PDTOOL_ENCRYPT_BYPASS_STRING --> ENCRYPT_BYPASS_STRING
 REM #   PDTOOL_VCS_USERNAME          --> VCS_USERNAME
 REM #   PDTOOL_VCS_PASSWORD          --> VCS_PASSWORD
 REM #   PDTOOL_CONFIG_PROPERTY_FILE  --> CONFIG_PROPERTY_FILE
 REM #   PDTOOL_RELEASE_FOLDER        --> RELEASE_FOLDER
 REM #   DEFAULT_CIS_VERSION          --> CIS_VERSION
 REM #=====================================================================================
-call:resolveVariables "%PDTOOL_PROPERTY_FILE%" 		  "%PROPERTY_FILE%" 		PROPERTY_FILE
-call:resolveVariables "%PDTOOL_VCS_USERNAME%" 		  "%VCS_USERNAME%" 			VCS_USERNAME
-call:resolveVariables "%PDTOOL_VCS_PASSWORD%" 		  "%VCS_PASSWORD%" 			VCS_PASSWORD
-call:resolveVariables "%PDTOOL_CONFIG_PROPERTY_FILE%" "%CONFIG_PROPERTY_FILE%" 	CONFIG_PROPERTY_FILE
-call:resolveVariables "%PDTOOL_RELEASE_FOLDER%" 	  "%RELEASE_FOLDER%" 		RELEASE_FOLDER
-call:resolveVariables "%DEFAULT_CIS_VERSION%" 	  	  "%CIS_VERSION%" 			CIS_VERSION
+call:resolveVariables "%PDTOOL_PROPERTY_FILE%" 		   "%PROPERTY_FILE%" 		 PROPERTY_FILE
+call:resolveVariables "%PDTOOL_ENCRYPT_BYPASS_STRING%" "%ENCRYPT_BYPASS_STRING%" ENCRYPT_BYPASS_STRING
+call:resolveVariables "%PDTOOL_VCS_USERNAME%" 		   "%VCS_USERNAME%" 		 VCS_USERNAME
+call:resolveVariables "%PDTOOL_VCS_PASSWORD%" 		   "%VCS_PASSWORD%" 		 VCS_PASSWORD
+call:resolveVariables "%PDTOOL_CONFIG_PROPERTY_FILE%"  "%CONFIG_PROPERTY_FILE%"	 CONFIG_PROPERTY_FILE
+call:resolveVariables "%PDTOOL_RELEASE_FOLDER%" 	   "%RELEASE_FOLDER%" 		 RELEASE_FOLDER
+call:resolveVariables "%DEFAULT_CIS_VERSION%" 	  	   "%CIS_VERSION%" 			 CIS_VERSION

 REM # Print the parameters
 CALL:printablePassword "%VCS_PASSWORD%" PR_VCS_PASSWORD
@@ -211,6 +218,7 @@
 call %writeOutput% "Resolved Arguments:"																					"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   CMD=[%PDTOOL_CMD%]"																					"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   PROPERTY_FILE=[%PROPERTY_FILE%]" 																	"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
+call %writeOutput% "   ENCRYPT_BYPASS_STRING=[%ENCRYPT_BYPASS_STRING%]" 													"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   VCS_USERNAME=[%VCS_USERNAME%]" 																		"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   VCS_PASSWORD=[%PR_VCS_PASSWORD%]" 																	"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
 call %writeOutput% "   CONFIG_PROPERTY_FILE=[%CONFIG_PROPERTY_FILE%]" 														"%SCRIPT%%SEP%%DATE%-%TIME%%SEP%"
@@ -435,10 +443,10 @@
    goto USAGE
 )
 REM #***********************************************
-REM # Invoke: ScriptUtil encryptPasswordsInFile "%PROPERTY_FILE%"
+REM # Invoke: ScriptUtil encryptPasswordsInFileBypass "%PROPERTY_FILE%" "%ENCRYPT_BYPASS_STRING%"
 REM #***********************************************
-set JAVA_ACTION=encryptPasswordsInFile
-set COMMAND="%JAVA_HOME%\bin\java" %JAVA_OPT% -cp  %DEPLOY_CLASSPATH% %CONFIG_ROOT% %CONFIG_LOG4J% %PRECEDENCE% -Djava.endorsed.dirs="%ENDORSED_DIR%" -DPROJECT_HOME="%PROJECT_HOME%" -DPROJECT_HOME_PHYSICAL="%PROJECT_HOME_PHYSICAL%" -DCONFIG_PROPERTY_FILE=%CONFIG_PROPERTY_FILE% %DEPLOY_COMMON_UTIL% %JAVA_ACTION% "%PROPERTY_FILE%"
+set JAVA_ACTION=encryptPasswordsInFileBypass
+set COMMAND="%JAVA_HOME%\bin\java" %JAVA_OPT% -cp  %DEPLOY_CLASSPATH% %CONFIG_ROOT% %CONFIG_LOG4J% %PRECEDENCE% -Djava.endorsed.dirs="%ENDORSED_DIR%" -DPROJECT_HOME="%PROJECT_HOME%" -DPROJECT_HOME_PHYSICAL="%PROJECT_HOME_PHYSICAL%" -DCONFIG_PROPERTY_FILE=%CONFIG_PROPERTY_FILE% %DEPLOY_COMMON_UTIL% %JAVA_ACTION% "%PROPERTY_FILE%" "%ENCRYPT_BYPASS_STRING%"
 set PRCOMMAND=%COMMAND%
 GOTO START_SCRIPT

@@ -662,6 +670,18 @@
                 SET PDTOOL_PROPERTY_FILE=%ARG2%
 				set PARSE_ERROR=1
 				set ARG=PROPERTY_FILE
+				set ERRORMSG=Execution Failed::Missing parameter
+				if "%ARG2%" NEQ "" set PARSE_ERROR=0
+				if "%ARG2%" NEQ "" set ARG=
+				if "%ARG2%" NEQ "" set ERRORMSG=
+                shift
+                GOTO:LOOPEND
+            )
+    if "%ARG1%" == "-bypass" (
+				SET PDTOOL_CMD=%ARG1%
+                SET PDTOOL_ENCRYPT_BYPASS_STRING=%ARG2%
+				set PARSE_ERROR=1
+				set ARG=ENCRYPT_BYPASS_STRING
 				set ERRORMSG=Execution Failed::Missing parameter
 				if "%ARG2%" NEQ "" set PARSE_ERROR=0
 				if "%ARG2%" NEQ "" set ARG=
@@ -790,9 +810,9 @@
 	call %writeOutput% " "
 	call %writeOutput% "               arg1::    -exec is used to execute a deploy plan file"
 	call %writeOutput% "               arg2::    orchestration property file path [full or relative path]"
-	call %writeOutput% "               arg3-4::  [-vcsuser username] optional parameters"
-	call %writeOutput% "               arg5-6::  [-vcspassword password] optional parameters"
-	call %writeOutput% "               arg7-8::  [-config deploy.properties] optional parameters"
+	call %writeOutput% "               arg3-4::  [-vcsuser username] optional parameters specifying the vcs username"
+	call %writeOutput% "               arg5-6::  [-vcspassword password] optional parameters specifying the vcs password"
+	call %writeOutput% "               arg7-8::  [-config deploy.properties] optional parameters specifying the deployment configuration property file"
 	call %writeOutput% "               arg9-10:: [-release YYYYMMDD] optional parameter used to specify the release folder for the VCS"
 	call %writeOutput% "               arg10-11::[-ver 7.0.0] optional parameter used to specify the version of CIS to connect to.
 	call %writeOutput% " -----------------------------------------------------------------------------------------------------"
@@ -803,20 +823,22 @@
 	call %writeOutput% "            Example: %SCRIPT%%ext% -vcsinit -vcsuser user -vcspassword password -config deploy.properties -release 20141201"
  	call %writeOutput% " "
 	call %writeOutput% "               arg1::   -vcsinit is used to initialize the vcs workspace and link it to the repository"
-	call %writeOutput% "               arg2::   [-vcsuser username] optional parameters"
-	call %writeOutput% "               arg3-4:: [-vcspassword password] optional parameters"
-	call %writeOutput% "               arg5-6:: [-config deploy.properties] optional parameters"
+	call %writeOutput% "               arg2::   [-vcsuser username] optional parameters specifying the vcs username"
+	call %writeOutput% "               arg3-4:: [-vcspassword password] optional parameters specifying the vcs password"
+	call %writeOutput% "               arg5-6:: [-config deploy.properties] optional parameters specifying the deployment configuration property file"
 	call %writeOutput% "               arg7-8:: [-release YYYYMMDD] optional parameter used to specify the release folder for the VCS"
 	call %writeOutput% " -----------------------------------------------------------------------------------------------------"
 	call %writeOutput% " Option 3 - Execute Encrypt Property File:"
 	call %writeOutput% " "
-	call %writeOutput% "            %SCRIPT%%ext% -encrypt property-file-path [-config deploy.properties]"
-	call %writeOutput% " "
-	call %writeOutput% "            Example: %SCRIPT%%ext% -encrypt ../resources/config/deploy.properties -config deploy.properties"
+	call %writeOutput% "            %SCRIPT%%ext% -encrypt property-file-path [-config deploy.properties] -bypass "string1,string2"
+	call %writeOutput% " "
+	call %writeOutput% "            Example: %SCRIPT%%ext% -encrypt ../resources/config/deploy.properties -config deploy.properties -bypass string1"
  	call %writeOutput% " "
 	call %writeOutput% "               arg1::   -encrypt is used to encrypt the passwords in deploy.properties or a Module XML property file"
 	call %writeOutput% "               arg2::   file path to deploy.properties or XML property file [full or relative path]"
-	call %writeOutput% "               arg3-4:: [-config deploy.properties] optional parameters"
+	call %writeOutput% "               arg3-4:: [-config deploy.properties] optional parameters specifying the deployment configuration property file"
+	call %writeOutput% "               arg4-5:: [-bypass "string1,string2"] optional parameter specifying a quoted, comma-separated list of strings to bypass"
+	call %writeOutput% "                                                  that are found within a variable or XML element designated for passwords."
 	call %writeOutput% " -----------------------------------------------------------------------------------------------------"
 	call %writeOutput% " Option 4 - Execute an Ant build file:"
 	call %writeOutput% " "
@@ -826,9 +848,9 @@
 	call %writeOutput% " "
 	call %writeOutput% "               arg1::    -ant is used to execute an Ant build file"
 	call %writeOutput% "               arg2::    orchestration build file path (full or relative path)"
-	call %writeOutput% "               arg3-4::  [-vcsuser username] optional parameters"
-	call %writeOutput% "               arg5-6::  [-vcspassword password] optional parameters"
-	call %writeOutput% "               arg7-8::  [-config deploy.properties] optional parameters"
+	call %writeOutput% "               arg3-4::  [-vcsuser username] optional parameters specifying the vcs username"
+	call %writeOutput% "               arg5-6::  [-vcspassword password] optional parameters specifying the vcs password"
+	call %writeOutput% "               arg7-8::  [-config deploy.properties] optional parameters specifying the deployment configuration property file"
 	call %writeOutput% "               arg9-10:: [-release YYYYMMDD] optional parameter used to specify the release folder for the VCS"
 	call %writeOutput% "               arg10-11::[-ver 7.0.0] optional parameter used to specify the version of CIS to connect to.
 	call %writeOutput% " -----------------------------------------------------------------------------------------------------"


Small cleanup

Small cleanup

--- src/YardFrontend/gen.cmd
+++ src/YardFrontend/gen.cmd
@@ -1,4 +1,3 @@
 ..\..\Bin\Release\v40\YC.FsLex.exe --unicode Lexer.fsl
 echo > log.txt
-    ..\..\Bin\Release\v40\YC.YaccConstructor.exe -f FsYaccFrontend -i Parser.fsy ^
-        -g "RNGLRGenerator -o Parser.fs -module Yard.Frontends.YardFrontend.GrammarParser -pos Source.Position -token Source.t" > log.txt+    ..\..\Bin\Release\v40\YC.YaccConstructor.exe -f FsYaccFrontend -i Parser.fsy -g "RNGLRGenerator -o Parser.fs -module Yard.Frontends.YardFrontend.GrammarParser -pos Source.Position -token Source.t" > log.txt


Delete setup.bat

Delete setup.bat

--- setup.bat
+++ setup.bat
@@ -1,3 +0,0 @@
-pip install --upgrade -r requirements.txt
-mkdir logs
-mkdir secrets


cosmetic changes to shell.bat

cosmetic changes to shell.bat

--- shell.bat
+++ shell.bat
@@ -66,8 +66,6 @@

 */0;

-var debug = 0;
-
 var alert = alert || function(msg)
 {
 	WScript.Echo(msg);
@@ -79,7 +77,7 @@
 };

 if ( WScript.Arguments.Unnamed.length == 0 ) {
-	alert('Usage: ' + WScript.ScriptName + ' options');
+	alert('Usage: ' + WScript.ScriptName + ' filename options');
 	exit(1);
 }

@@ -87,23 +85,25 @@
 var confname = WScript.Arguments.Named.item('CONFNAME') || '.Vanilla';
 var taskname = WScript.Arguments.Named.item('TASKNAME') || '';

-var xpath = '/key[@name="Software"]/key[@name="ConEmu"]/key[lower-case(@name)=lower-case("' + confname + '")]/key[@name="Tasks"]/key';
+var xpathstr = '/key[@name="Software"]/key[@name="ConEmu"]'
+	+ '/key[lower-case(@name)=lower-case("' + confname + '")]'
+	+ '/key[@name="Tasks"]/key';

 if ( taskname ) {
-	xpath += '/value[@name="Name"][lower-case(@data)=lower-case("{' + taskname + '}")]';
+	xpathstr += '/value[@name="Name"][lower-case(@data)=lower-case("{' + taskname + '}")]';
 }

 // Comparison in XPath is case sensitive. Using of "lower-case" XPath
 // function could be good solution to escape differencies between "abc",
 // "ABC" and so on. Unfortunately, "lower-case" is a part of XPath 2.0 and
 // is not supportable by MS JScript. To resolve this issue we introduce
-// the partial workaround replacement with the available XPath 1.0
-// function "translate".
+// the partial workaround replacement with the function "translate",
+// available in XPath 1.0.
 // See for details: http://stackoverflow.com/a/1625859/3627676
-xpath = xpath.replace(/lower-case\(([^()]+)\)/g, 'translate($1, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")');
-
-debug && alert('FILENAME = ' + filename);
-debug && alert('XPATHSTR = ' + xpath);
+xpathstr = xpathstr.replace(
+	/lower-case\(([^()]+)\)/g,
+	'translate($1, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'
+);

 var e;
 try {
@@ -111,12 +111,10 @@
 	xmldoc.setProperty('SelectionLanguage', 'XPath');
 	xmldoc.load(filename);

-	var xml = xmldoc.selectNodes(xpath);
+	var xml = xmldoc.selectNodes(xpathstr);
 } catch(e) {
 	// If a file or XML are bad, exit with error immediately
 	exit(1);
 }

-debug && alert('LEN = ' + xml.length);
-
 exit( xml.length != 0 ? 0 : 1 );


Updated Tests

Updated Tests

--- test/testrun.bat
+++ test/testrun.bat
@@ -9,7 +9,8 @@

 REM Individually try each format on Test Document
-FOR /F "eol=; tokens=1,2* delims=, " %%i in (testdata.txt) do "../exe/docto.exe"  -f "%~d0%~p0\Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\pie3out_%%i.%%j"  -T  %%i
+REM Remove rem below to run.
+REM FOR /F "eol=; tokens=1,2* delims=, " %%i in (testdata.txt) do "../exe/docto.exe"  -f "%~d0%~p0\Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\pie3out_%%i.%%j"  -T  %%i

 REM Try on Directory
 "../exe/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf
@@ -17,8 +18,12 @@
 REM Try on Single
 "../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF

-REM Try on Single no output file
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Single"    -T  wdFormatPDF
+REM Try on Single no output file with Verbose Logging
+"../exe/docto.exe" -L 10 -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatPDF
+
+REM Try on Single no output file with Verbose Logging
+"../exe/docto.exe" -L 10 -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDirNoSlash"    -T  wdFormatXMLDocument
+

 REM Should produce an error


Update ffbat

Update ffbat

Update ffbat

--- ff.bat
+++ ff.bat
@@ -1,4 +1,4 @@
 @echo off
-SET ffpath=D:\GithubProjects\phparsenal\fast-forward\
+SET ffpath=C:\wnmap\public\fast-forward\
 call php %ffpath%cli-launch.php %*
 call %ffpath%cli-launch.temp.bat


Clean

Clean

--- BuildTest.bat
+++ BuildTest.bat
@@ -1,6 +1,4 @@
 @echo off
-echo Building setup ...
-echo.

 powershell -ExecutionPolicy RemoteSigned -File .\Build.ps1 -configuration "Release"


ll commnad

ll commnad

error: pathspec 'll.bat' did not match any file(s) known to git