rename

Author: freddy77

misc/appveyor.yml

@@ -72,15 +72,15 @@ install:
      $ENV:WIDTH = $ENV:PLAT.Substring($ENV:PLAT.length - 2)
      if ($ENV:VS_VERSION -eq 2013) {
        $ENV:GENERATOR = "Visual Studio 12 2013"
-       $ENV:BUILD_TYPE_DEBUG = "-A x64"
-       $ENV:BUILD_TYPE_RELEASE = "-A x64"
+       $ENV:GENERATE_DEBUG = "-A x64"
+       $ENV:GENERATE_RELEASE = "-A x64"
        $ENV:CONFIG_OPT = "--config"
        $ENV:CONFIG_DEBUG = ".\Debug\"
        $ENV:CONFIG_RELEASE = ".\Release\"
      } else {
        $ENV:GENERATOR = "Ninja"
-       $ENV:BUILD_TYPE_DEBUG = "-DCMAKE_BUILD_TYPE=Debug"
-       $ENV:BUILD_TYPE_RELEASE = "-DCMAKE_BUILD_TYPE=Release"
+       $ENV:GENERATE_DEBUG = "-DCMAKE_BUILD_TYPE=Debug"
+       $ENV:GENERATE_RELEASE = "-DCMAKE_BUILD_TYPE=Release"
        $ENV:CONFIG_OPT = " "
        $ENV:CONFIG_DEBUG = "."
        $ENV:CONFIG_RELEASE = "."
@@ -100,7 +100,7 @@ install:
   - ren win-iconv-%WIN_ICONV_VER% iconv
   - mkdir iconv-build
   - cd iconv-build
-  - "%WITH_COMPILER% cmake -G \"%GENERATOR%\" -DWIN_ICONV_BUILD_STATIC=on -DWIN_ICONV_BUILD_SHARED=off -DWIN_ICONV_BUILD_EXECUTABLE=off -DWIN_ICONV_BUILD_TEST=on -DDISABLE_LOCALE_CHARSET=on %BUILD_TYPE_RELEASE% ..\\iconv"
+  - "%WITH_COMPILER% cmake -G \"%GENERATOR%\" -DWIN_ICONV_BUILD_STATIC=on -DWIN_ICONV_BUILD_SHARED=off -DWIN_ICONV_BUILD_EXECUTABLE=off -DWIN_ICONV_BUILD_TEST=on -DDISABLE_LOCALE_CHARSET=on %GENERATE_RELEASE% ..\\iconv"
   - "%WITH_COMPILER% cmake --build . %CONFIG_OPT% %CONFIG_RELEASE:~2,-1%"
   - "%CONFIG_RELEASE:~2%win_iconv_test.exe"
   - cd ..\iconv
@@ -123,14 +123,14 @@ build_script:
   - mkdir build
   - cd build
   - set DEST_DIR=vs%VS_VERSION%_%WIDTH%-%APPVEYOR_REPO_BRANCH%
-  - "%WITH_COMPILER% cmake -G \"%GENERATOR%\" %BUILD_TYPE_RELEASE% -DENABLE_MSDBLIB=on \"-DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR%\" \"-DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR%\" .."
+  - "%WITH_COMPILER% cmake -G \"%GENERATOR%\" %GENERATE_RELEASE% -DENABLE_MSDBLIB=on \"-DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR%\" \"-DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR%\" .."
   - "%WITH_COMPILER% cmake --build . --verbose %CONFIG_OPT% %CONFIG_RELEASE:~2,-1%"
   - set PATH=%OPENSSL_ROOT_DIR%\bin;%PATH%
   - "src\\apps\\%CONFIG_RELEASE:~2%tsql.exe -C"
   - cd ..
   - mkdir build_debug
   - cd build_debug
-  - "%WITH_COMPILER% cmake -G \"%GENERATOR%\" %BUILD_TYPE_DEBUG% -DENABLE_EXTRA_CHECKS=on -DENABLE_MSDBLIB=on \"-DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR%\" \"-DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR%\" .."
+  - "%WITH_COMPILER% cmake -G \"%GENERATOR%\" %GENERATE_DEBUG% -DENABLE_EXTRA_CHECKS=on -DENABLE_MSDBLIB=on \"-DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR%\" \"-DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR%\" .."
   - "%WITH_COMPILER% cmake --build . %CONFIG_OPT% %CONFIG_DEBUG:~2,-1%"
   - "%WITH_COMPILER% cmake --build . %CONFIG_OPT% %CONFIG_DEBUG:~2,-1% --target build_tests"
   - "src\\apps\\%CONFIG_DEBUG:~2%tsql.exe -C"