You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/05/17 04:02:45 UTC
[18/24] ignite git commit: IGNITE-3115: CPP: Minor fixes to docs.
This closes #714.
IGNITE-3115: CPP: Minor fixes to docs. This closes #714.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a9c35db
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a9c35db
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a9c35db
Branch: refs/heads/master
Commit: 9a9c35dbe1652abbe5f483edb065e53310a0a3dd
Parents: f65dd00
Author: isapego <is...@gridgain.com>
Authored: Mon May 16 15:32:55 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon May 16 15:32:55 2016 +0300
----------------------------------------------------------------------
modules/platforms/cpp/DEVNOTES.txt | 10 ++++++
modules/platforms/cpp/Makefile.am | 5 ++-
modules/platforms/cpp/Makefile.amrel | 5 ++-
modules/platforms/cpp/examples/README.txt | 1 +
modules/platforms/cpp/odbc/README.txt | 7 ++--
.../cpp/odbc/install/install_amd64.cmd | 35 +++++++++++++-------
.../platforms/cpp/odbc/install/install_x86.cmd | 17 ++++++----
7 files changed, 57 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/DEVNOTES.txt b/modules/platforms/cpp/DEVNOTES.txt
index fa664ef..cd0a154 100644
--- a/modules/platforms/cpp/DEVNOTES.txt
+++ b/modules/platforms/cpp/DEVNOTES.txt
@@ -29,6 +29,13 @@ Ignite-specific options:
* --enable-odbc - build included ODBC driver. Disabled by default.
* --enable-core - build Ignite core library. Enabled by default.
* --enable-node - build stand-alone node executable. Enabled by default.
+
+If you only need to build ODBC driver and do not want to build anything else you may just
+use configure script with the following arguments:
+ ./configure --enable-odbc --disable-core --disable-node
+
+With the config like that you should not have any ignite dependencies as jvm.dll installed
+to build ODBC driver.
NOTE: You may want to use "make install" command to install Ignite libraries and heasders
for your operation system. Note however that this action may require superuser privileges.
@@ -48,6 +55,9 @@ Building binaries:
* Open and build %IGNITE_HOME%\platforms\cpp\project\vs\ignite.sln (or ignite_86.sln if
you are running 32-bit platform).
+ * If you want to build ODBC driver then you should explicitly build it as it is disabled
+ in the solution file by default. In IDE it can be done by clicking on the ODBC project
+ with the right mouse button and choosing "Build" option.
Building in later versions of Visual Studio:
* Open project\vs\ignite.sln or project\vs\ignite_86.sln in Visual Studio
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/Makefile.am b/modules/platforms/cpp/Makefile.am
index 5213d0c..6b643bc 100644
--- a/modules/platforms/cpp/Makefile.am
+++ b/modules/platforms/cpp/Makefile.am
@@ -27,6 +27,7 @@ endif
if COND_CORE
MAYBE_CORE = core
+ MAYBE_JNI = jni
if COND_TESTS
MAYBE_CORE_TESTS = core-test
@@ -34,13 +35,15 @@ endif
endif
if COND_NODE
+ MAYBE_CORE = core
+ MAYBE_JNI = jni
MAYBE_NODE = ignite
endif
SUBDIRS = \
common \
binary \
- jni \
+ $(MAYBE_JNI) \
$(MAYBE_ODBC) \
$(MAYBE_CORE) \
$(MAYBE_NODE) \
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/Makefile.amrel
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/Makefile.amrel b/modules/platforms/cpp/Makefile.amrel
index 6172d06..ae34b03 100644
--- a/modules/platforms/cpp/Makefile.amrel
+++ b/modules/platforms/cpp/Makefile.amrel
@@ -23,16 +23,19 @@ endif
if COND_CORE
MAYBE_CORE = core
+ MAYBE_JNI = jni
endif
if COND_NODE
+ MAYBE_CORE = core
+ MAYBE_JNI = jni
MAYBE_NODE = ignite
endif
SUBDIRS = \
common \
binary \
- jni \
+ $(MAYBE_JNI) \
$(MAYBE_ODBC) \
$(MAYBE_CORE) \
$(MAYBE_NODE)
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/examples/README.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/examples/README.txt b/modules/platforms/cpp/examples/README.txt
index b985f07..29df732 100644
--- a/modules/platforms/cpp/examples/README.txt
+++ b/modules/platforms/cpp/examples/README.txt
@@ -16,6 +16,7 @@ Prerequisites:
* GCC, g++, autotools, automake, and libtool must be installed.
To build examples execute the following commands one by one from examples root directory:
+ * libtoolize && aclocal && autoheader && automake --add-missing && autoreconf
* ./configure
* make
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/odbc/README.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/README.txt b/modules/platforms/cpp/odbc/README.txt
index e9d423f..8f0c805 100644
--- a/modules/platforms/cpp/odbc/README.txt
+++ b/modules/platforms/cpp/odbc/README.txt
@@ -44,6 +44,8 @@ ODBC driver you should perfrom the following steps:
can check it using "ldd" command like this (assuming ODBC driver is located
under /usr/local/lib):
$ ldd /usr/local/lib/libignite-odbc.so.
+ If there is unresolved links to other libraries you may want to add
+ directories with these libraries to the LD_LIBRARY_PATH.
2. Edit file $IGNITE_HOME/platforms/cpp/odbc/install/ignite-odbc-install.ini
and ensure that "Driver" parameter of the "Apache Ignite" section points
@@ -66,7 +68,8 @@ dependencies can be resolved i.e. they can be found either in the %PATH% or
in the same directory as the driver.
After that you should use one of the install scripts from the directory
-%IGNITE_HOME%/platforms/cpp/odbc/install:
+%IGNITE_HOME%/platforms/cpp/odbc/install. Note that most likely you will
+need OS administrator privileges to execute these scripts.
For the 32-bit Windows you should use file install_x86.cmd like that:
$ install_x86 <absolute_path_to_32_bit_driver>
@@ -74,8 +77,6 @@ $ install_x86 <absolute_path_to_32_bit_driver>
For the 64-bit Windows you should use file install_amd64.cmd like that:
$ install_amd64 <absolute_path_to_64_bit_driver> [<absolute_path_to_32_bit_driver>]
-Most likely you will need OS administrator privileges to execute these scripts.
-
Thats it. Your driver/drivers are installed.
After the installation
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/odbc/install/install_amd64.cmd
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/install/install_amd64.cmd b/modules/platforms/cpp/odbc/install/install_amd64.cmd
index 15b7bd8..8a0391f 100644
--- a/modules/platforms/cpp/odbc/install/install_amd64.cmd
+++ b/modules/platforms/cpp/odbc/install/install_amd64.cmd
@@ -1,29 +1,40 @@
@echo off
-set ODBC_AMD64="%1"
-set ODBC_X86="%2"
+set ODBC_AMD64=%1
+set ODBC_X86=%2
-if exist %ODBC_AMD64% (
- :: Installing 64-bit driver.
+if [%ODBC_AMD64%] == [] (
+ echo error: 64-bit driver is not specified. Call format: install_amd64 abs_path_to_64_bit_driver [abs_path_to_32_bit_driver]
+ pause
+ exit /b 1
+) else if exist "%ODBC_AMD64%" (
+ if exist "%ODBC_AMD64%\" (
+ echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead.
+ )
+ echo Installing 64-bit driver: "%ODBC_AMD64%"
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v DriverODBCVer /t REG_SZ /d "03.80" /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v UsageCount /t REG_DWORD /d 00000001 /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ /d "%ODBC_AMD64%" /f
- reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Setup /t REG_SZ /d "%ODBC_AMD64%" /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache Ignite" /t REG_SZ /d "Installed" /f
) else (
- echo 64-bit driver can not be found: %ODBC_AMD64%
- echo Call format: install_amd64 path_to_64_bit_driver [path_to_32_bit_driver]
+ echo 64-bit driver can not be found: "%ODBC_AMD64%"
+ echo Call format: install_amd64 abs_path_to_64_bit_driver [abs_path_to_32_bit_driver]
pause
exit /b 1
)
-if exist %ODBC_X86% (
- rem Installing 32-bit driver.
+if [%ODBC_X86%] == [] (
+ echo warning: 32-bit driver is not specified. If you want to install 32-bit driver please specify path to it as a second argument.
+) else if exist "%ODBC_X86%" (
+ if exist "%ODBC_X86%\" (
+ echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead.
+ )
+ echo Installing 32-bit driver: "%ODBC_X86%"
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v DriverODBCVer /t REG_SZ /d "03.80" /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v UsageCount /t REG_DWORD /d 00000001 /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ /d "%ODBC_X86%" /f
- reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v Setup /t REG_SZ /d "%ODBC_X86%" /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache Ignite" /t REG_SZ /d "Installed" /f
) else (
- echo 32-bit driver can not be found: %ODBC_X86%
-)
\ No newline at end of file
+ echo warning: 32-bit driver can not be found: "%ODBC_X86%"
+)
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a9c35db/modules/platforms/cpp/odbc/install/install_x86.cmd
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/install/install_x86.cmd b/modules/platforms/cpp/odbc/install/install_x86.cmd
index 077589d..74eea0a 100644
--- a/modules/platforms/cpp/odbc/install/install_x86.cmd
+++ b/modules/platforms/cpp/odbc/install/install_x86.cmd
@@ -1,16 +1,21 @@
@echo off
-set ODBC="%1"
+set ODBC=%1
-if exist %ODBC% (
- :: Installing driver.
+if [%ODBC%] == [] (
+ echo error: driver is not specified. Call format: install_x86 abs_path_to_driver.
+ pause
+) else if exist "%ODBC%" (
+ if exist "%ODBC%\" (
+ echo warning: The path you have specified seems to be a directory. Note that you have to specify path to driver file itself instead.
+ )
+ echo Installing driver: "%ODBC%"
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v DriverODBCVer /t REG_SZ /d "03.80" /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v UsageCount /t REG_DWORD /d 00000001 /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ /d "%ODBC%" /f
- reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Setup /t REG_SZ /d "%ODBC%" /f
reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache Ignite" /t REG_SZ /d "Installed" /f
) else (
- echo Driver can not be found: %ODBC%
- echo Call format: install_x86 path_to_driver
+ echo Driver can not be found: "%ODBC%"
+ echo Call format: install_x86 abs_path_to_driver
pause
)