fix harfbuzz build, build GDAL 2.0.2

patches/harfbuzz-v1.1.2-cmake-patch.diff

@@ -1,51 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de1925c..d332074 100644
+index bcd3a7c..439aa73 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -19,7 +19,6 @@ include_directories(AFTER
+@@ -20,7 +20,6 @@ include_directories(AFTER
 
  add_definitions(-DHAVE_OT)
  add_definitions(-DHAVE_ATEXIT)
 -add_definitions(-DHB_NO_MT)
  add_definitions(-DHB_DISABLE_DEPRECATED)
  ##
 
-@@ -44,7 +43,6 @@ ragel_preproc(harfbuzz/src hb-buffer-deserialize-json .hh)
- ragel_preproc(harfbuzz/src hb-buffer-deserialize-text .hh)
- ragel_preproc(harfbuzz/src hb-ot-shape-complex-indic-machine .hh)
- ragel_preproc(harfbuzz/src hb-ot-shape-complex-myanmar-machine .hh)
--ragel_preproc(harfbuzz/src hb-ot-shape-complex-sea-machine .hh)
- ##
-
- ## Make hb-version.h
-@@ -74,7 +72,6 @@ set(project_sources
-   ${CMAKE_CURRENT_BINARY_DIR}/hb-buffer-deserialize-text.hh
-   ${CMAKE_CURRENT_BINARY_DIR}/hb-ot-shape-complex-indic-machine.hh
-   ${CMAKE_CURRENT_BINARY_DIR}/hb-ot-shape-complex-myanmar-machine.hh
--  ${CMAKE_CURRENT_BINARY_DIR}/hb-ot-shape-complex-sea-machine.hh
-   )
-
- set(project_headers
-@@ -147,11 +144,12 @@ set(project_sources
-   harfbuzz/src/hb-ot-shape-complex-indic.cc
-   harfbuzz/src/hb-ot-shape-complex-indic-table.cc
-   harfbuzz/src/hb-ot-shape-complex-myanmar.cc
--  harfbuzz/src/hb-ot-shape-complex-sea.cc
-   harfbuzz/src/hb-ot-shape-complex-thai.cc
-   harfbuzz/src/hb-ot-shape-complex-tibetan.cc
-   harfbuzz/src/hb-ot-shape-fallback.cc
-   harfbuzz/src/hb-ot-shape-normalize.cc
-+  harfbuzz/src/hb-ot-shape-complex-use.cc
-+  harfbuzz/src/hb-ot-shape-complex-use-table.cc
-
-   harfbuzz/src/hb-ot-layout-common-private.hh
-   harfbuzz/src/hb-ot-layout-gdef-table.hh
-@@ -202,7 +200,7 @@ endif ()
- if (HB_BUILTIN_UCDN)
-   include_directories(harfbuzz/src/hb-ucdn)
-   add_definitions(-DHAVE_UCDN)
--  
-+
-   set(project_headers ${project_headers} harfbuzz/src/hb-ucdn/ucdn.h)
-
-   set(project_sources

scripts/build_gdal.bat

@@ -35,21 +35,6 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 cd %PKGDIR%\gdal
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-<<<<<<< HEAD
-IF "%GDAL_VERSION%"=="2.0.0" GOTO GDAL200
-IF "%GDAL_VERSION%"=="2.0.1" GOTO GDAL200
-IF "%GDAL_VERSION%"=="2.0.2" GOTO GDAL200
-
-SET GDAL_PATCH=%PATCHES%\gdal-VS2015RC1.diff
-IF %VS2014_CTP4_DETECTED% EQU 1 ECHO VS2014 CTP4 detected && SET GDAL_PATCH=%PATCHES%\gdal-VS2014CTP4.diff
-
-ECHO using gdal patch^: %GDAL_PATCH%
-patch -N -p1 < %GDAL_PATCH% || %SKIP_FAILED_PATCH%
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-:GDAL200
-=======
->>>>>>> d5d0e1f6991e530b75a0f77e9e8688a66b000851
 IF %VS2014_CTP4_DETECTED% EQU 0 patch -N -p1 < %PATCHES%\gdal-200-VS2015RC1.diff
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 

scripts/build_harfbuzz.bat

@@ -31,7 +31,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO downloading harfbuzz.cmake to %PKGDIR%\CMakeLists.txt
 ::LATEST
-curl -s -S -f -O -L -k --retry 3 https://raw.githubusercontent.com/ebraminio/glcourse/master/harfbuzz.cmake
+curl -s -S -f -O -L -k --retry 3 https://raw.githubusercontent.com/ebraminio/glcourse/3bdec853885211d87e7947926b66bfdedd271b21/harfbuzz.cmake
 ::PREVIOUS
 ::curl -s -S -f -O -L -k --retry 3 https://raw.githubusercontent.com/ebraminio/glcourse/b864147eac40943fd72c2b94948f767a6529466c/harfbuzz.cmake
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

scripts/build_osrm.bat

@@ -66,7 +66,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 git pull
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-if EXIST build ddt /Q build
+IF EXIST build ddt /Q build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 mkdir build
@@ -93,10 +93,13 @@ cmake .. ^
 -DCMAKE_INSTALL_PREFIX=%PREFIX%
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+REM /p:BuildInParallel=true ^
+REM /m:%NUMBER_OF_PROCESSORS% ^
+REM msbuild OSRM.sln /t:ALL_BUILD;rebuild ^
+
 msbuild OSRM.sln ^
 /p:Configuration=Release ^
 /p:Platform=x64 ^
-/t:rebuild ^
 /p:BuildInParallel=true ^
 /m:%NUMBER_OF_PROCESSORS% ^
 /toolsversion:%TOOLS_VERSION% ^