Skip to content

Commit 2d86933

Browse files
twostarstwostars
committed
Rename db-modules -> db-models
We're not using modules anymore for better compatibility.
1 parent c2ee7b4 commit 2d86933

File tree

18 files changed

+140
-151
lines changed

18 files changed

+140
-151
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
path = deps/libjpeg-turbo
1414
url = https://github.com/libjpeg-turbo/libjpeg-turbo
1515
branch = main
16-
[submodule "deps/db-modules"]
17-
path = deps/db-modules
18-
url = https://github.com/Open-KO/OpenKO-db-modules
16+
[submodule "deps/db-models"]
17+
path = deps/db-models
18+
url = https://github.com/Open-KO/OpenKO-db-models
1919
branch = main
2020
[submodule "deps/nanodbc"]
2121
path = deps/nanodbc

‎All.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Option", "Client\Option\Opt
161161
EndProject
162162
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-nanodbc", "deps\fetch-and-build-wrappers\fetch-nanodbc.vcxproj", "{3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC}"
163163
EndProject
164-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-db-modules", "deps\fetch-and-build-wrappers\fetch-db-modules.vcxproj", "{057C1ABC-6137-37A9-9935-8CF811D7CEDA}"
164+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-db-models", "deps\fetch-and-build-wrappers\fetch-db-models.vcxproj", "{057C1ABC-6137-37A9-9935-8CF811D7CEDA}"
165165
ProjectSection(ProjectDependencies) = postProject
166166
{3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC} = {3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC}
167167
EndProjectSection
168168
EndProject
169-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db-modules", "deps\db-modules-msvc\db-modules.vcxproj", "{17EF3A49-55B8-4FB6-883F-D1D02E20C11D}"
169+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db-models", "deps\db-models-msvc\db-models.vcxproj", "{17EF3A49-55B8-4FB6-883F-D1D02E20C11D}"
170170
ProjectSection(ProjectDependencies) = postProject
171171
{057C1ABC-6137-37A9-9935-8CF811D7CEDA} = {057C1ABC-6137-37A9-9935-8CF811D7CEDA}
172172
EndProjectSection

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ if(OPENKO_BUILD_SERVERS)
7272
$<$<CXX_COMPILER_ID:Clang>:-Wno-deprecated-declarations>
7373
)
7474

75-
add_subdirectory(deps/db-modules-cmake)
75+
add_subdirectory(deps/db-models-cmake)
7676
add_subdirectory(deps/db-library-cmake)
7777

7878
add_subdirectory(Server/shared-server)

‎Server.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fetch wrappers", "fetch wra
5050
EndProject
5151
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-dx9sdk", "deps\fetch-and-build-wrappers\fetch-dx9sdk.vcxproj", "{50D2B40A-5AE4-F5FB-4D79-AC6CC3C75274}"
5252
EndProject
53-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-db-modules", "deps\fetch-and-build-wrappers\fetch-db-modules.vcxproj", "{057C1ABC-6137-37A9-9935-8CF811D7CEDA}"
53+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-db-models", "deps\fetch-and-build-wrappers\fetch-db-models.vcxproj", "{057C1ABC-6137-37A9-9935-8CF811D7CEDA}"
5454
ProjectSection(ProjectDependencies) = postProject
5555
{3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC} = {3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC}
5656
EndProjectSection
5757
EndProject
5858
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-nanodbc", "deps\fetch-and-build-wrappers\fetch-nanodbc.vcxproj", "{3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC}"
5959
EndProject
60-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db-modules", "deps\db-modules-msvc\db-modules.vcxproj", "{17EF3A49-55B8-4FB6-883F-D1D02E20C11D}"
60+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db-models", "deps\db-models-msvc\db-models.vcxproj", "{17EF3A49-55B8-4FB6-883F-D1D02E20C11D}"
6161
ProjectSection(ProjectDependencies) = postProject
6262
{057C1ABC-6137-37A9-9935-8CF811D7CEDA} = {057C1ABC-6137-37A9-9935-8CF811D7CEDA}
6363
{3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC} = {3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC}

‎ThirdParty.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg-static", "deps\libjpeg
1919
{56988836-40F9-F81D-C8B4-4DC1CE5901E2} = {56988836-40F9-F81D-C8B4-4DC1CE5901E2}
2020
EndProjectSection
2121
EndProject
22-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db-modules", "deps\db-modules-msvc\db-modules.vcxproj", "{17EF3A49-55B8-4FB6-883F-D1D02E20C11D}"
22+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db-models", "deps\db-models-msvc\db-models.vcxproj", "{17EF3A49-55B8-4FB6-883F-D1D02E20C11D}"
2323
ProjectSection(ProjectDependencies) = postProject
2424
{057C1ABC-6137-37A9-9935-8CF811D7CEDA} = {057C1ABC-6137-37A9-9935-8CF811D7CEDA}
2525
EndProjectSection
2626
EndProject
27-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-db-modules", "deps\fetch-and-build-wrappers\fetch-db-modules.vcxproj", "{057C1ABC-6137-37A9-9935-8CF811D7CEDA}"
27+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetch-db-models", "deps\fetch-and-build-wrappers\fetch-db-models.vcxproj", "{057C1ABC-6137-37A9-9935-8CF811D7CEDA}"
2828
ProjectSection(ProjectDependencies) = postProject
2929
{3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC} = {3F38FD98-5C7E-97C7-70A9-FDA7E34A0CFC}
3030
EndProjectSection

‎deps/db-library-cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ target_precompile_headers(db-library PRIVATE ${DB_LIBRARY_DIR}/pch.h)
3131
# Setup dependencies
3232
target_link_libraries(db-library
3333
PUBLIC
34-
db-modules
34+
db-models
3535
spdlog
3636
)
3737

‎deps/db-library-msvc/db-library.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<ImportGroup Label="PropertySheets">
7171
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7272
</ImportGroup>
73-
<Import Project="$(PropsDir)db-modules.props" />
73+
<Import Project="$(PropsDir)db-models.props" />
7474
<Import Project="$(PropsDir)spdlog.props" />
7575
<PropertyGroup Label="UserMacros" />
7676
<ItemDefinitionGroup>

‎deps/db-models‎

Submodule db-models added at 2c5e510

‎deps/db-models-cmake/CMakeLists.txt‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
set(DB_MODELS_DIR "${OPENKO_DEPS_DIR}/db-models")
2+
3+
add_library(db-models STATIC
4+
${DB_MODELS_DIR}/AIServer/binder/AIServerBinder.cpp
5+
${DB_MODELS_DIR}/AIServer/binder/AIServerBinder.h
6+
${DB_MODELS_DIR}/AIServer/model/AIServerModel.cpp
7+
${DB_MODELS_DIR}/AIServer/model/AIServerModel.h
8+
${DB_MODELS_DIR}/Aujard/binder/AujardBinder.cpp
9+
${DB_MODELS_DIR}/Aujard/binder/AujardBinder.h
10+
${DB_MODELS_DIR}/Aujard/model/AujardModel.cpp
11+
${DB_MODELS_DIR}/Aujard/model/AujardModel.h
12+
${DB_MODELS_DIR}/BinderUtil/BinderUtil.cpp
13+
${DB_MODELS_DIR}/BinderUtil/BinderUtil.h
14+
${DB_MODELS_DIR}/detail/StoredProc/StoredProcedure.cpp
15+
${DB_MODELS_DIR}/detail/StoredProc/StoredProcedure.h
16+
${DB_MODELS_DIR}/Ebenezer/binder/EbenezerBinder.cpp
17+
${DB_MODELS_DIR}/Ebenezer/binder/EbenezerBinder.h
18+
${DB_MODELS_DIR}/Ebenezer/model/EbenezerModel.cpp
19+
${DB_MODELS_DIR}/Ebenezer/model/EbenezerModel.h
20+
${DB_MODELS_DIR}/Full/binder/FullBinder.cpp
21+
${DB_MODELS_DIR}/Full/binder/FullBinder.h
22+
${DB_MODELS_DIR}/Full/model/FullModel.cpp
23+
${DB_MODELS_DIR}/Full/model/FullModel.h
24+
${DB_MODELS_DIR}/ModelUtil/ModelUtil.cpp
25+
${DB_MODELS_DIR}/ModelUtil/ModelUtil.h
26+
${DB_MODELS_DIR}/StoredProc/StoredProc.cpp
27+
${DB_MODELS_DIR}/StoredProc/StoredProc.h
28+
${DB_MODELS_DIR}/VersionManager/binder/VersionManagerBinder.cpp
29+
${DB_MODELS_DIR}/VersionManager/binder/VersionManagerBinder.h
30+
${DB_MODELS_DIR}/VersionManager/model/VersionManagerModel.cpp
31+
${DB_MODELS_DIR}/VersionManager/model/VersionManagerModel.h
32+
)
33+
34+
# Use C++23
35+
target_compile_features(db-models PUBLIC cxx_std_23)
36+
37+
# Require nanodbc
38+
target_link_libraries(db-models PUBLIC nanodbc)
39+
40+
# Expose include path
41+
target_include_directories(db-models
42+
PUBLIC
43+
${DB_MODELS_DIR}/
44+
)
45+
46+
# Build with UTF-8. This is needed so that builds match.
47+
target_compile_options(db-models
48+
PRIVATE
49+
$<$<CXX_COMPILER_ID:MSVC>:/utf-8>
50+
)
51+
52+
# Setup warning levels
53+
target_compile_options(db-models PRIVATE
54+
$<$<CXX_COMPILER_ID:MSVC>:/W3>
55+
$<$<CXX_COMPILER_ID:GNU>:-Wall>
56+
$<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra>
57+
)

deps/db-modules-msvc/.gitignore renamed to deps/db-models-msvc/.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)