trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lium...@apache.org
Subject [1/2] incubator-trafodion git commit: [TRAFODION-2319]add missing file resource.h
Date Thu, 03 Nov 2016 03:07:12 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 9c712a4aa -> 6862bf724


[TRAFODION-2319]add missing file resource.h


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

Branch: refs/heads/master
Commit: b7a3f1ec8fc6bee423c1af3c13bff79167401993
Parents: 3652a5b
Author: Weqing Xu <xuweiqingchn@gmail.com>
Authored: Fri Oct 28 14:30:29 2016 +0800
Committer: Weqing Xu <xuweiqingchn@gmail.com>
Committed: Sun Oct 30 18:28:59 2016 +0800

----------------------------------------------------------------------
 core/conn/odb/build.bat      |   5 +++--
 core/conn/odb/odb/odb.rc     | Bin 5124 -> 5120 bytes
 core/conn/odb/odb/resource.h |  14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7a3f1ec/core/conn/odb/build.bat
----------------------------------------------------------------------
diff --git a/core/conn/odb/build.bat b/core/conn/odb/build.bat
index ac31a8d..0d915ec 100644
--- a/core/conn/odb/build.bat
+++ b/core/conn/odb/build.bat
@@ -41,9 +41,10 @@ echo=
 
 echo Building ODB - Win64 Release...
 cd %BUILDDIR%\odb
-msbuild.exe /t:rebuild odb.vcxproj /p:Platform=x64 /p:Configuration=Release /p:ZlibLibDir=%ZLIB_LIB_PATH%
+msbuild.exe /t:rebuild odb.vcxproj /p:Platform=x64 /p:Configuration=Release /p:ZlibIncludeDir=%ZLIB_INCLUDE_PATH%
/p:ZlibLibDir=%ZLIB_LIB_PATH%
+set BUILD_STATUS=%ERRORLEVEL%
 cd %BUILDDIR%
-if %ERRORLEVEL% == 0 (
+if %BUILD_STATUS% == 0 (
 	copy /Y odb\x64\Release\odb.exe %PACKDIR%
 	echo Build windows ODB success
 ) else (

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7a3f1ec/core/conn/odb/odb/odb.rc
----------------------------------------------------------------------
diff --git a/core/conn/odb/odb/odb.rc b/core/conn/odb/odb/odb.rc
index fc5cdf4..3af5cde 100644
Binary files a/core/conn/odb/odb/odb.rc and b/core/conn/odb/odb/odb.rc differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b7a3f1ec/core/conn/odb/odb/resource.h
----------------------------------------------------------------------
diff --git a/core/conn/odb/odb/resource.h b/core/conn/odb/odb/resource.h
new file mode 100644
index 0000000..0e00de8
--- /dev/null
+++ b/core/conn/odb/odb/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by odb.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif


Mime
View raw message