[APIS 803] modified version 10.2 to refer to 10.2 cci-src (#8)

* [APIS-803] CUBRID 10.2 Driver Release * [APIS-803] cci libraries are modified for 10.2 * [APIS-803] build batch file added for build tool upgrade
CUBRID · Dec 10, 2019 · 7b7b11f · 7b7b11f
1 parent 2d55bc5
commit 7b7b11f
Show file tree

Hide file tree

Showing 11 changed files with 657 additions and 658 deletions.
diff --git a/CUBRIDProvider-vs2017.sln b/CUBRIDProvider-vs2017.sln
@@ -0,0 +1,28 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CUBRIDProvider", "CUBRIDProvider.vcxproj", "{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}"
+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
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Debug|Win32.Build.0 = Debug|Win32
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Debug|x64.ActiveCfg = Debug|x64
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Debug|x64.Build.0 = Debug|x64
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Release|Win32.ActiveCfg = Release|Win32
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Release|Win32.Build.0 = Release|Win32
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Release|x64.ActiveCfg = Release|x64
+		{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
+EndGlobal
diff --git a/CUBRIDProvider.vcxproj b/CUBRIDProvider.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -22,29 +22,30 @@
     <ProjectGuid>{47F98C66-1ADB-438D-9C38-A137D7B0C3D6}</ProjectGuid>
     <RootNamespace>CUBRIDProvider</RootNamespace>
     <Keyword>AtlProj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -69,7 +70,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.26419.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@@ -97,8 +98,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>
-      </Command>
+      <Command />
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -110,7 +110,6 @@
       <DllDataFileName />
       <InterfaceIdentifierFileName>CUBRIDProvider_i.c</InterfaceIdentifierFileName>
       <ProxyFileName>CUBRIDProvider_p.c</ProxyFileName>
-      <ValidateAllParameters>true</ValidateAllParameters>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -123,14 +122,15 @@
       <PrecompiledHeaderOutputFile>$(IntDir)CUBRIDProvider.pch</PrecompiledHeaderOutputFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cas_cci_d.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cas_cci_d.lib;wsock32.lib;regex38a_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>.\cci\lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <MergedIDLBaseFileName>$(OutDir)_CUBRIDProvider.idl</MergedIDLBaseFileName>
@@ -141,6 +141,7 @@
       <DataExecutionPrevention />
       <ImportLibrary>$(OutDir)CUBRIDProvider.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
+      <Profile>true</Profile>
     </Link>
     <PostBuildEvent>
       <Message>Performing registration</Message>
@@ -149,8 +150,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>
-      </Command>
+      <Command />
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -162,7 +162,6 @@
       <DllDataFileName />
       <InterfaceIdentifierFileName>CUBRIDProvider_i.c</InterfaceIdentifierFileName>
       <ProxyFileName>CUBRIDProvider_p.c</ProxyFileName>
-      <ValidateAllParameters>true</ValidateAllParameters>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -183,7 +182,7 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cas_cci_d.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cas_cci_d.lib;wsock32.lib;regex38a_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>.\cci\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <MergedIDLBaseFileName>$(OutDir)_CUBRIDProvider.idl</MergedIDLBaseFileName>
@@ -202,8 +201,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>
-      </Command>
+      <Command />
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -215,7 +213,6 @@
       <DllDataFileName />
       <InterfaceIdentifierFileName>CUBRIDProvider_i.c</InterfaceIdentifierFileName>
       <ProxyFileName>CUBRIDProvider_p.c</ProxyFileName>
-      <ValidateAllParameters>true</ValidateAllParameters>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -235,7 +232,7 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cas_cci.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cas_cci.lib;wsock32.lib;regex38a.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>.\cci\lib32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreEmbeddedIDL>false</IgnoreEmbeddedIDL>
@@ -257,8 +254,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>
-      </Command>
+      <Command />
     </PreBuildEvent>
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -270,7 +266,6 @@
       <DllDataFileName />
       <InterfaceIdentifierFileName>CUBRIDProvider_i.c</InterfaceIdentifierFileName>
       <ProxyFileName>CUBRIDProvider_p.c</ProxyFileName>
-      <ValidateAllParameters>true</ValidateAllParameters>
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -291,7 +286,7 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>cas_cci.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cas_cci.lib;wsock32.lib;regex38a.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <AdditionalLibraryDirectories>.\cci\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreEmbeddedIDL>false</IgnoreEmbeddedIDL>
@@ -311,6 +306,9 @@
       <Command>regsvr32 /s /c "$(TargetPath)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <Midl Include="_CUBRIDProvider.idl" />
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Command.cpp" />
     <ClCompile Include="CUBRIDProvider.cpp" />
@@ -349,9 +347,9 @@
     <ClCompile Include="util.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\cci\cas_cci.h" />
     <ClInclude Include="atldb_cubrid.h" />
     <ClInclude Include="atldb_orig.h" />
-    <ClInclude Include="..\..\src\cci\cas_cci.h" />
     <ClInclude Include="ColumnsRowset.h" />
     <ClInclude Include="Command.h" />
     <ClInclude Include="CUBRIDRowRowset.h" />
@@ -390,9 +388,6 @@
   <ItemGroup>
     <ResourceCompile Include="CUBRIDProvider.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <Midl Include="_CUBRIDProvider.idl" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/SRColumns.cpp b/SRColumns.cpp
@@ -123,7 +123,7 @@ static HRESULT FetchData(int hReq, UINT uCodepage, CCOLUMNSRow &crData)
 	if(ind==-1)
 	{
 		crData.m_bColumnHasDefault = ATL_VARIANT_FALSE;
-		crData.m_szColumnDefault[0] = L'';
+		crData.m_szColumnDefault[0] = L'\x0';
 	}
 	else
 	{

diff --git a/build_14.bat b/build_14.bat
@@ -0,0 +1,21 @@
+set WORKSPACE=%~dp0
+set INSTALL_DIRS=output
+echo %INSTALL_DIRS%
+
+call "%VS140COMNTOOLS%vsvars32.bat"
+mkdir %INSTALL_DIRS%
+
+devenv CUBRIDProvider-vs2017.sln /project CUBRIDProvider.vcxproj /Rebuild "Release|Win32" 
+devenv CUBRIDProvider-vs2017.sln /project CUBRIDProvider.vcxproj /Rebuild "Release|x64" 
+
+copy Win32\Release\CUBRIDProvider.dll  %INSTALL_DIRS%\CUBRIDProvider32.dll
+copy x64\Release\CUBRIDProvider.dll  %INSTALL_DIRS%\CUBRIDProvider64.dll
+
+copy installer\installer.nsi %INSTALL_DIRS%\installer.nsi
+copy installer\license.txt %INSTALL_DIRS%\license.txt
+copy installer\README.txt %INSTALL_DIRS%\README.txt
+
+c:
+cd C:\NSIS
+
+makensis %WORKSPACE%\%INSTALL_DIRS%\installer.nsi