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/10/18 20:52:52 UTC
[3/4] incubator-trafodion git commit: remove env variable VCREDIST
defined in build_os.bat add Integer-type return variable in Exec func in
installer.iss
remove env variable VCREDIST defined in build_os.bat
add Integer-type return variable in Exec func in installer.iss
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/da9d08ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/da9d08ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/da9d08ee
Branch: refs/heads/master
Commit: da9d08ee6f0eecd1d68c12330afc029c845fcb02
Parents: cd04a84
Author: zx <zx...@vm01.novalocal>
Authored: Tue Oct 18 05:26:20 2016 +0000
Committer: zx <zx...@vm01.novalocal>
Committed: Tue Oct 18 05:26:20 2016 +0000
----------------------------------------------------------------------
win-odbc64/Install/win64_installer/installer.iss | 1 +
win-odbc64/odbcclient/build_os.bat | 6 +-----
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/da9d08ee/win-odbc64/Install/win64_installer/installer.iss
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/win64_installer/installer.iss b/win-odbc64/Install/win64_installer/installer.iss
index 64fbec2..fc309df 100644
--- a/win-odbc64/Install/win64_installer/installer.iss
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -149,6 +149,7 @@ var
sDefaultBrowserValue: String;
iQuotePos: Integer;
lLength: Longint;
+ iRetCode: Integer;
begin
if CurStep=ssPostInstall then
begin
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/da9d08ee/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat
index 284563a..480d9dc 100644
--- a/win-odbc64/odbcclient/build_os.bat
+++ b/win-odbc64/odbcclient/build_os.bat
@@ -20,10 +20,6 @@ REM under the License.
REM
REM @@@ END COPYRIGHT @@@
-
-REM download vcredist_x64.exe form http://www.microsoft.com/en-us/download/details.aspx?id=40784 and copy it to VC_REDIST_DIR.
-set VC_REDIST_DIR=C:\Build\winodbc64\redist
-
REM set this to the directory where you want to put the driver package file
set PACKDIR=C:\Build\winodbc64
@@ -174,4 +170,4 @@ if %ALL_SUCCESS%==1 (
echo BUILD WIN64 RELEASE SUCCESSFULLY
echo ========================================
echo=
-)
\ No newline at end of file
+)