Moved googletest_install.bat script from /ci/windowslocal/ to /ci/appveyor/googletest_install.bat since it was also the same script for appveyor.yml

Author: end2endzone

appveyor.yml

@@ -46,7 +46,7 @@ environment:
 
 # scripts that run after cloning repository
 install:
-- cmd: call c:\projects\bin2cpp\ci\windowslocal\googletest_install.bat
+- cmd: call c:\projects\bin2cpp\ci\appveyor\googletest_install.bat
 - cmd: call c:\projects\bin2cpp\ci\appveyor\googletest_build.bat
 - cmd: call c:\projects\bin2cpp\ci\appveyor\list_env_var.bat
 

ci/appveyor/googletest_build.bat

@@ -1,9 +1,9 @@
 echo =======================================================================
-echo Building google test library
+echo Building googletest solution: %REPOSITORY_ROOT%\third_party\googletest\msvc2010\gtest.sln
 echo =======================================================================
 cd /d %REPOSITORY_ROOT%\third_party\googletest\msvc2010
-msbuild "msvc2010\gtest.sln" /m /verbosity:minimal
+msbuild "gtest.sln" /m /verbosity:minimal
 
 echo =======================================================================
-echo Done
+echo Building googletest solution (done)
 echo =======================================================================

ci/windowslocal/googletest_install.bat ci/appveyor/googletest_install.batci/windowslocal/googletest_install.bat renamed to ci/appveyor/googletest_install.bat

@@ -10,11 +10,20 @@ echo REPOSITORY_ROOT=%REPOSITORY_ROOT%
 echo done.
 echo.
 
+echo ======================================================================
+echo Deleting googletest repository folder (if any)
+echo =======================================================================
+if EXIST %REPOSITORY_ROOT%\third_party\googletest (
+  rmdir /q/s %REPOSITORY_ROOT%\third_party\googletest
+)
+echo done.
+echo.
+
 echo ======================================================================
 echo Cloning google test repository
 echo =======================================================================
 git clone https://github.com/google/googletest.git %REPOSITORY_ROOT%\third_party\googletest
-cd /d %REPOSITORY_ROOT%\googletest
+cd /d %REPOSITORY_ROOT%\third_party\googletest
 git checkout release-1.6.0
 echo done.
 echo.
@@ -45,10 +54,14 @@ echo Setting environnment variables for googletest
 echo =======================================================================
 set GTEST_DEBUG_LIBRARIES=gtest.lib
 set GTEST_RELEASE_LIBRARIES=gtest.lib
-set GTEST_INCLUDE=%GTEST_HOME%\include
-set GTEST_LIBRARY_DIR=%GTEST_HOME%\msvc2010
+set GTEST_INCLUDE=%REPOSITORY_ROOT%\third_party\googletest\include
+set GTEST_LIBRARY_DIR=%REPOSITORY_ROOT%\third_party\googletest\msvc2010
+REM
 setx GTEST_DEBUG_LIBRARIES %GTEST_DEBUG_LIBRARIES%
 setx GTEST_RELEASE_LIBRARIES %GTEST_RELEASE_LIBRARIES%
 setx GTEST_INCLUDE %GTEST_INCLUDE%
 setx GTEST_LIBRARY_DIR %GTEST_LIBRARY_DIR%
+REM
 set GTEST_
+echo done.
+echo.