Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4B2FD18265 for ; Thu, 29 Oct 2015 00:04:47 +0000 (UTC) Received: (qmail 82641 invoked by uid 500); 28 Oct 2015 23:38:07 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 82602 invoked by uid 500); 28 Oct 2015 23:38:07 -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 82591 invoked by uid 99); 28 Oct 2015 23:38:07 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 23:38:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 6D08EC8CCE for ; Wed, 28 Oct 2015 23:38:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.801 X-Spam-Level: * X-Spam-Status: No, score=1.801 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001, URIBL_BLOCKED=0.001, WEIRD_QUOTING=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id UXFJIc7gas0G for ; Wed, 28 Oct 2015 23:37:59 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 4D85D22F1E for ; Wed, 28 Oct 2015 23:37:59 +0000 (UTC) Received: (qmail 82566 invoked by uid 99); 28 Oct 2015 23:37:59 -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; Wed, 28 Oct 2015 23:37:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE5E2E0534; Wed, 28 Oct 2015 23:37:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: rmarton@apache.org To: commits@trafodion.incubator.apache.org Date: Wed, 28 Oct 2015 23:38:00 -0000 Message-Id: <18b97d45dc304580a1577d3f62bf0b65@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/8] incubator-trafodion git commit: [TRAFODION-1519]Use free tool to build windows ODBC [TRAFODION-1519]Use free tool to build windows ODBC 1. Use Visual Studio Community 2013 instead of Visual Studio 2010. Visual Studio Community 2013 is free. 2. Use open source tool inno setup to package windows ODBC Driver. 3. cleanup unused files Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f9bc12d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f9bc12d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f9bc12d9 Branch: refs/heads/master Commit: f9bc12d9327dca79652a1335770dfe63a504d7fb Parents: ab8f637 Author: Weiqing Xu Authored: Mon Oct 12 20:32:53 2015 +0800 Committer: Weiqing Xu Committed: Thu Oct 15 15:55:51 2015 +0800 ---------------------------------------------------------------------- .../SetCertificateDirReg/SetCertDirDlg.cpp | 165 - .../SetCertificateDirReg/SetCertDirDlg.h | 47 - .../SetCertificateDirReg.cpp | 58 - .../SetCertificateDirReg/SetCertificateDirReg.h | 23 - .../SetCertificateDirReg.rc | 111 - .../SetCertificateDirReg_os.vcxproj | 192 - .../SetCertificateDirReg_os.vcxproj.filters | 53 - .../SetCertificateDirReg_os.vcxproj.user | 3 - .../SetCertificateDirReg/dialog.bmp | Bin 99008 -> 0 bytes .../SetCertificateDirReg/odbccp32.props | 18 - .../SetCertificateDirReg/resource.h | 40 - .../SetCertificateDirReg/stdafx.cpp | 28 - .../SetCertificateDirReg/stdafx.h | 68 - .../SetCertificateDirReg_os.sln | 26 - .../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 200 - .../UpdateDSN/UpdateDSN/UpdateDSN.vcxproj | 170 - .../UpdateDSN/UpdateDSN.vcxproj.filters | 33 - .../UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj | 104 - .../UpdateDSN/UpdateDSN_os.vcxproj.filters | 33 - .../UpdateDSN/UpdateDSN_os.vcxproj.user | 3 - .../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 28 - win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 37 - win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln | 26 - .../Install/win64_installer/installer.iss | 181 + .../win64_installer/win64_installer_os.ism | 6029 ------------------ win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 6 +- .../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 4 +- .../odbcclient/Drvr35Res/res/Drvr35Res.rc2 | 26 +- win-odbc64/odbcclient/README.txt | 108 +- .../odbcclient/TranslationDll/TranslationDll.rc | 6 +- .../TranslationDll/TranslationDll_os.vcxproj | 4 +- win-odbc64/odbcclient/build_os.bat | 325 +- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 6 +- .../drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 8 +- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 6 +- .../drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 8 +- win-odbc64/odbcclient/drvr35/drvr35.rc | 6 +- win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 16 +- .../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 5 +- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 6 +- win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 2 +- .../odbcclient/drvr35adm/tabpagenetwork.cpp | 2 +- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 6 +- .../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 4 +- win-odbc64/odbcclient/odbcclient_os.sln | 31 +- win-odbc64/odbcclient/pkg.bat | 38 - 46 files changed, 446 insertions(+), 7853 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index 6891b86..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp +++ /dev/null @@ -1,165 +0,0 @@ -// @@@ 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 -#include - - -#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/f9bc12d9/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 deleted file mode 100644 index 1142152..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h +++ /dev/null @@ -1,47 +0,0 @@ -// @@@ 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/f9bc12d9/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 deleted file mode 100644 index 3d82c0b..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// @@@ 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/f9bc12d9/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 deleted file mode 100644 index 5db1c52..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h +++ /dev/null @@ -1,23 +0,0 @@ -// @@@ 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/f9bc12d9/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 deleted file mode 100644 index 0bd739b..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc +++ /dev/null @@ -1,111 +0,0 @@ -// 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/f9bc12d9/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 deleted file mode 100644 index 8d2689e..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Template - Win32 - - - Template - x64 - - - - {11B34636-6E3D-40ED-BA02-FD50B258D18D} - SetCertificateDirReg - Win32Proj - - - - Application - Static - NotSet - true - - - Application - - - Application - Static - NotSet - true - - - Application - Static - NotSet - - - Dynamic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - X64 - - - Disabled - _WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - Level3 - ProgramDatabase - - - odbc32.lib;$(Odbccp32lib64Dir)\odbccp32.lib;%(AdditionalDependencies) - ..\..\..\..\lib\x64\Debug/SetCertificateDirReg.exe - true - Console - MachineX64 - - - - - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - - - odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies) - ..\..\..\lib\release/$(ProjectName).exe - true - Console - true - true - MachineX86 - - - - - X64 - - - _WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - - - odbc32.lib;$(Odbccp32lib64Dir)\odbccp32.lib;%(AdditionalDependencies) - ..\..\..\..\lib\x64\Release/SetCertificateDirReg.exe - true - Console - true - true - MachineX64 - - - - - 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) - - - - - - - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index c78dba2..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - - Resource Files - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index 695b5c7..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index 6087e3d..0000000 Binary files a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index 2093760..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - .\ - .\amd64 - - - - - - $(Odbccp32libDir) - - - $(Odbccp32lib64Dir) - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index b6c6bf6..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h +++ /dev/null @@ -1,40 +0,0 @@ -// @@@ 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/f9bc12d9/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 deleted file mode 100644 index 350f87e..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// @@@ 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/f9bc12d9/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 deleted file mode 100644 index df9fc5f..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h +++ /dev/null @@ -1,68 +0,0 @@ -// @@@ 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 -#include -#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 -#include // MFC core and standard components -#include // MFC extensions -#ifndef _AFX_NO_OLE_SUPPORT -#include // MFC support for Internet Explorer 4 Common Controls -#endif -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - -#include - - - -// TODO: reference additional headers your program requires here http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 deleted file mode 100644 index 25ea788..0000000 --- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln +++ /dev/null @@ -1,26 +0,0 @@ - -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/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp deleted file mode 100644 index fd3cf94..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp +++ /dev/null @@ -1,200 +0,0 @@ -// @@@ 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 @@@ -// UpdateDSN.cpp : Defines the entry point for the console application. -// - -#include "stdafx.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -bool DeleteThisFile(LPCTSTR lpszDir, bool noRecycleBin = true) -{ - int len = _tcslen(lpszDir); - TCHAR *pszFrom = new TCHAR[len+2]; - _tcscpy(pszFrom, lpszDir); - pszFrom[len] = 0; - pszFrom[len+1] = 0; - - SHFILEOPSTRUCT fileop; - fileop.hwnd = NULL; // no status display - fileop.wFunc = FO_DELETE; // delete operation - fileop.pFrom = pszFrom; // source file name as double null terminated string - fileop.pTo = NULL; // no destination needed - fileop.fFlags = FOF_NOCONFIRMATION|FOF_SILENT; // do not prompt the user - - if(!noRecycleBin) - fileop.fFlags |= FOF_ALLOWUNDO; - - fileop.fAnyOperationsAborted = FALSE; - fileop.lpszProgressTitle = NULL; - fileop.hNameMappings = NULL; - - int ret = SHFileOperation(&fileop); - delete [] pszFrom; - return (ret == 0); -} - - -void CleanUp() -{ - DWORD ulOptions = 0; - PHKEY phkResult; - LONG retVal; - HKEY hKey; - -#ifdef WIN64 - REGSAM samDesired = KEY_WOW64_32KEY | KEY_SET_VALUE; -#else - REGSAM samDesired = KEY_WOW64_64KEY | KEY_SET_VALUE; -#endif - - TCHAR buffer[2048]; - std::string sysroot = getenv("SYSTEMROOT"); - std::string hpodbcdll = sysroot + "\\system32\\trfodbc1.dll"; -// std::string OdbcTrace = sysroot + "\\system32\\traf_OdbcTrace0100.dll"; - std::string tcpipv6 = sysroot + "\\system32\\traf_tcpipv60100.dll"; - std::string odbcDrvMsg = sysroot + "\\system32\\traf_odbcDrvMsg_intl0100.dll"; - std::string translation = sysroot + "\\system32\\traf_translation01.dll"; - std::string hpoadm02 = sysroot + "\\system32\\trfoadm1.dll"; - std::string ores = sysroot + "\\system32\\traf_ores0100.dll"; - mbstowcs(buffer,hpodbcdll.c_str(), sizeof(buffer)); - DeleteThisFile((LPCTSTR)buffer, false); - mbstowcs(buffer,tcpipv6.c_str(), sizeof(buffer)); - DeleteThisFile((LPCTSTR)buffer, false); - - mbstowcs(buffer,odbcDrvMsg.c_str(), sizeof(buffer)); - DeleteThisFile((LPCTSTR)buffer, false); - - mbstowcs(buffer,translation.c_str(), sizeof(buffer)); - DeleteThisFile((LPCTSTR)buffer, false); - - mbstowcs(buffer,hpoadm02.c_str(), sizeof(buffer)); - DeleteThisFile((LPCTSTR)buffer, false); - - mbstowcs(buffer,ores.c_str(), sizeof(buffer)); - DeleteThisFile((LPCTSTR)buffer, false); - - retVal = RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - (LPCWSTR)L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\SharedDlls", - ulOptions, - KEY_SET_VALUE, - &hKey); - retVal = RegDeleteValue( - hKey, - (LPCWSTR)L"C:\\WINDOWS\\system32\\trfodbc1.dll"); - -// retVal = RegDeleteValue( -// hKey, -// (LPCWSTR)L"C:\\WINDOWS\\system32\\traf_OdbcTrace0100.dll"); - - retVal = RegDeleteValue( - hKey, - (LPCWSTR)L"C:\\WINDOWS\\system32\\traf_tcpipv60100.dll"); - - retVal = RegDeleteValue( - hKey, - (LPCWSTR)L"C:\\WINDOWS\\system32\\traf_odbcDrvMsg_intl0100.dll"); - - retVal = RegDeleteValue( - hKey, - (LPCWSTR)L"C:\\WINDOWS\\system32\\traf_translation01.dll"); - - retVal = RegDeleteValue( - hKey, - (LPCWSTR)L"C:\\WINDOWS\\system32\\trfoadm1.dll"); - - retVal = RegDeleteValue( - hKey, - (LPCWSTR)L"C:\\WINDOWS\\system32\\traf_ores0100.dll"); -} - -int _tmain(int argc, _TCHAR* argv[]) -{ - - UWORD Mode,oldMode; - SQLHANDLE m_henv; - SQLUSMALLINT direction; - SQLRETURN retVal = SQL_SUCCESS; - SQLWCHAR DSNName[SQL_MAX_DSN_LENGTH + 1]; - SQLWCHAR Description[100]; - SQLSMALLINT nameLen, descLen; - TCHAR NewDriver[1024]; - - if(argc > 1 && strcmp((const char*)argv[1],"-cleanup")) - { - CleanUp(); - return 0; - } - - // The rest of the code was to deal with the file name change from hpodbc_0200.dll to hpodbc02.dll that was - // required for the move to MSI installer. (Installshield did not like file names > 8 letters) - // For seaquest, since we're starting off with an 8 character driver name, we won't need this, atleast for now - -// SQLGetConfigMode(&oldMode); - -// GetSystemDirectory(NewDriver,sizeof(NewDriver)); - -// if(argc > 1 && strcmp((const char*)argv[1],"-revert")) -// wcscat_s(NewDriver,L"\\hp_odbc0200.dll"); -// else -// wcscat_s(NewDriver,L"\\hpodbc02.dll"); - -// Mode = ODBC_BOTH_DSN; -// direction = SQL_FETCH_NEXT; - -// SQLSetConfigMode(Mode); - -// retVal = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &m_henv); -// retVal = SQLSetEnvAttr(m_henv, SQL_ATTR_ODBC_VERSION,(SQLPOINTER)SQL_OV_ODBC3, 0); - - - // - // Loop through all of the HP ODBC 2.0 DataSources, modifying the Driver= entry - // - -// retVal = SQLDataSources(m_henv, direction, DSNName, sizeof(DSNName), -// &nameLen, Description, sizeof(Description), -// &descLen); - -// while (retVal == SQL_SUCCESS || retVal == SQL_SUCCESS_WITH_INFO) -// { -// if (wcscmp(L"HP ODBC 2.0", Description) == 0) -// SQLWritePrivateProfileString((LPCWSTR)DSNName,L"Driver",NewDriver,L"ODBC.INI"); - -// retVal = SQLDataSources(m_henv, SQL_FETCH_NEXT, DSNName, -// sizeof(DSNName), &nameLen, -// Description, sizeof(Description), &descLen); -// } - - -// SQLSetConfigMode(oldMode); - - return 0; - -} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj deleted file mode 100644 index 9c66fc9..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj +++ /dev/null @@ -1,170 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {49D6B472-F361-4E6A-B060-D368855FB359} - UpdateDSN - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - - - Application - Unicode - true - - - Application - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - - - ..\..\..\..\..\lib\debug/$(ProjectName).exe - true - Console - MachineX86 - - - - - X64 - - - Disabled - _WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - ..\..\..\..\..\lib\x64\Debug/$(ProjectName).exe - true - Console - MachineX64 - - - - - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - - - ..\..\..\..\..\lib\release/$(ProjectName).exe - true - Console - true - true - MachineX86 - - - - - X64 - - - _WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - - - ..\..\..\..\..\lib\x64\Release/$(ProjectName).exe - true - Console - true - true - MachineX64 - - - - - Create - Create - Create - Create - - - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters deleted file mode 100644 index 522e178..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj deleted file mode 100644 index 19c5f85..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {49D6B472-F361-4E6A-B060-D368855FB359} - UpdateDSN - Win32Proj - - - - Application - Unicode - true - - - Application - Unicode - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - X64 - - - Disabled - _WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - ProgramDatabase - - - ..\..\..\..\lib\x64\Debug/UpdateDSN.exe - true - Console - MachineX64 - - - - - X64 - - - _WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - Use - Level3 - ProgramDatabase - - - ..\..\..\..\lib\x64\Release/UpdateDSN.exe - true - Console - true - true - MachineX64 - - - - - Create - Create - - - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters deleted file mode 100644 index 522e178..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - - - Header Files - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user deleted file mode 100644 index 695b5c7..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp deleted file mode 100644 index 6b21c3b..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// @@@ 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 -// UpdateDSN.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/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h deleted file mode 100644 index 56596fa..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h +++ /dev/null @@ -1,37 +0,0 @@ -// @@@ 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 - -#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 - -#include -#include - - - -// TODO: reference additional headers your program requires here http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln ---------------------------------------------------------------------- diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln b/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln deleted file mode 100644 index 36cdd0c..0000000 --- a/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateDSN", "UpdateDSN\UpdateDSN.vcxproj", "{49D6B472-F361-4E6A-B060-D368855FB359}" -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 - {49D6B472-F361-4E6A-B060-D368855FB359}.Debug|Win32.ActiveCfg = Debug|Win32 - {49D6B472-F361-4E6A-B060-D368855FB359}.Debug|Win32.Build.0 = Debug|Win32 - {49D6B472-F361-4E6A-B060-D368855FB359}.Debug|x64.ActiveCfg = Debug|x64 - {49D6B472-F361-4E6A-B060-D368855FB359}.Debug|x64.Build.0 = Debug|x64 - {49D6B472-F361-4E6A-B060-D368855FB359}.Release|Win32.ActiveCfg = Release|Win32 - {49D6B472-F361-4E6A-B060-D368855FB359}.Release|Win32.Build.0 = Release|Win32 - {49D6B472-F361-4E6A-B060-D368855FB359}.Release|x64.ActiveCfg = Release|x64 - {49D6B472-F361-4E6A-B060-D368855FB359}.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/f9bc12d9/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 new file mode 100644 index 0000000..17c2a2f --- /dev/null +++ b/win-odbc64/Install/win64_installer/installer.iss @@ -0,0 +1,181 @@ +; Script generated by the Inno Script Studio Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Trafodion ODBC64 1.2" +#define MyAppVersion "1.2.0" +#define MyAppPublisher "Apache Trafodion" +#define MyAppURL "" +#define MyDriverName "TRAF ODBC 1.0" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{5E6042F8-7C2F-490A-899F-9552D5DE8DE2} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultGroupName={#MyAppName} +DefaultDirName={pf}\Trafodion\TRAF ODBC 1.0 +OutputBaseFilename=TFODBC64-{#MyAppVersion} +Compression=lzma +SolidCompression=yes +DisableProgramGroupPage=yes +ArchitecturesInstallIn64BitMode=x64 +UninstallDisplayName={#MyAppName} +ArchitecturesAllowed=x64 +SetupLogging=yes + + +[Languages] +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}" +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\MS ODBC Administrator"; Filename: "{sys}\odbcad32.exe"; WorkingDir: "{sys}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" + +[Registry] +Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\ODBC Drivers; ValueType: string; ValueName: {#MyDriverName}; ValueData: Installed ;Flags: uninsdeletekey +Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: dword; ValueName: UsageCount; ValueData: $00000001 ;Flags: uninsdeletekey +Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: Driver; ValueData: {sys}\trfodbc1.dll ;Flags: uninsdeletekey +Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: Setup; ValueData: {sys}\trfoadm1.dll ;Flags: uninsdeletekey +Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: CertificateDir; ValueData: SYSTEM_DEFAULT ;Flags: uninsdeletekey +Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: CPTimeout; ValueData: 60 ;Flags: uninsdeletekey + +[Code] +[Files] +Source: "C:\Build\winodbc64\redist\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall + +[Run] +; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here +; the conditional installation Check +Filename: "{tmp}\vcredist_x64.exe"; Check: VCRedistNeedsInstall + +[UninstallDelete] +Type: filesandordirs; Name: "{app}" + +[Code] +#IFDEF UNICODE + #DEFINE AW "W" +#ELSE + #DEFINE AW "A" +#ENDIF +type + INSTALLSTATE = Longint; +const + INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function. + INSTALLSTATE_UNKNOWN = -1; // The product is neither advertised or installed. + INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed. + INSTALLSTATE_ABSENT = 2; // The product is installed for a different user. + INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user. + + VC_2013_REDIST_X64_MIN = '{A749D8E6-B613-3BE3-8F5F-045C84EBA29B}'; + VC_2013_REDIST_X64_ADD = '{929FBD26-9020-399B-9A7A-751D61F0B942}'; + +function MsiQueryProductState(szProduct: string): INSTALLSTATE; + external 'MsiQueryProductState{#AW}@msi.dll stdcall'; + +function VCVersionInstalled(const ProductID: string): Boolean; +begin + Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT; +end; + +function VCRedistNeedsInstall: Boolean; +begin + // here the Result must be True when you need to install your VCRedist + // or False when you don't need to, so now it's upon you how you build + // this statement, the following won't install your VC redist only when + // the Visual C++ 2010 Redist (x64) and Visual C++ 2010 SP1 Redist(x64) + // are installed for the current user + Result := not (VCVersionInstalled(VC_2013_REDIST_X64_MIN) or + VCVersionInstalled(VC_2013_REDIST_X64_ADD)); +end; + +function GetUninstallString(): string; +var + sUnInstPath: string; + sUnInstPath_is1: string; + sUnInstallString: String; + sAppId: String; + sAppId_is1: String; +begin + Result := ''; + sAppId := ExpandConstant('{#emit SetupSetting("AppId")}'); + sAppId_is1 := ExpandConstant('{#emit SetupSetting("AppId")}_is1'); + sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\') + sAppId; + sUnInstPath_is1 := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\') + sAppId_is1; + + sUnInstallString := ''; + if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then + if not RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString) then + if not RegQueryStringValue(HKLM, sUnInstPath_is1, 'UninstallString', sUnInstallString) then + RegQueryStringValue(HKCU, sUnInstPath_is1, 'UninstallString', sUnInstallString); + Result := sUnInstallString; +end; + +function IsUpgrade: Boolean; +begin + Result := (GetUninstallString() <> ''); +end; + +function InitializeSetup: Boolean; +var + V: Integer; + iResultCode: Integer; + sUnInstallString: string; + sAppId: String; + sAppId_is1: String; + sAppName: String; +begin + Result := True; // in case when no previous version is found + sAppId := ExpandConstant('{#emit SetupSetting("AppId")}'); + sAppId_is1 := ExpandConstant('{#emit SetupSetting("AppId")}_is1'); + sAppName := ExpandConstant('{#emit SetupSetting("AppName")}'); + sUnInstallString := GetUninstallString(); + if (sUnInstallString <> '') then //Your App GUID/ID + begin + V := MsgBox(ExpandConstant('An existing install of '+ sAppName + ' was detected.' + #13#10#13#10 +'The installer will now uninstall the old version and install the new version.' + #13#10#13#10 +'Do you want to continue?'), mbInformation, MB_YESNO); //Custom Message if App installed + if V = IDYES then + begin + sUnInstallString := RemoveQuotes(sUnInstallString); + if (Pos('msiexec',Lowercase(sUnInstallString)) <> 0) then + begin + if not Exec('msiexec.exe', '/X'+sAppId+' /qn', '', SW_SHOW, ewWaitUntilTerminated, iResultCode) then + begin + MsgBox('Failed to uninstall existing files.' + #13#10 + ' ' + SysErrorMessage(iResultCode), mbError, MB_OK); + Result := False; + end + end + else + begin + if not Exec(sUnInstallString, '/SILENT', '', SW_SHOW, ewWaitUntilTerminated, iResultCode) then + begin + MsgBox('Failed to uninstall existing files.' + #13#10 + ' ' + SysErrorMessage(iResultCode), mbError, MB_OK); + Result := False; + end + else + + Result := True; //if you want to proceed after uninstall + //Exit; //if you want to quit after uninstall + end + end + else + Result := False; //when older version present and not uninstalled + end; + +end;