Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0218B200BC2 for ; Thu, 3 Nov 2016 04:07:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 00B8E160B0A; Thu, 3 Nov 2016 03:07:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 465FB160AFB for ; Thu, 3 Nov 2016 04:07:17 +0100 (CET) Received: (qmail 50400 invoked by uid 500); 3 Nov 2016 03:07:16 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 50391 invoked by uid 99); 3 Nov 2016 03:07:16 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2016 03:07:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id C01AC180481 for ; Thu, 3 Nov 2016 03:07:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id CA8gMZIy0FII for ; Thu, 3 Nov 2016 03:07:14 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id ADC235FBCF for ; Thu, 3 Nov 2016 03:07:13 +0000 (UTC) Received: (qmail 50300 invoked by uid 99); 3 Nov 2016 03:07:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2016 03:07:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95F55E0FC4; Thu, 3 Nov 2016 03:07:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liuming@apache.org To: commits@trafodion.incubator.apache.org Date: Thu, 03 Nov 2016 03:07:12 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-trafodion git commit: [TRAFODION-2319]add missing file resource.h archived-at: Thu, 03 Nov 2016 03:07:18 -0000 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 Authored: Fri Oct 28 14:30:29 2016 +0800 Committer: Weqing Xu 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