From fae82f3574f05a643b5ef2144d085c73d70ae89c Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Mon, 15 Apr 2024 22:54:45 +0300 Subject: [PATCH] Simplify build instructions --- CCL-Full.sln | 8 -- README.md | 14 +- pyconcept/pyconcept.vcxproj | 210 ---------------------------- pyconcept/pyconcept.vcxproj.filters | 23 --- 4 files changed, 4 insertions(+), 251 deletions(-) delete mode 100644 pyconcept/pyconcept.vcxproj delete mode 100644 pyconcept/pyconcept.vcxproj.filters diff --git a/CCL-Full.sln b/CCL-Full.sln index dab9dd3..aee4c03 100644 --- a/CCL-Full.sln +++ b/CCL-Full.sln @@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccdTest", "coredll\test\ccd EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cclCommonsTest", "ccl\cclCommons\test\cclCommonsTest.vcxproj", "{53A380CF-B599-4170-89B1-642F1C3772E1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyconcept", "pyconcept\pyconcept.vcxproj", "{692F2E27-1749-4A3C-9543-C4101E7B8E49}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -125,12 +123,6 @@ Global {53A380CF-B599-4170-89B1-642F1C3772E1}.Release|x64.Build.0 = Release|x64 {53A380CF-B599-4170-89B1-642F1C3772E1}.Release|x86.ActiveCfg = Release|Win32 {53A380CF-B599-4170-89B1-642F1C3772E1}.Release|x86.Build.0 = Release|Win32 - {692F2E27-1749-4A3C-9543-C4101E7B8E49}.Debug|x64.ActiveCfg = Debug|x64 - {692F2E27-1749-4A3C-9543-C4101E7B8E49}.Debug|x64.Build.0 = Debug|x64 - {692F2E27-1749-4A3C-9543-C4101E7B8E49}.Debug|x86.ActiveCfg = Debug|Win32 - {692F2E27-1749-4A3C-9543-C4101E7B8E49}.Debug|x86.Build.0 = Debug|Win32 - {692F2E27-1749-4A3C-9543-C4101E7B8E49}.Release|x64.ActiveCfg = Release|x64 - {692F2E27-1749-4A3C-9543-C4101E7B8E49}.Release|x86.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.md b/README.md index b7b84fa..3dfaa1b 100644 --- a/README.md +++ b/README.md @@ -10,20 +10,14 @@ C++ library for manipulating concepts in formal language of advanced set theory ## 📦 Project build -Use Dockerfile to setup Clang / GCC build for Ubuntu development. -Use VS Solution for Windows development. -Use ccl/CMakeLists.txt for other platforms. +- ccl + coredll + pyconcept - Dockerfile to setup Clang / GCC build for Ubuntu development. +- ccl + coredlll local dev - VS Solution for Windows development. +- ccl - VS Code and ccl/CMakeLists.txt for other platforms. +- pyconcept - python setup.py Windows development requires Bison installed and Visual Studio 2022+. After changing grammar / syntax you can rebuild lexers and parser using scripts in 'scripts' folder. -If you want to only build pyconcept: - -- Build CCL-Full.sln in Release mode. -- Make sure you have Python installed and executable path is present in environment variables. -- Run pyconcept\script\Build.ps1. Answer 'A' if execution policy prompts for input -- pyconcept wheel will be deposited in output\py folder - ## 💝 Acknowledgements This project is based on multiple projects and works listed below. If you notice any problems with licensing or missing acknowledgements please inform repository maintainer. diff --git a/pyconcept/pyconcept.vcxproj b/pyconcept/pyconcept.vcxproj deleted file mode 100644 index c1331a0..0000000 --- a/pyconcept/pyconcept.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {692f2e27-1749-4a3c-9543-c4101e7b8e49} - pyconcept - 10.0 - - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - .pyd - $(SolutionDir)\output\py\x86\$(ProjectName)\ - build\x86\$(Configuration)\ - $(ProjectName)32_d - - - .pyd - $(SolutionDir)\output\py\x86\$(ProjectName)\ - build\x86\$(Configuration)\ - false - $(ProjectName)32 - - - .pyd - $(ProjectName)64_d - $(SolutionDir)\output\py\x64\$(ProjectName)\ - build\x64\$(Configuration)\ - - - .pyd - $(SolutionDir)\output\py\x64\$(ProjectName)\ - build\x64\$(Configuration)\ - false - $(ProjectName)64 - - - - Level4 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpplatest - include;..\output\include;C:\Program Files (x86)\Python39-32\include;pybind11\include - true - - - Console - true - ..\output\lib\x86;C:\Program Files (x86)\Python39-32\libs - RSlangd.lib;cclGraphd.lib;cclLangd.lib;ConceptCoreLibraryd.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - - - - - - - - - Level4 - true - true - true - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpplatest - include;..\output\include;pybind11\include;C:\Program Files (x86)\Python39-32\include - true - - - Console - true - true - true - ..\output\lib\x86;C:\Program Files (x86)\Python39-32\libs - RSlang.lib;cclGraph.lib;cclLang.lib;ConceptCoreLibrary.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - - - - - - - - - Level4 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpplatest - include;..\output\include;C:\Program Files\Python39\include;pybind11\include - true - - - Console - true - ..\output\lib\x64;C:\Program Files\Python39\libs - RSlangd.lib;cclGraphd.lib;cclLangd.lib;ConceptCoreLibraryd.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - - - - - - - - - Level4 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpplatest - include;pybind11\include;..\output\include;C:\Program Files\Python39\include - true - - - Console - true - true - true - ..\output\lib\x64;C:\Program Files\Python39\libs - RSlang.lib;cclGraph.lib;cclLang.lib;ConceptCoreLibrary.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - {b0aba27b-9d39-4b48-9977-aff20925b309} - - - - - - \ No newline at end of file diff --git a/pyconcept/pyconcept.vcxproj.filters b/pyconcept/pyconcept.vcxproj.filters deleted file mode 100644 index 66b3c3c..0000000 --- a/pyconcept/pyconcept.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {19270d64-7c6d-4d25-9b7c-e375cfb16f4f} - - - - - src - - - - - src - - - - - - - - \ No newline at end of file