Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Column data type handling #5

Merged
merged 17 commits into from
May 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ them in driver's libs directory, where the build script expects them by
default:
```
somedirectory\
|_x-pack-odbc
|_elasticsearch-sql-odbc
|_README.md
|_CMakeLists.txt
|_build.bat
Expand Down
15 changes: 13 additions & 2 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ if /i not _%ARG:setup=% == _%ARG% (
echo.
)
)
REM


REM presence of 'fetch': invoke FETCH "function"
if /i not _%ARG:fetch=% == _%ARG% (
Expand Down Expand Up @@ -140,7 +142,9 @@ REM if TEMP var not set, set it.
if exist %TEMP% goto:eof
set TEMP="%USERPROFILE%\Local Settings\Temp\"
if exist %TEMP% goto:eof
echo WARN: no temporary directory available; using root
echo.
echo WARNING: no temporary directory available; using root
echo.
set TEMP=\

goto:eof
Expand Down Expand Up @@ -211,16 +215,23 @@ REM CLEAN function: clean up the build dir before building
REM SETUP function: set-up the build environment
:SETUP
set RELEASE=2017
set EDITION=Professional
for %%e in (Enterprise, Professional, Community) do (
if exist "C:\Program Files (x86)\Microsoft Visual Studio\%RELEASE%\%%e\Common7\Tools\VsDevCmd.bat" (
if /i "%%e" == "Community" (
echo.
echo WARNING: Community edition is not licensed to build commerical projects.
echo.
)
call "C:\Program Files (x86)\Microsoft Visual Studio\%RELEASE%\%%e\Common7\Tools\VsDevCmd.bat" -arch=!TARCH!
set EDITION=%%e
break
)
)
if "%EDITION%" == "" (
echo.
echo WARNING: no MSVC edition found, environment not set.
echo.
)

goto:eof

Expand Down
Loading