Skip to content

Commit 6e12444

Browse files
committed
build: remove fmt from bootstrap.py
1 parent c3c6759 commit 6e12444

File tree

2 files changed

+4
-38
lines changed

2 files changed

+4
-38
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
#-------------------------------------------------
1717

1818
cmake_minimum_required(VERSION 3.13)
19-
if (GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_CONFIGURATION_TYPES)
20-
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configurations" FORCE)
21-
elseif(NOT GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
22-
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
23-
endif()
2419
project(
2520
MrDocs
2621
VERSION 0.0.3
@@ -256,7 +251,6 @@ if (WIN32)
256251
-D_WIN32_WINNT=0x0601
257252
-D_CRT_SECURE_NO_WARNINGS
258253
-D_SILENCE_CXX20_CISO646_REMOVED_WARNING
259-
-DFMT_HEADER_ONLY # because of _ITERATOR_DEBUG_LEVEL
260254
)
261255
if(MSVC)
262256
get_target_property(LLVM_CONFIGURATION_TYPE LLVMCore IMPORTED_CONFIGURATIONS)

bootstrap.py

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ class InstallOptions:
6565
# Third-party dependencies
6666
third_party_src_dir: str = "<mrdocs-src-dir>/../third-party"
6767

68-
# Fmt
69-
fmt_src_dir: str = "<third-party-src-dir>/fmt"
70-
fmt_build_type: str = "<mrdocs-build-type>"
71-
fmt_build_dir: str = "<fmt-src-dir>/build/<fmt-build-type:lower>"
72-
fmt_install_dir: str = "<fmt-src-dir>/install/<fmt-build-type:lower>"
73-
fmt_repo: str = "https://github.com/fmtlib/fmt"
74-
fmt_branch: str = "10.2.1"
75-
7668
# Duktape
7769
duktape_src_dir: str = "<third-party-src-dir>/duktape"
7870
duktape_url: str = "https://github.com/svaarala/duktape/releases/download/v2.7.0/duktape-2.7.0.tar.xz"
@@ -116,12 +108,6 @@ class InstallOptions:
116108
"mrdocs_system_install": "Whether to install MrDocs to the system directories instead of a custom install directory.",
117109
"mrdocs_run_tests": "Whether to run tests after building MrDocs.",
118110
"third_party_src_dir": "Directory for all third-party source dependencies.",
119-
"fmt_src_dir": "Directory for the fmt library source code.",
120-
"fmt_build_type": "CMake build type for the fmt library. (Release, Debug, RelWithDebInfo, MilRelSize, DebWithOpt)",
121-
"fmt_build_dir": "Directory where the fmt library will be built.",
122-
"fmt_install_dir": "Directory where the fmt library will be installed.",
123-
"fmt_repo": "URL of the fmt library repository to clone.",
124-
"fmt_branch": "Branch or tag of the fmt library to use.",
125111
"duktape_src_dir": "Directory for the Duktape source code.",
126112
"duktape_url": "Download URL for the Duktape source archive.",
127113
"duktape_build_type": "CMake build type for Duktape. (Release, Debug, RelWithDebInfo, MilRelSize, DebWithOpt)",
@@ -259,7 +245,7 @@ def repl(match):
259245
key = match.group(1)
260246
has_dir_key = has_dir_key or key.endswith("-dir")
261247
key = key.replace("-", "_")
262-
fmt = match.group(2)
248+
transform_fn = match.group(2)
263249
if key == 'os':
264250
if self.is_windows():
265251
val = "windows"
@@ -271,10 +257,10 @@ def repl(match):
271257
raise ValueError("Unsupported operating system.")
272258
else:
273259
val = getattr(self.options, key, None)
274-
if fmt:
275-
if fmt == "lower":
260+
if transform_fn:
261+
if transform_fn == "lower":
276262
val = val.lower()
277-
elif fmt == "upper":
263+
elif transform_fn == "upper":
278264
val = val.upper()
279265
# Add more formats as needed
280266
return val
@@ -539,17 +525,6 @@ def setup_third_party_dir(self):
539525
self.prompt_dependency_path_option("third_party_src_dir")
540526
os.makedirs(self.options.third_party_src_dir, exist_ok=True)
541527

542-
def install_fmt(self):
543-
self.prompt_dependency_path_option("fmt_src_dir")
544-
if not os.path.exists(self.options.fmt_src_dir):
545-
self.prompt_option("fmt_repo")
546-
self.prompt_option("fmt_branch")
547-
self.clone_repo(self.options.fmt_repo, self.options.fmt_src_dir, branch=self.options.fmt_branch, depth=1)
548-
self.prompt_build_type_option("fmt_build_type")
549-
self.prompt_dependency_path_option("fmt_build_dir")
550-
self.prompt_dependency_path_option("fmt_install_dir")
551-
self.cmake_workflow(self.options.fmt_src_dir, self.options.fmt_build_type, self.options.fmt_build_dir, self.options.fmt_install_dir, ["-D", "FMT_DOC=OFF", "-D", "FMT_TEST=OFF"])
552-
553528
def install_duktape(self):
554529
self.prompt_dependency_path_option("duktape_src_dir")
555530
if not os.path.exists(self.options.duktape_src_dir):
@@ -715,7 +690,6 @@ def create_cmake_presets(self):
715690
"Clang_ROOT": self.options.llvm_install_dir,
716691
"duktape_ROOT": self.options.duktape_install_dir,
717692
"Duktape_ROOT": self.options.duktape_install_dir,
718-
"fmt_ROOT": self.options.fmt_install_dir,
719693
"libxml2_ROOT": self.options.libxml2_install_dir,
720694
"LibXml2_ROOT": self.options.libxml2_install_dir,
721695
"MRDOCS_BUILD_TESTS": self.options.mrdocs_build_tests,
@@ -797,7 +771,6 @@ def install_mrdocs(self):
797771
"-D", f"Clang_ROOT={self.options.llvm_install_dir}",
798772
"-D", f"duktape_ROOT={self.options.duktape_install_dir}",
799773
"-D", f"Duktape_ROOT={self.options.duktape_install_dir}",
800-
"-D", f"fmt_ROOT={self.options.fmt_install_dir}"
801774
])
802775
if self.options.mrdocs_build_tests:
803776
extra_args.extend([
@@ -828,7 +801,6 @@ def install_all(self):
828801
self.check_tools()
829802
self.setup_mrdocs_dir()
830803
self.setup_third_party_dir()
831-
self.install_fmt()
832804
self.install_duktape()
833805
if self.options.mrdocs_build_tests:
834806
self.install_libxml2()

0 commit comments

Comments
 (0)