Fixing CPP examples relative paths.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7230dae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7230dae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7230dae Branch: refs/heads/ignite-1093-2 Commit: f7230daeb3c8b625c88eb7ca2c87fa02197175cf Parents: 8251873 Author: vozerov-gridgain <[email protected]> Authored: Wed Sep 9 13:22:12 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Sep 9 13:22:12 2015 +0300 ---------------------------------------------------------------------- examples/config/platform/cpp/example-cache.xml | 87 ++++++++++++++++++++ .../cpp/project/vs/ignite-examples.vcxproj | 28 +++---- .../project/vs/ignite-examples.vcxproj.filters | 6 +- 3 files changed, 104 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f7230dae/examples/config/platform/cpp/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/platform/cpp/example-cache.xml b/examples/config/platform/cpp/example-cache.xml new file mode 100644 index 0000000..d720a98 --- /dev/null +++ b/examples/config/platform/cpp/example-cache.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + GridGain Spring configuration file to startup grid cache. + + When starting a standalone GridGain node, you need to execute the following command: + {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache-dotnet.xml + + When starting GridGain from Java IDE, pass path to this file to GridGain: + GridGain.start("examples/config/example-cache-dotnet.xml"); +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:util="http://www.springframework.org/schema/util"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd";> + <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <!-- Set to true to enable distributed class loading for examples, default is false. --> + <property name="peerClassLoadingEnabled" value="true"/> + + <property name="cacheConfiguration"> + <list> + <!-- + Partitioned cache example configuration with portable objects enabled. + Used in .NET example that is available only in enterprise edition. + --> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="atomicityMode" value="ATOMIC"/> + <property name="backups" value="1"/> + </bean> + + <!-- + Partitioned cache example configuration. + Used in .NET cache store example that is available only in enterprise edition. + --> + <bean class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="name" value="tx"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + <property name="backups" value="1"/> + </bean> + </list> + </property> + + <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> + <property name="discoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> + <property name="ipFinder"> + <!-- + GridGain provides several options for automatic discovery that can be used + instead os static IP based discovery. For information on all options refer + to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery + --> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> + <property name="addresses"> + <list> + <!-- In distributed environment, replace with actual host IP address. --> + <value>127.0.0.1:47500..47501</value> + </list> + </property> + </bean> + </property> + </bean> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/f7230dae/examples/platform/cpp/project/vs/ignite-examples.vcxproj ---------------------------------------------------------------------- diff --git a/examples/platform/cpp/project/vs/ignite-examples.vcxproj b/examples/platform/cpp/project/vs/ignite-examples.vcxproj index 845aa53..9331296 100644 --- a/examples/platform/cpp/project/vs/ignite-examples.vcxproj +++ b/examples/platform/cpp/project/vs/ignite-examples.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> @@ -19,14 +19,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> @@ -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;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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> </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>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <PostBuildEvent> - <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)" -copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command> + <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> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -79,7 +79,7 @@ copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configurat <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;..\include;..\..\..\..\platforms\cpp\common\os\win\include;..\..\..\..\platforms\cpp\common\include;..\..\..\..\platforms\cpp\core\os\win\include;..\..\..\..\platforms\cpp\core\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -87,19 +87,19 @@ copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configurat <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalDependencies>jvm.lib;ignite.common.lib;ignite.core.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>..\..\..\..\..\modules\platform\src\main\cpp\project\vs\$(Platform)\$(Configuration)\;$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <PostBuildEvent> - <Command>copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.common.dll" "$(OutDir)" -copy "$(ProjectDir)..\..\..\..\platforms\cpp\project\vs\$(Platform)\$(Configuration)\ignite.core.dll" "$(OutDir)"</Command> + <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> </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\src\putgetexample.cpp" /> + <ClCompile Include="..\..\src\putgetexample.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\include\ignite\examples\address.h" /> - <ClInclude Include="..\include\ignite\examples\organization.h" /> + <ClInclude Include="..\..\include\ignite\examples\address.h" /> + <ClInclude Include="..\..\include\ignite\examples\organization.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> http://git-wip-us.apache.org/repos/asf/ignite/blob/f7230dae/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters ---------------------------------------------------------------------- diff --git a/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters b/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters index 78a7847..ca62db7 100644 --- a/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters +++ b/examples/platform/cpp/project/vs/ignite-examples.vcxproj.filters @@ -15,15 +15,15 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\src\putgetexample.cpp"> + <ClCompile Include="..\..\src\putgetexample.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\include\ignite\examples\address.h"> + <ClInclude Include="..\..\include\ignite\examples\address.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\include\ignite\examples\organization.h"> + <ClInclude Include="..\..\include\ignite\examples\organization.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup>
