ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/3] ignite git commit: IGNITE-1513: Correct CPP placement.
Date Fri, 18 Sep 2015 10:31:14 GMT
IGNITE-1513: Correct CPP placement.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/732fa0a6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/732fa0a6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/732fa0a6

Branch: refs/heads/ignite-1513
Commit: 732fa0a669b7b68bb0e245bbdb6a5f2c34b0a2aa
Parents: 30f3725
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Sep 18 13:26:13 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Sep 18 13:26:13 2015 +0300

----------------------------------------------------------------------
 .../platform/src/main/cpp/examples/Makefile.am  |  2 +-
 .../platform/src/main/cpp/examples/configure.ac | 22 +++++++++++++-------
 .../examples/project/vs/ignite-examples.vcxproj | 16 +++++++-------
 .../src/main/cpp/examples/src/putgetexample.cpp |  2 +-
 4 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/732fa0a6/modules/platform/src/main/cpp/examples/Makefile.am
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/examples/Makefile.am b/modules/platform/src/main/cpp/examples/Makefile.am
index 84fe957..d99cd82 100644
--- a/modules/platform/src/main/cpp/examples/Makefile.am
+++ b/modules/platform/src/main/cpp/examples/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = "-Im4"
 
-SUBDIRS = . include
+SUBDIRS = .
 DIST_SUBDIRS = . include
 
 AM_CPPFLAGS = -I$(srcdir)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -DIGNITE_IMPL

http://git-wip-us.apache.org/repos/asf/ignite/blob/732fa0a6/modules/platform/src/main/cpp/examples/configure.ac
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/examples/configure.ac b/modules/platform/src/main/cpp/examples/configure.ac
index a665d7b..a5e902d 100644
--- a/modules/platform/src/main/cpp/examples/configure.ac
+++ b/modules/platform/src/main/cpp/examples/configure.ac
@@ -1,21 +1,28 @@
-dnl Process this file with autoconf to produce a configure script.
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.68)
+AC_PREREQ([2.69])
 AC_INIT([Ingnite C++ examples],[1.4.0],[dec@ignite.apache.org],[ignite-examples],[ignite.apache.org])
-AC_CONFIG_SRCDIR([src])
+AC_CONFIG_SRCDIR(src)
+
+AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([m4])
 AC_LANG([C++])
 
-AC_CANONICAL_SYSTEM
+# Initialize automake
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+AC_CONFIG_HEADER(config.h)
 
-dnl Initialize automake
-AM_INIT_AUTOMAKE([-Wall foreign])
-AC_CONFIG_HEADER([config.h])
+AM_PROG_AR
 
+# Checks for programs.
 GXX="-g -O2"
 
 AC_PROG_CXX
 
+# Initialize Libtool
+LT_INIT
+
 AC_ARG_ENABLE([debug],
  [AS_HELP_STRING([--enable-debug],[enable debug build [default=no]])],
  [],[enable_debug=no])
@@ -27,4 +34,5 @@ else
 fi
 
 AC_CONFIG_FILES(Makefile)
+
 AC_OUTPUT

http://git-wip-us.apache.org/repos/asf/ignite/blob/732fa0a6/modules/platform/src/main/cpp/examples/project/vs/ignite-examples.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/examples/project/vs/ignite-examples.vcxproj b/modules/platform/src/main/cpp/examples/project/vs/ignite-examples.vcxproj
index 9331296..13ec564 100644
--- a/modules/platform/src/main/cpp/examples/project/vs/ignite-examples.vcxproj
+++ b/modules/platform/src/main/cpp/examples/project/vs/ignite-examples.vcxproj
@@ -55,7 +55,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\include;..\..\..\..\..\modules\platform\src\main\cpp\common\os\win\include;..\..\..\..\..\modules\platform\src\main\cpp\common\include;..\..\..\..\..\modules\platform\src\main\cpp\core\os\win\include;..\..\..\..\..\modules\platform\src\main\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\include;..\..\..\src\common\os\win\include;..\..\..\src\common\include;..\..\..\src\core\os\win\include;..\..\..\src\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -63,11 +63,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\src\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll"
"$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll"
"$(OutDir)"</Command>
+      <Command>copy "$(ProjectDir)..\..\..\src\project\vs\$(Platform)\$(Configuration)\ignite.common.dll"
"$(OutDir)"
+copy "$(ProjectDir)..\..\..\src\\project\vs\$(Platform)\$(Configuration)\ignite.core.dll"
"$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -79,7 +79,7 @@ copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Pla
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\include;..\..\..\..\..\modules\platform\src\main\cpp\common\os\win\include;..\..\..\..\..\modules\platform\src\main\cpp\common\include;..\..\..\..\..\modules\platform\src\main\cpp\core\os\win\include;..\..\..\..\..\modules\platform\cpp\src\main\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\..\include;..\..\..\src\common\os\win\include;..\..\..\src\common\include;..\..\..\src\core\os\win\include;..\..\..\src\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,11 +87,11 @@ copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Pla
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\src\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll"
"$(OutDir)"
-copy "$(ProjectDir)..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll"
"$(OutDir)"</Command>
+      <Command>copy "$(ProjectDir)..\..\..\src\project\vs\$(Platform)\$(Configuration)\ignite.common.dll"
"$(OutDir)"
+copy "$(ProjectDir)..\..\..\src\project\vs\$(Platform)\$(Configuration)\ignite.core.dll"
"$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

http://git-wip-us.apache.org/repos/asf/ignite/blob/732fa0a6/modules/platform/src/main/cpp/examples/src/putgetexample.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/examples/src/putgetexample.cpp b/modules/platform/src/main/cpp/examples/src/putgetexample.cpp
index 2f82a7d..206a2f4 100644
--- a/modules/platform/src/main/cpp/examples/src/putgetexample.cpp
+++ b/modules/platform/src/main/cpp/examples/src/putgetexample.cpp
@@ -88,7 +88,7 @@ int main()
     cfg.jvmInitMem = 512;
     cfg.jvmMaxMem = 512;
     
-    cfg.springCfgPath = "examples/config/platform/cpp/example-cache.xml";
+    cfg.springCfgPath = "platforms/cpp/examples/config/example-cache.xml";
  
     try 
     {


Mime
View raw message