You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/25 20:30:47 UTC
[1/4] incubator-trafodion git commit: [TRAFODION-1931]add a script to
build odb for windows
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 68ea607d5 -> 39ae47305
[TRAFODION-1931]add a script to build odb for windows
Add a script to build odb for windows. The target will be copied to
C:\Build\odb. User can modify the PACKDIR to other place if needed .
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cf3418a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cf3418a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cf3418a6
Branch: refs/heads/master
Commit: cf3418a62c3e9ed5d8f1898e8d1ab8ac3b1d5dcf
Parents: d02fe47
Author: Weiqing Xu <xu...@gmail.com>
Authored: Fri May 20 16:50:22 2016 +0800
Committer: Weiqing Xu <xu...@gmail.com>
Committed: Fri May 20 16:50:22 2016 +0800
----------------------------------------------------------------------
core/conn/odb/build.bat | 56 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf3418a6/core/conn/odb/build.bat
----------------------------------------------------------------------
diff --git a/core/conn/odb/build.bat b/core/conn/odb/build.bat
new file mode 100644
index 0000000..8647278
--- /dev/null
+++ b/core/conn/odb/build.bat
@@ -0,0 +1,56 @@
+@echo off
+REM @@@ START COPYRIGHT @@@
+REM
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+REM
+REM @@@ END COPYRIGHT @@@
+
+set PACKDIR=C:\Build\odb
+
+SET BUILDDIR=%CD%
+set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
+set PATH=%MSBUILD_PATH%;%PATH%
+
+REM set this to zlib header files directory
+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=
+echo ===============================
+echo BUILD WIN64 RELEASE
+echo ===============================
+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%
+cd %BUILDDIR%
+if %ERRORLEVEL% == 0 (
+ copy /Y odb\x64\Release\odb.exe %PACKDIR%
+ echo Build windows ODB success
+) else (
+ echo Build windows ODB fialed
+)
\ No newline at end of file
[3/4] incubator-trafodion git commit: fix a spelling error
Posted by db...@apache.org.
fix a spelling error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e7299935
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e7299935
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e7299935
Branch: refs/heads/master
Commit: e72999356bdab254f45245d9e6e94e883cfa16f9
Parents: 8bc4f72
Author: Weiqing Xu <xu...@gmail.com>
Authored: Wed May 25 08:48:30 2016 +0800
Committer: Weiqing Xu <xu...@gmail.com>
Committed: Wed May 25 08:48:30 2016 +0800
----------------------------------------------------------------------
core/conn/odb/build.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e7299935/core/conn/odb/build.bat
----------------------------------------------------------------------
diff --git a/core/conn/odb/build.bat b/core/conn/odb/build.bat
index 8647278..ce8c4de 100644
--- a/core/conn/odb/build.bat
+++ b/core/conn/odb/build.bat
@@ -52,5 +52,5 @@ if %ERRORLEVEL% == 0 (
copy /Y odb\x64\Release\odb.exe %PACKDIR%
echo Build windows ODB success
) else (
- echo Build windows ODB fialed
+ echo Build windows ODB failed
)
\ No newline at end of file
[4/4] incubator-trafodion git commit: Merge [TRAFODION-1931] PR 498
Add windows build script for odb
Posted by db...@apache.org.
Merge [TRAFODION-1931] PR 498 Add windows build script for odb
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/39ae4730
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/39ae4730
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/39ae4730
Branch: refs/heads/master
Commit: 39ae47305de9c5c10bc287371703f5baac57752f
Parents: 68ea607 e729993
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 25 20:30:05 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 25 20:30:05 2016 +0000
----------------------------------------------------------------------
core/conn/odb/build.bat | 56 ++++++++++++++++++++++++++++++++++++++
core/conn/odb/odb/odb.vcxproj | 2 ++
2 files changed, 58 insertions(+)
----------------------------------------------------------------------
[2/4] incubator-trafodion git commit: update the VS project file
Posted by db...@apache.org.
update the VS project file
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8bc4f72e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8bc4f72e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8bc4f72e
Branch: refs/heads/master
Commit: 8bc4f72e85f6bdd774bd90130fa1d2901df40546
Parents: cf3418a
Author: Weiqing Xu <xu...@gmail.com>
Authored: Mon May 23 14:44:39 2016 +0800
Committer: Weiqing Xu <xu...@gmail.com>
Committed: Mon May 23 14:44:39 2016 +0800
----------------------------------------------------------------------
core/conn/odb/odb/odb.vcxproj | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8bc4f72e/core/conn/odb/odb/odb.vcxproj
----------------------------------------------------------------------
diff --git a/core/conn/odb/odb/odb.vcxproj b/core/conn/odb/odb/odb.vcxproj
index 8d1150a..4f7bf85 100644
--- a/core/conn/odb/odb/odb.vcxproj
+++ b/core/conn/odb/odb/odb.vcxproj
@@ -133,6 +133,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
+ <AdditionalIncludeDirectories>$(ZlibIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -143,6 +144,7 @@
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
+ <AdditionalLibraryDirectories>$(ZlibLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>