You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/10/29 00:38:01 UTC
[4/8] incubator-trafodion git commit: use environment vairable in the
inno setup script
use environment vairable in the inno setup script
1. use environment vairable in the inno setup script instead of hardcode
path
2. keep SetCertificate in the old place
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/521c35c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/521c35c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/521c35c6
Branch: refs/heads/master
Commit: 521c35c6201115a447cf67b47835a9de00812a11
Parents: f9bc12d
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Tue Oct 20 16:10:18 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Tue Oct 20 16:10:18 2015 +0800
----------------------------------------------------------------------
.../SetCertificateDirReg/SetCertDirDlg.cpp | 165 +++++++++++++++
.../SetCertificateDirReg/SetCertDirDlg.h | 47 +++++
.../SetCertificateDirReg.cpp | 58 ++++++
.../SetCertificateDirReg/SetCertificateDirReg.h | 23 +++
.../SetCertificateDirReg.rc | 111 ++++++++++
.../SetCertificateDirReg_os.vcxproj | 200 +++++++++++++++++++
.../SetCertificateDirReg_os.vcxproj.filters | 53 +++++
.../SetCertificateDirReg_os.vcxproj.user | 3 +
.../SetCertificateDirReg/dialog.bmp | Bin 0 -> 99008 bytes
.../SetCertificateDirReg/odbccp32.props | 18 ++
.../SetCertificateDirReg/resource.h | 40 ++++
.../SetCertificateDirReg/stdafx.cpp | 28 +++
.../SetCertificateDirReg/stdafx.h | 68 +++++++
.../SetCertificateDirReg_os.sln | 26 +++
.../Install/win64_installer/installer.iss | 20 +-
win-odbc64/odbcclient/README.txt | 11 +-
win-odbc64/odbcclient/build_os.bat | 36 ++--
win-odbc64/odbcclient/odbcclient_os.sln | 14 ++
18 files changed, 894 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
new file mode 100644
index 0000000..6891b86
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
@@ -0,0 +1,165 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// SetCertDirDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "SetCertificateDirReg.h"
+#include "SetCertDirDlg.h"
+#include <odbcinst.h>
+#include <ShlObj.h>
+
+
+#define ODBC_SET_CERTIFICATE_DIR ODBC_CONFIG_DRIVER_MAX+1
+
+CString ErrorString(DWORD err)
+{
+ CString Error;
+ LPTSTR s;
+ if(::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ err,
+ 0,
+ (LPTSTR)&s,
+ 0,
+ NULL) == 0)
+ {
+ Error = "Unknown error code";
+ }
+ else
+ {
+ LPTSTR p = _tcschr(s, _T('\r'));
+ if(p != NULL)
+ { /* lose CRLF */
+ *p = _T('\0');
+ } /* lose CRLF */
+ Error = s;
+ ::LocalFree(s);
+ }
+ return Error;
+
+} // ErrorString()
+
+// SetCertDirDlg dialog
+
+IMPLEMENT_DYNAMIC(SetCertDirDlg, CDialog)
+
+SetCertDirDlg::SetCertDirDlg(CWnd* pParent /*=NULL*/)
+ : CDialog(SetCertDirDlg::IDD, pParent)
+{
+
+}
+
+SetCertDirDlg::~SetCertDirDlg()
+{
+}
+
+void SetCertDirDlg::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_EDIT1, m_CertificatePath);
+ m_CertificatePath.SetWindowText("SYSTEM_DEFAULT");
+}
+
+
+BEGIN_MESSAGE_MAP(SetCertDirDlg, CDialog)
+ ON_BN_CLICKED(IDC_BUTTON1, &SetCertDirDlg::OnBnClickedButton1)
+ ON_BN_CLICKED(IDOK, &SetCertDirDlg::OnBnClickedOk)
+ ON_EN_CHANGE(IDC_EDIT1, &SetCertDirDlg::OnEnChangeEdit1)
+END_MESSAGE_MAP()
+
+
+// SetCertDirDlg message handlers
+
+void SetCertDirDlg::OnBnClickedButton1()
+{
+ LPMALLOC pMalloc;
+
+ if( SUCCEEDED( SHGetMalloc( &pMalloc ) ) )
+ {
+ TCHAR szTitle[] = _T("Choose Directory for storing certificates.");
+ BROWSEINFO bi;
+ ZeroMemory( &bi, sizeof( bi ) );
+ bi.hwndOwner = NULL;
+ bi.pszDisplayName = NULL;
+ bi.lpszTitle = szTitle;
+ bi.pidlRoot = NULL;
+ bi.ulFlags = BIF_RETURNONLYFSDIRS;
+
+ LPITEMIDLIST pidl = SHBrowseForFolder( &bi );
+ if( pidl )
+ {
+ TCHAR szDir[MAX_PATH];
+ if( SHGetPathFromIDList( pidl, szDir ) )
+ {
+ m_CertificatePath.SetWindowText(szDir);
+ m_CertificatePath.SetFocus();
+ }
+ pMalloc->Free(pidl);
+ pMalloc->Release();
+ }
+ }
+}
+
+void SetCertDirDlg::OnBnClickedOk()
+{
+ const char DriverName[]= "TRAF ODBC 1.0";
+ CString szCertificateDir;
+ TCHAR szCertificateDirRegEntry[_MAX_PATH];
+ CHAR szConfigMsg[_MAX_PATH] = "";
+ WORD cbPathOut;
+
+ m_CertificatePath.GetWindowText(szCertificateDir);
+
+ sprintf_s(szCertificateDirRegEntry,"CertificateDir=%s\0",szCertificateDir);
+ SQLConfigDriver( NULL, ODBC_CONFIG_DRIVER, DriverName,
+ szCertificateDirRegEntry,szConfigMsg,
+ sizeof(szConfigMsg), &cbPathOut );
+ /*
+ if(!SQLConfigDriver( NULL, ODBC_CONFIG_DRIVER, DriverName,
+ szCertificateDirRegEntry,szConfigMsg,
+ sizeof(szConfigMsg), &cbPathOut ))
+ {
+ CString szErrorMessage;
+ DWORD dwErrorCode;
+ WORD wRetSize;
+ LPSTR pszMessage=szErrorMessage.GetBuffer(SQL_MAX_MESSAGE_LENGTH-4);
+ SQLInstallerError(1,&dwErrorCode,pszMessage,SQL_MAX_MESSAGE_LENGTH-8,&wRetSize);
+ szErrorMessage.ReleaseBuffer();
+ szErrorMessage+="\nDriver Diags:";
+ szErrorMessage+=szConfigMsg;
+ MessageBox(szErrorMessage,"SQLConfigDriver Failed",MB_ICONERROR|MB_OK);
+ }
+ */
+ OnOK();
+}
+
+
+void SetCertDirDlg::OnEnChangeEdit1()
+{
+ // TODO: If this is a RICHEDIT control, the control will not
+ // send this notification unless you override the CDialog::OnInitDialog()
+ // function and call CRichEditCtrl().SetEventMask()
+ // with the ENM_CHANGE flag ORed into the mask.
+
+ // TODO: Add your control notification handler code here
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
new file mode 100644
index 0000000..1142152
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
@@ -0,0 +1,47 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+#pragma once
+#include "afxwin.h"
+
+
+// SetCertDirDlg dialog
+
+class SetCertDirDlg : public CDialog
+{
+ DECLARE_DYNAMIC(SetCertDirDlg)
+
+public:
+ SetCertDirDlg(CWnd* pParent = NULL); // standard constructor
+ virtual ~SetCertDirDlg();
+
+// Dialog Data
+ enum { IDD = IDD_SET_CERT_DIALOG };
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+
+ DECLARE_MESSAGE_MAP()
+public:
+ CEdit m_CertificatePath;
+ afx_msg void OnBnClickedButton1();
+ afx_msg void OnBnClickedOk();
+ afx_msg void OnEnChangeEdit1();
+};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
new file mode 100644
index 0000000..3d82c0b
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
@@ -0,0 +1,58 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// SetCertificateDirReg.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+#include "SetCertificateDirReg.h"
+#include "SetCertDirDlg.h" // Dialog box to choose the certificate directory location
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+
+// The one and only application object
+
+CWinApp theApp;
+
+using namespace std;
+
+int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
+{
+ int nRetCode = 0;
+
+ // initialize MFC and print and error on failure
+ if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
+ {
+ // TODO: change error code to suit your needs
+ _tprintf(_T("Fatal Error: MFC initialization failed\n"));
+ nRetCode = 1;
+ }
+ else
+ {
+ // TODO: code your application's behavior here.
+ SetCertDirDlg dlg;
+ dlg.DoModal();
+ }
+
+ return nRetCode;
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
new file mode 100644
index 0000000..5db1c52
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
@@ -0,0 +1,23 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+#pragma once
+
+#include "resource.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
new file mode 100644
index 0000000..6d809f7
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
@@ -0,0 +1,111 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_SET_CERT_DIALOG DIALOGEX 0, 0, 276, 135
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TRAF ODBC Setup - Certificate Directory"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,206,109,50,14
+ LTEXT "Select a folder for storing certificates and press OK",IDC_STATIC,92,34,164,8
+ EDITTEXT IDC_EDIT1,48,66,208,14,ES_AUTOHSCROLL | ES_READONLY
+ PUSHBUTTON "Browse",IDC_BUTTON1,206,86,50,14
+ LTEXT "or just press OK to use the system default",IDC_STATIC,120,48,136,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_SET_CERT_DIALOG, DIALOG
+ BEGIN
+ LEFTMARGIN, 16
+ RIGHTMARGIN, 256
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 123
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+ IDS_APP_TITLE "SetCertificateDirReg"
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
new file mode 100644
index 0000000..57471ef
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Template|Win32">
+ <Configuration>Template</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Template|x64">
+ <Configuration>Template</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{11B34636-6E3D-40ED-BA02-FD50B258D18D}</ProjectGuid>
+ <RootNamespace>SetCertificateDirReg</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>Static</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="odbccp32.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="odbccp32.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="odbccp32.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="odbccp32.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="odbccp32.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+ <Import Project="odbccp32.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>..\..\..\..\lib\x64\Debug/SetCertificateDirReg.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>..\..\..\lib\release/$(ProjectName).exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>..\..\..\..\lib\x64\Release/SetCertificateDirReg.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Link>
+ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="SetCertDirDlg.cpp" />
+ <ClCompile Include="SetCertificateDirReg.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Resource.h" />
+ <ClInclude Include="SetCertDirDlg.h" />
+ <ClInclude Include="SetCertificateDirReg.h" />
+ <ClInclude Include="stdafx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="dialog.bmp" />
+ <None Include="ReadMe.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="SetCertificateDirReg.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <UserProperties RESOURCE_FILE="SetCertificateDirReg.rc" />
+ </VisualStudio>
+ </ProjectExtensions>
+</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
new file mode 100644
index 0000000..cca8221
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="SetCertDirDlg.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="SetCertificateDirReg.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="SetCertDirDlg.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="SetCertificateDirReg.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="dialog.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="ReadMe.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="SetCertificateDirReg.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
new file mode 100644
index 0000000..ace9a86
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp
new file mode 100644
index 0000000..6087e3d
Binary files /dev/null and b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
new file mode 100644
index 0000000..bc4cb52
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros">
+ <Odbccp32libDir>.\</Odbccp32libDir>
+ <Odbccp32lib64Dir>.\amd64</Odbccp32lib64Dir>
+ </PropertyGroup>
+ <PropertyGroup />
+ <ItemDefinitionGroup />
+ <ItemGroup>
+ <BuildMacro Include="Odbccp32libDir">
+ <Value>$(Odbccp32libDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="Odbccp32lib64Dir">
+ <Value>$(Odbccp32lib64Dir)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
new file mode 100644
index 0000000..45169ba
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
@@ -0,0 +1,40 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by SetCertificateDirReg.rc
+//
+#define IDD_SET_CERT_DIALOG 101
+#define IDS_APP_TITLE 103
+#define IDC_EDIT1 1000
+#define IDC_BUTTON1 1001
+#define IDC_SCROLLBAR1 1002
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 104
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1003
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
new file mode 100644
index 0000000..350f87e
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
@@ -0,0 +1,28 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// stdafx.cpp : source file that includes just the standard includes
+// SetCertificateDirReg.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
new file mode 100644
index 0000000..df9fc5f
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
@@ -0,0 +1,68 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER // Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later.
+#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
+#endif
+
+#include <stdio.h>
+#include <tchar.h>
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#endif
+
+#include <afx.h>
+#include <afxwin.h> // MFC core and standard components
+#include <afxext.h> // MFC extensions
+#ifndef _AFX_NO_OLE_SUPPORT
+#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
+#endif
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h> // MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#include <iostream>
+
+
+
+// TODO: reference additional headers your program requires here
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
new file mode 100644
index 0000000..b78b285
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCertificateDirReg", "SetCertificateDirReg\SetCertificateDirReg.vcxproj", "{11B34636-6E3D-40ED-BA02-FD50B258D18D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.Build.0 = Debug|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.ActiveCfg = Debug|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.Build.0 = Debug|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.ActiveCfg = Release|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.Build.0 = Release|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.ActiveCfg = Release|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/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 17c2a2f..76d2e32 100644
--- a/win-odbc64/Install/win64_installer/installer.iss
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -6,6 +6,8 @@
#define MyAppPublisher "Apache Trafodion"
#define MyAppURL ""
#define MyDriverName "TRAF ODBC 1.0"
+#define BUILDDIR GetEnv('BUILDDIR')
+#define VCREDISTDIR GetEnv('VC_REDIST_DIR')
[Setup]
; NOTE: The value of AppId uniquely identifies this application.
@@ -35,14 +37,14 @@ SetupLogging=yes
Name: "english"; MessagesFile: "compiler:Default.isl"
[Files]
-Source: "C:\Build\winodbc64\inc\trafsqlext.h"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_odbcDrvMsg_intl0100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_ores0100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_tcpipv40100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_tcpipv60100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_translation01.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\trfoadm1.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\trfodbc1.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\win-odbc64\odbcclient\inc\trafsqlext.h"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BUILDDIR}\lib\x64\Release\traf_odbcDrvMsg_intl0100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_ores0100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_tcpipv40100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_tcpipv60100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_translation01.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\trfoadm1.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\trfodbc1.dll"; DestDir: "{sys}"
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
@@ -59,7 +61,7 @@ Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: strin
[Code]
[Files]
-Source: "C:\Build\winodbc64\redist\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+Source: "{#VCREDISTDIR}\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
[Run]
; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/odbcclient/README.txt
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/README.txt b/win-odbc64/odbcclient/README.txt
index 3146b9b..c140e4d 100644
--- a/win-odbc64/odbcclient/README.txt
+++ b/win-odbc64/odbcclient/README.txt
@@ -24,15 +24,16 @@ Prerequisite:
openssl >= 0.9.8
zlib >= 1.2.8
Microsoft Visual Studio >= 2013
+Visual C++ MFC MBCS Library for Visual Studio 2013
Inno Setup >= 5
Build steps
1. In order to make the build script able to find these prerequisites,
- some variables on the top of build_os.bat and pkg.bat need to be set accordingly.
+ some variables on the top of build_os.bat need to be set accordingly.
Set variable OPENSSL_LIB_PATH to point to openssl library files folder, for example:
- set OPENSSL_PATH=C:\openssl-1.0.1e\lib
+ set OPENSSL_PATH=C:\openssl-1.0.1e\lib
Set variable OPENSSL_INCLUDE_PATH to point to openssl header files folder, for example:
set OPENSSL_INCLUDE_PATH=C:\openssl-1.0.1e\include
@@ -46,13 +47,15 @@ Build steps
Set variable MSBUILD_PATH to point to msbuild system, for example:
set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
- Set variable PACKDIR to conn folder of Trafodion source tree, for example:
+ Set variable PACKDIR to the folder where to store the package driver, for example:
set PACKDIR=C:\Build\winodbc64
Set variable INNO_SETUP_PATH to inno setup install folder, for example:
set INNO_SETUP_PATH="C:\Program Files (x86)\Inno Setup 5"
- Download vcredist_x64.exe from http://www.microsoft.com/en-us/download/details.aspx?id=40784 and copy it to C:\Build\winodbc64\redist
+ Download vcredist_x64.exe from http://www.microsoft.com/en-us/download/details.aspx?id=40784 and
+ set the variable VC_REDIST_DIR to the folader where store the vcredist_x64.exe
+ set VC_REDIST_DIR=C:\Build\winodbc64\redist
2. To build, open a cmd window, change to win-odbc64\odbcclient and type
build_os.bat
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat
index 2671c7d..cb3b62d 100644
--- a/win-odbc64/odbcclient/build_os.bat
+++ b/win-odbc64/odbcclient/build_os.bat
@@ -20,6 +20,13 @@ 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
+
@set INNO_SETUP_PATH="C:\Program Files (x86)\Inno Setup 5"
@set PATH=%INNO_SETUP_PATH%;%PATH%
@@ -39,8 +46,6 @@ 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 PACKDIR=C:\Build\winodbc64
-
set SRCDIR=%BUILDDIR%\win-odbc64
set LIBDIR=%BUILDDIR%\lib
set PATH=%MSBUILD_PATH%\;%PATH%
@@ -142,23 +147,26 @@ if %BUILD_STATUS%==0 (
goto Exit
)
-set ALL_SUCCESS=1
-
-cd %SRCDIR%\odbcclient
-
-if not exist C:\Build\winodbc64\inc (
- mkdir C:\Build\winodbc64\inc
-)
-copy /Y %BUILDDIR%\win-odbc64\odbcclient\inc\trafsqlext.h C:\Build\winodbc64\inc
-if not exist C:\Build\winodbc64\lib\x64\Release (
- mkdir C:\Build\winodbc64\lib\x64\Release
+echo Building SetCertificateDirReg InstallHelper - Win64 Release...
+cd %SRCDIR%\Install\SetCertificateDirReg\SetCertificateDirReg
+msbuild.exe /t:rebuild SetCertificateDirReg_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+ echo Build SetCertificateDirReg success
+) else (
+ echo Build SetCertificateDirReg failed
+ goto Exit
)
-copy /Y %BUILDDIR%\lib\x64\Release C:\Build\winodbc64\lib\x64\Release
ISCC.exe /Q %BUILDDIR%\win-odbc64\Install\win64_installer\installer.iss
-move /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.2.0.exe %PACKDIR%
+copy /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.2.0.exe %PACKDIR%
@echo on
+if exist %PACKDIR%\TFODBC64-1.2.0.exe (
+ set ALL_SUCCESS=1
+)
+cd %BUILDDIR%\win-odbc64\odbcclient
+
:Exit
if %ALL_SUCCESS%==1 (
echo=
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/odbcclient/odbcclient_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/odbcclient_os.sln b/win-odbc64/odbcclient/odbcclient_os.sln
index 60e5741..38990db 100644
--- a/win-odbc64/odbcclient/odbcclient_os.sln
+++ b/win-odbc64/odbcclient/odbcclient_os.sln
@@ -23,6 +23,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslationDll_os", "Transl
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TCPIPV6_os", "drvr35\TCPIPV6\TCPIPV6_os.vcxproj", "{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCertificateDirReg_os", "..\Install\SetCertificateDirReg\SetCertificateDirReg\SetCertificateDirReg_os.vcxproj", "{11B34636-6E3D-40ED-BA02-FD50B258D18D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -96,6 +98,18 @@ Global
{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|Win32.ActiveCfg = Release|x64
{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|x64.ActiveCfg = Release|x64
{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|x64.Build.0 = Release|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.Build.0 = Debug|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.ActiveCfg = Debug|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.Build.0 = Debug|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.ActiveCfg = Release|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.Build.0 = Release|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.ActiveCfg = Release|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.Build.0 = Release|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|Win32.ActiveCfg = Template|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|Win32.Build.0 = Template|Win32
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|x64.ActiveCfg = Template|x64
+ {11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|x64.Build.0 = Template|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE