ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [3/9] ignite git commit: IGNITE-1786: Fix for .Net solution.
Date Wed, 04 May 2016 14:20:55 GMT
IGNITE-1786: Fix for .Net solution.


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

Branch: refs/heads/ignite-1786
Commit: b3966a1696b7d82a79b05dfdfe8119dcb24cf8a3
Parents: ee3b730
Author: isapego <isapego@gridgain.com>
Authored: Fri Apr 29 18:03:57 2016 +0300
Committer: isapego <isapego@gridgain.com>
Committed: Fri Apr 29 18:03:57 2016 +0300

----------------------------------------------------------------------
 .../Apache.Ignite.Core/Apache.Ignite.Core.csproj       |  4 ++--
 .../dotnet/Apache.Ignite.Core/build-common.ps1         | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b3966a16/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index e16146c..409a7cf 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -471,10 +471,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\x64\$(Configuration)\ignite.jni.dll">
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\jni\project\vs\x64\$(Configuration)\ignite.jni.dll">
       <Link>resources\$(Configuration)\x64\ignite.jni.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.jni.dll"
Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.jni.dll')">
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\jni\project\vs\Win32\$(Configuration)\ignite.jni.dll"
Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\jni\project\vs\Win32\$(Configuration)\ignite.jni.dll')">
       <Link>resources\$(Configuration)\x86\ignite.jni.dll</Link>
     </EmbeddedResource>
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/ignite/blob/b3966a16/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
index 3df6c76..db24751 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
@@ -61,4 +61,17 @@ if ($env:JAVA_HOME32) {
     $env:JAVA_HOME = $env:JAVA_HOME32
 
     & $msbuildexe "..\..\cpp\common\project\vs\common.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration
/t:Rebuild
+}
+
+# build jni project
+if ($env:JAVA_HOME64) {
+    $env:JAVA_HOME = $env:JAVA_HOME64
+
+    & $msbuildexe "..\..\cpp\jni\project\vs\jni.vcxproj" /p:Platform=x64 /p:Configuration=$Configuration
/t:Rebuild
+}
+
+if ($env:JAVA_HOME32) {
+    $env:JAVA_HOME = $env:JAVA_HOME32
+
+    & $msbuildexe "..\..\cpp\jni\project\vs\jni.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration
/t:Rebuild
 }
\ No newline at end of file


Mime
View raw message