diff --git a/.gitignore b/.gitignore index 0c88897..ac41bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ libaquery.a +libaquery.lib +server.lib +server.exp +*.idb aq +aq.exe .cached *.json !sample_ast.json diff --git a/aquery_config.py b/aquery_config.py index 81a67af..9719b93 100644 --- a/aquery_config.py +++ b/aquery_config.py @@ -1,25 +1,30 @@ # put environment specific configuration here ## GLOBAL CONFIGURATION FLAGS -version_string = '0.4.3a' + +version_string = '0.4.4a' add_path_to_ldpath = True rebuild_backend = False run_backend = True have_hge = False -os_platform = 'unkown' cygroot = 'c:/msys64/usr/bin' -msbuildroot = 'd:/gg/vs22/MSBuild/Current/Bin' -__config_initialized__ = False +msbuildroot = '' +os_platform = 'unknown' +build_driver = 'MSBuild' def init_config(): - global __config_initialized__, os_platform + global __config_initialized__, os_platform, msbuildroot ## SETUP ENVIRONMENT VARIABLES + # __config_initialized__ = False + #os_platform = 'unkown' + #msbuildroot = 'd:/gg/vs22/MSBuild/Current/Bin' import os from engine.utils import add_dll_dir # os.environ['CXX'] = 'C:/Program Files/LLVM/bin/clang.exe' os.environ['THREADING'] = '1' - if not __config_initialized__: + if ('__config_initialized__' not in globals() or + not __config_initialized__): import sys if os.name == 'nt': if sys.platform == 'win32': @@ -39,9 +44,16 @@ def init_config(): if os_platform == 'win': add_dll_dir(cygroot) add_dll_dir(os.path.abspath('./msc-plugin')) + import vswhere + vsloc = vswhere.find(prerelease = True, latest = True, prop = 'installationPath') + if vsloc: + msbuildroot = vsloc[0] + '/MSBuild/Current/Bin/MSBuild.exe' + else: + print('Warning: No Visual Studio installation found.') # print("adding path") else: import readline if os_platform == 'cygwin': add_dll_dir('./lib') __config_initialized__ = True + diff --git a/build.py b/build.py index 635e807..52eda85 100644 --- a/build.py +++ b/build.py @@ -1,7 +1,6 @@ from dataclasses import dataclass from enum import Enum, auto -from tabnanny import check -from aquery_config import * +import aquery_config import sys import os import subprocess @@ -9,13 +8,14 @@ import hashlib import pickle from engine.utils import nullstream from typing import Dict, Optional, Set, Union + @dataclass class checksums: libaquery_a : Optional[Union[bytes, bool]] = None pch_hpp_gch : Optional[Union[bytes, bool]] = None server : Optional[Union[bytes, bool]] = None sources : Union[Dict[str, bytes], bool] = None - def calc(self, libaquery_a = 'libaquery.a', + def calc(self, libaquery_a = 'libaquery.a' , pch_hpp_gch = 'server/pch.hpp.gch', server = 'server.so' ): @@ -69,14 +69,18 @@ class build_manager: class DriverBase: def __init__(self, mgr : 'build_manager') -> None: self.mgr = mgr - self.build_cmd = [''] + self.build_cmd = [] def libaquery_a(self) : pass def pch(self): pass def build(self, stdout = sys.stdout, stderr = sys.stderr): for c in self.build_cmd: - subprocess.call(c, stdout = stdout, stderr = stderr) + if c: + try: + subprocess.call(c, stdout = stdout, stderr = stderr) + except (FileNotFoundError): + pass class MakefileDriver(DriverBase): def __init__(self, mgr : 'build_manager') -> None: @@ -85,7 +89,7 @@ class build_manager: os.environ['CXX'] = mgr.cxx if mgr.cxx else 'c++' def libaquery_a(self): - self.build_cmd = [['rm', 'libaquery.a'],['make', 'libaquery.a']] + self.build_cmd = [['rm', 'libaquery.lib'],['make', 'libaquery.a']] return self.build() def pch(self): self.build_cmd = [['rm', 'server/pch.hpp.gch'], ['make', 'pch']] @@ -103,27 +107,61 @@ class build_manager: else: self.build_cmd = [['rm', 'dll.so'], ['make', 'snippet']] return self.build() - - class PythonDriver(DriverBase): - def __init__(self, mgr : 'build_manager') -> None: - super().__init__(mgr) + + class MSBuildDriver(DriverBase): + platform_map = {'amd64':'x64', 'arm64':'arm64', 'x86':'win32'} + opt_map = {'0':'Debug', '1':'RelWithDebugInfo', '2':'Release', '3':'Release', '4':'Release'} + def get_flags(self): + self.platform = self.platform_map[self.mgr.Platform] + self.platform = f'/p:platform={self.platform}' + self.opt = self.opt_map[self.mgr.OptimizationLv] + self.opt = f'/p:configuration={self.opt}' + + def libaquery_a(self): + loc = os.path.abspath('./msc-plugin/libaquery.vcxproj') + self.get_flags() + self.build_cmd = [['del', 'libaquery.lib'], [aquery_config.msbuildroot, loc, self.opt, self.platform]] + self.build() + + def pch(self): + pass + + def server(self): + loc = os.path.abspath('./msc-plugin/server.vcxproj') + self.get_flags() + self.build_cmd = [['del', 'server.so'], [aquery_config.msbuildroot, loc, self.opt, self.platform]] + self.build() + + def snippet(self): + loc = os.path.abspath('./msc-plugin/msc-plugin.vcxproj') + self.get_flags() + self.build_cmd = [[aquery_config.msbuildroot, loc, self.opt, self.platform]] + self.build() + + #class PythonDriver(DriverBase): + # def __init__(self, mgr : 'build_manager') -> None: + # super().__init__(mgr) - class Driver(Enum): - Makefile = auto() - Python = auto() - CMake = auto() - MSBuild = auto() - + #@property + #def MSBuild(self): + # return MSBuildDriver(self) + #@property + #def Makefile(self): + # return MakefileDriver(self) + def __init__(self) -> None: self.method = 'make' self.cxx = '' self.OptimizationLv = '4' # [O0, O1, O2, O3, Ofast] - self.Platform = 'x64' + self.Platform = 'amd64' self.PCH = 1 self.StaticLib = 1 self.fLTO = 1 self.fmarchnative = 1 - self.driver = build_manager.MakefileDriver(self) + if aquery_config.build_driver == 'MSBuild': + self.driver = build_manager.MSBuildDriver(self) + elif aquery_config.build_driver == 'Makefile': + self.driver = build_manager.MakefileDriver(self) self.cache_status = checksums() def build_dll(self): @@ -132,7 +170,8 @@ class build_manager: def build_caches(self, force = False): cached = checksums() current = checksums() - current.calc() + libaquery_a = 'libaquery.lib' if aquery_config.os_platform else 'libaquery.a' + current.calc(libaquery_a) try: with open('.cached', 'rb') as cache_sig: cached = pickle.loads(cache_sig.read()) @@ -151,7 +190,7 @@ class build_manager: self.driver.pch() if self.cache_status.server: self.driver.server() - current.calc() + current.calc(libaquery_a) with open('.cached', 'wb') as cache_sig: cache_sig.write(pickle.dumps(current)) \ No newline at end of file diff --git a/msc-plugin/dummy.cpp b/msc-plugin/dummy.cpp new file mode 100644 index 0000000..e69de29 diff --git a/msc-plugin/launcher.vcxproj b/msc-plugin/launcher.vcxproj new file mode 100644 index 0000000..ae7116e --- /dev/null +++ b/msc-plugin/launcher.vcxproj @@ -0,0 +1,281 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + sharedlib + Win32 + + + sharedlib + x64 + + + + + + + 16.0 + Win32Proj + {C8E25628-0B46-4CBE-90DF-5228F79A5A64} + server + 10.0 + + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + + + Application + false + v143 + true + Unicode + true + + + Application + true + v143 + Unicode + false + + + Application + false + v143 + true + Unicode + false + + + Application + false + v143 + true + Unicode + false + + + + + + + + + + + + + + + + + + + + + + + + + + + true + .exe + $(SolutionDir)..\ + + + false + .exe + $(SolutionDir)..\ + + + false + .exe + $(SolutionDir)..\ + + + true + .exe + $(SolutionDir)..\ + + + false + .exe + $(SolutionDir)..\ + + + false + .exe + $(SolutionDir)..\ + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + true + true + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + copy $(OutDir)$(TargetName)$(TargetExt) $(ProjectDir)\..\server.so /y + + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + true + true + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + copy "$(OutDir)$(TargetName)$(TargetExt)" "$(ProjectDir)\..\server.so" /y + + + + \ No newline at end of file diff --git a/msc-plugin/libaquery.vcxproj b/msc-plugin/libaquery.vcxproj new file mode 100644 index 0000000..146c583 --- /dev/null +++ b/msc-plugin/libaquery.vcxproj @@ -0,0 +1,239 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {b52aacf7-16a6-4fca-90ad-867d367bda4f} + libaquery + 10.0 + + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + false + v143 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\ + + + false + .lib + $(SolutionDir)..\ + + + true + $(SolutionDir)..\ + + + false + .lib + $(SolutionDir)..\ + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc17 + Create + pch.hpp + $(ProjectDir)\..\monetdb\msvc + ../libaquery.pch + + + Console + true + + + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + + + + Level3 + true + true + false + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc17 + Create + pch.hpp + None + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + $(ProjectDir)\..\monetdb\msvc + ../libaquery.pch + + + Console + true + true + false + false + + + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc17 + Create + pch.hpp + $(ProjectDir)\..\monetdb\msvc + ../libaquery.pch + + + Console + true + + + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + + + + Level3 + true + true + false + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc17 + Create + pch.hpp + None + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + $(ProjectDir)\..\monetdb\msvc + ../libaquery.pch + + + Console + true + true + false + false + + + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msc-plugin/msc-plugin.vcxproj b/msc-plugin/msc-plugin.vcxproj index 95da320..ac70b3a 100644 --- a/msc-plugin/msc-plugin.vcxproj +++ b/msc-plugin/msc-plugin.vcxproj @@ -40,7 +40,7 @@ v143 true Unicode - true + false DynamicLibrary @@ -56,7 +56,7 @@ v143 true Unicode - true + false @@ -98,18 +98,23 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpplatest + stdcpp17 Guard - true + false $(ProjectDir)\..\monetdb\msvc /WL %(AdditionalOptions) + stdc17 + Create + ./server/pch.hpp + ../libaquery.pch + true Console DebugFull $(ProjectDir)\..\dll.so true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -117,20 +122,39 @@ Level3 true true - true + false _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 $(ProjectDir)\..\monetdb\msvc - Default + stdc17 + Create + ./server/pch.hpp + None + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + ../libaquery.pch + false Console true true - true + false $(ProjectDir)\..\dll.so - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + false @@ -139,9 +163,9 @@ true _ALLOW_RTCc_IN_STL;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpplatest + stdcpp17 Guard - true + false ProgramDatabase Disabled false @@ -149,13 +173,18 @@ false $(ProjectDir)\..\monetdb\msvc /WL %(AdditionalOptions) + stdc17 + Create + ./server/pch.hpp + ../libaquery.pch + true Console DebugFull $(ProjectDir)\..\dll.so true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -163,37 +192,43 @@ Level3 true true - true + false _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 $(ProjectDir)\..\monetdb\msvc - Default + stdc17 + Create + ./server/pch.hpp + None + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + ../libaquery.pch + false Console true true - true + false $(ProjectDir)\..\dll.so - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + false - - - - - - - - - - - - - diff --git a/server/server.sln b/msc-plugin/server.sln similarity index 58% rename from server/server.sln rename to msc-plugin/server.sln index d1680fa..47026ce 100644 --- a/server/server.sln +++ b/msc-plugin/server.sln @@ -1,95 +1,108 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32210.308 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}" - ProjectSection(ProjectDependencies) = postProject - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81} = {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc-plugin", "..\msc-plugin\msc-plugin.vcxproj", "{8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}" -EndProject -Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "msvs-py", "..\msvs-py\msvs-py.pyproj", "{CCC243F5-663E-45B7-A6DE-B2468C58B3A7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - shared|Any CPU = shared|Any CPU - shared|x64 = shared|x64 - shared|x86 = shared|x86 - sharedlib|Any CPU = sharedlib|Any CPU - sharedlib|x64 = sharedlib|x64 - sharedlib|x86 = sharedlib|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|Any CPU.ActiveCfg = Debug|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|Any CPU.Build.0 = Debug|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x64.ActiveCfg = Debug|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x64.Build.0 = Debug|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x86.ActiveCfg = Debug|Win32 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x86.Build.0 = Debug|Win32 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|Any CPU.ActiveCfg = Release|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|Any CPU.Build.0 = Release|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x64.ActiveCfg = Release|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x64.Build.0 = Release|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x86.ActiveCfg = Release|Win32 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x86.Build.0 = Release|Win32 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|Any CPU.ActiveCfg = Release|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|Any CPU.Build.0 = Release|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|x64.ActiveCfg = sharedlib|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|x86.ActiveCfg = sharedlib|Win32 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|Any CPU.ActiveCfg = sharedlib|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|Any CPU.Build.0 = sharedlib|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x64.ActiveCfg = sharedlib|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x64.Build.0 = sharedlib|x64 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x86.ActiveCfg = sharedlib|Win32 - {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x86.Build.0 = sharedlib|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|Any CPU.ActiveCfg = Debug|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|Any CPU.Build.0 = Debug|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x64.ActiveCfg = Debug|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x64.Build.0 = Debug|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x86.ActiveCfg = Debug|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x86.Build.0 = Debug|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|Any CPU.ActiveCfg = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|Any CPU.Build.0 = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x64.ActiveCfg = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x64.Build.0 = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x86.ActiveCfg = Release|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x86.Build.0 = Release|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|Any CPU.ActiveCfg = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|Any CPU.Build.0 = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x64.ActiveCfg = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x64.Build.0 = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x86.ActiveCfg = Release|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x86.Build.0 = Release|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|Any CPU.ActiveCfg = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|Any CPU.Build.0 = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x64.ActiveCfg = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x64.Build.0 = Release|x64 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x86.ActiveCfg = Release|Win32 - {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x86.Build.0 = Release|Win32 - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Debug|x64.ActiveCfg = Debug|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Debug|x86.ActiveCfg = Debug|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|x64.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|x86.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|Any CPU.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|x64.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|x86.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.sharedlib|Any CPU.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.sharedlib|x64.ActiveCfg = Release|Any CPU - {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.sharedlib|x86.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {572EA821-8162-4161-9AC2-464C79F08B47} - EndGlobalSection + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.32804.182 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}" + ProjectSection(ProjectDependencies) = postProject + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F} = {B52AACF7-16A6-4FCA-90AD-867D367BDA4F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc-plugin", "msc-plugin.vcxproj", "{8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}" +EndProject +Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "msvs-py", "..\msvs-py\msvs-py.pyproj", "{CCC243F5-663E-45B7-A6DE-B2468C58B3A7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaquery", "libaquery.vcxproj", "{B52AACF7-16A6-4FCA-90AD-867D367BDA4F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launcher", "launcher.vcxproj", "{C8E25628-0B46-4CBE-90DF-5228F79A5A64}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + shared|x64 = shared|x64 + shared|x86 = shared|x86 + sharedlib|x64 = sharedlib|x64 + sharedlib|x86 = sharedlib|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x64.ActiveCfg = Debug|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x64.Build.0 = Debug|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x86.ActiveCfg = Debug|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Debug|x86.Build.0 = Debug|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x64.ActiveCfg = Release|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x64.Build.0 = Release|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x86.ActiveCfg = Release|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x86.Build.0 = Release|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|x64.ActiveCfg = sharedlib|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|x86.ActiveCfg = sharedlib|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x64.ActiveCfg = sharedlib|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x64.Build.0 = sharedlib|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x86.ActiveCfg = sharedlib|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x86.Build.0 = sharedlib|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x64.ActiveCfg = Debug|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x64.Build.0 = Debug|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x86.ActiveCfg = Debug|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Debug|x86.Build.0 = Debug|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x64.ActiveCfg = Release|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x64.Build.0 = Release|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x86.ActiveCfg = Release|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x86.Build.0 = Release|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x64.ActiveCfg = Release|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x64.Build.0 = Release|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x86.ActiveCfg = Release|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x86.Build.0 = Release|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x64.ActiveCfg = Release|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x64.Build.0 = Release|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x86.ActiveCfg = Release|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.sharedlib|x86.Build.0 = Release|Win32 + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Debug|x64.ActiveCfg = Debug|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Debug|x86.ActiveCfg = Debug|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|x64.ActiveCfg = Release|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|x86.ActiveCfg = Release|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|x64.ActiveCfg = Release|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|x86.ActiveCfg = Release|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.sharedlib|x64.ActiveCfg = Release|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.sharedlib|x86.ActiveCfg = Release|Any CPU + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Debug|x64.ActiveCfg = Debug|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Debug|x64.Build.0 = Debug|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Debug|x86.ActiveCfg = Debug|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Debug|x86.Build.0 = Debug|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x64.ActiveCfg = Release|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x64.Build.0 = Release|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x86.ActiveCfg = Release|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x86.Build.0 = Release|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x64.ActiveCfg = Debug|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x64.Build.0 = Debug|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x86.ActiveCfg = Debug|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x86.Build.0 = Debug|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.sharedlib|x64.ActiveCfg = Debug|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.sharedlib|x64.Build.0 = Debug|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.sharedlib|x86.ActiveCfg = Debug|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.sharedlib|x86.Build.0 = Debug|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Debug|x64.ActiveCfg = Debug|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Debug|x64.Build.0 = Debug|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Debug|x86.ActiveCfg = Debug|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Debug|x86.Build.0 = Debug|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x64.ActiveCfg = Release|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x64.Build.0 = Release|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x86.ActiveCfg = Release|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x86.Build.0 = Release|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x64.ActiveCfg = sharedlib|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x64.Build.0 = sharedlib|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x86.ActiveCfg = sharedlib|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x86.Build.0 = sharedlib|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.sharedlib|x64.ActiveCfg = sharedlib|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.sharedlib|x64.Build.0 = sharedlib|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.sharedlib|x86.ActiveCfg = sharedlib|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.sharedlib|x86.Build.0 = sharedlib|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {572EA821-8162-4161-9AC2-464C79F08B47} + EndGlobalSection +EndGlobal diff --git a/server/server.vcxproj b/msc-plugin/server.vcxproj similarity index 81% rename from server/server.vcxproj rename to msc-plugin/server.vcxproj index 638cc00..5cff020 100644 --- a/server/server.vcxproj +++ b/msc-plugin/server.vcxproj @@ -1,283 +1,281 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - sharedlib - Win32 - - - sharedlib - x64 - - - - 16.0 - Win32Proj - {031352c2-afbb-45aa-9518-dbc1f9ef2af3} - server - 10.0.19041.0 - - - - Application - true - v141 - Unicode - false - - - Application - false - v141 - true - Unicode - true - - - DynamicLibrary - false - v143 - true - Unicode - true - - - Application - true - v143 - Unicode - false - - - Application - false - v141 - true - Unicode - true - - - DynamicLibrary - false - v143 - true - Unicode - false - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - false - - - true - - - false - - - false - - - - Level3 - true - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - true - true - stdcpplatest - stdc17 - $(ProjectDir)\..\monetdb\msvc - - - Console - true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - true - true - stdcpplatest - stdc17 - $(ProjectDir)\..\monetdb\msvc - - - Console - true - true - true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - true - true - stdcpplatest - stdc17 - $(ProjectDir)\..\monetdb\msvc - - - Console - true - true - true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) - - - copy $(OutDir)$(TargetName)$(TargetExt) $(ProjectDir)\..\server.so /y - - - - - Level3 - true - _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - true - true - stdcpplatest - stdc11 - $(ProjectDir)\..\monetdb\msvc - - - Console - true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - true - true - stdcpplatest - stdc17 - $(ProjectDir)\..\monetdb\msvc - - - Console - true - true - true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - true - true - stdcpplatest - stdc17 - $(ProjectDir)\..\monetdb\msvc - - - Console - true - true - true - $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) - - - copy "$(OutDir)$(TargetName)$(TargetExt)" "$(ProjectDir)\..\server.so" /y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + sharedlib + Win32 + + + sharedlib + x64 + + + + + + + 16.0 + Win32Proj + {031352c2-afbb-45aa-9518-dbc1f9ef2af3} + server + 10.0 + + + + DynamicLibrary + true + v143 + Unicode + false + + + DynamicLibrary + false + v143 + true + Unicode + false + + + DynamicLibrary + false + v143 + true + Unicode + true + + + DynamicLibrary + true + v143 + Unicode + false + + + DynamicLibrary + false + v143 + true + Unicode + false + + + DynamicLibrary + false + v143 + true + Unicode + false + + + + + + + + + + + + + + + + + + + + + + + + + + + true + .so + $(SolutionDir)..\ + + + false + .so + $(SolutionDir)..\ + + + false + .so + $(SolutionDir)..\ + + + true + .so + $(SolutionDir)..\ + + + false + .so + $(SolutionDir)..\ + + + false + .so + $(SolutionDir)..\ + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + true + true + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + copy $(OutDir)$(TargetName)$(TargetExt) $(ProjectDir)\..\server.so /y + + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpp17 + stdc17 + $(ProjectDir)\..\monetdb\msvc + + + Console + true + true + true + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + copy "$(OutDir)$(TargetName)$(TargetExt)" "$(ProjectDir)\..\server.so" /y + + + \ No newline at end of file diff --git a/msvs-py/msvs-py.pyproj b/msvs-py/msvs-py.pyproj index 4230f8c..58b0511 100644 --- a/msvs-py/msvs-py.pyproj +++ b/msvs-py/msvs-py.pyproj @@ -22,12 +22,8 @@ - - - - @@ -45,42 +41,16 @@ - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +