trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [1/2] incubator-trafodion git commit: [TRAFODION-2319]update dependencies and version of ODB for windows
Date Thu, 27 Oct 2016 15:16:47 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 8fa6622b3 -> 9585cf035


[TRAFODION-2319]update dependencies and version of ODB for windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3652a5b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3652a5b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3652a5b2

Branch: refs/heads/master
Commit: 3652a5b24309f205417462e626ced21b43c3b0aa
Parents: bbcfca5
Author: Weqing Xu <xuweiqingchn@gmail.com>
Authored: Thu Oct 27 21:10:13 2016 +0800
Committer: Weqing Xu <xuweiqingchn@gmail.com>
Committed: Thu Oct 27 21:18:13 2016 +0800

----------------------------------------------------------------------
 .rat-excludes                         |   1 +
 core/conn/odb/build.bat               |   7 +------
 core/conn/odb/odb/odb.rc              | Bin 0 -> 5124 bytes
 core/conn/odb/odb/odb.vcxproj         |   4 ++++
 core/conn/odb/odb/odb.vcxproj.filters |   8 ++++++++
 5 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3652a5b2/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 3b8f9ab..5d80607 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -112,6 +112,7 @@ resource.h*
 resource.hm*
 odb.sln
 odb.vcxproj.*
+odb.rc
 # BSD licensed files
 swscanf.cpp
 swsprintf.cpp

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3652a5b2/core/conn/odb/build.bat
----------------------------------------------------------------------
diff --git a/core/conn/odb/build.bat b/core/conn/odb/build.bat
index ce8c4de..ac31a8d 100644
--- a/core/conn/odb/build.bat
+++ b/core/conn/odb/build.bat
@@ -31,11 +31,6 @@ set ZLIB_INCLUDE_PATH=C:\zlib\include
 REM set this to zlib library files directory
 set ZLIB_LIB_PATH=C:\zlib\lib
 
-REM set this to openssl header files directory
-set OPENSSL_INCLUDE_PATH=C:\openssl-1.0.1e\include
-REM set this to openssl library files directory
-set OPENSSL_LIB_PATH=C:\openssl-1.0.1e\lib
-
 set ALL_SUCCESS=0
 
 echo=
@@ -53,4 +48,4 @@ if %ERRORLEVEL% == 0 (
 	echo Build windows ODB success
 ) else (
 	echo Build windows ODB failed
-)
\ No newline at end of file
+)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3652a5b2/core/conn/odb/odb/odb.rc
----------------------------------------------------------------------
diff --git a/core/conn/odb/odb/odb.rc b/core/conn/odb/odb/odb.rc
new file mode 100644
index 0000000..fc5cdf4
Binary files /dev/null and b/core/conn/odb/odb/odb.rc differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3652a5b2/core/conn/odb/odb/odb.vcxproj
----------------------------------------------------------------------
diff --git a/core/conn/odb/odb/odb.vcxproj b/core/conn/odb/odb/odb.vcxproj
index 4f7bf85..153cebe 100644
--- a/core/conn/odb/odb/odb.vcxproj
+++ b/core/conn/odb/odb/odb.vcxproj
@@ -160,6 +160,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\verslib.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="odb.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3652a5b2/core/conn/odb/odb/odb.vcxproj.filters
----------------------------------------------------------------------
diff --git a/core/conn/odb/odb/odb.vcxproj.filters b/core/conn/odb/odb/odb.vcxproj.filters
index 36af49f..c5a0e1c 100644
--- a/core/conn/odb/odb/odb.vcxproj.filters
+++ b/core/conn/odb/odb/odb.vcxproj.filters
@@ -32,5 +32,13 @@
     <ClInclude Include="..\src\verslib.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="odb.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file


Mime
View raw message