Skip to content

Commit 2856519

Browse files
AnonymousPCAnonymousPC
committed
small updates
1 parent 363e83e commit 2856519

15 files changed

+27
-37
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
gcm.cache
2-
pcm.cache
2+
pcm.cache
3+
ifc.cache

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,3 @@
1919
[submodule "src/tbb"]
2020
path = src/tbb
2121
url = https://github.com/uxlfoundation/oneTBB.git
22-
[submodule "src/openssl"]
23-
path = src/openssl
24-
url = https://github.com/openssl/openssl.git

‎.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
"syncstream": "cpp",
101101
"thread": "cpp",
102102
"typeindex": "cpp",
103-
"typeinfo": "cpp"
103+
"typeinfo": "cpp",
104+
"__locale": "cpp",
105+
"ios": "cpp"
104106
}
105107
}

‎build/__pycache__/basic.cpython-313.pyc

-77 Bytes
Binary file not shown.

‎build/basic.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ def build(repo, # "stdexec"
6565
on_failure = lambda : None # print("remove above 'static' from the function declaration")
6666
):
6767

68-
run(f"cd src/{repo} && git fetch --recurse-submodules")
6968
run(f"cd src/{repo} && git reset --hard origin/HEAD --recurse-submodules")
7069

7170
for src_dir in src_dirs:
@@ -127,8 +126,8 @@ def build(repo, # "stdexec"
127126
f"{' '.join(compile_args)} "
128127
f"{' '.join(f"-I./src/{repo}/{src_dir.replace("./", "")}" for src_dir in src_dirs)} "
129128
f"-I{include_path} "
130-
f"-c ./src/{export_module}.cppm "
131-
f"--precompile -o ./pcm.cache/{export_module}.pcm")
129+
f"--precompile ./src/{export_module}.cppm "
130+
f"-o ./pcm.cache/{export_module}.pcm")
132131
run(f"{compiler} "
133132
f"{' '.join(compile_args)} "
134133
f"-c ./pcm.cache/{export_module}.pcm "

‎build/boost.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@
5353

5454
import_macros = {
5555
"BOOST_LOCALE_WITH_ICU": "true",
56-
"BOOST_LOCALE_NO_WINAPI_BACKEND": "true",
57-
"BOOST_LOCALE_NO_POSIX_BACKEND": "true",
56+
"BOOST_LOCALE_WITH_ICONV": "true",
5857
"BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED": "true",
5958
"BOOST_USE_WINDOWS_H": "true"
6059
}
6160
if system == "windows":
62-
import_macros["BOOST_LOCALE_NO_POSIX_BACKEND"] = ""
61+
import_macros["BOOST_LOCALE_NO_POSIX_BACKEND"] = "true"
6362
elif system == "linux" or system == "macos":
64-
import_macros["BOOST_LOCALE_NO_WINAPI_BACKEND"] = ""
63+
import_macros["BOOST_LOCALE_NO_WINAPI_BACKEND"] = "true"
6564

6665
export_module = "boost"
6766
export_headers = [
6867
"<boost/asio.hpp>",
6968
"<boost/asio/ssl.hpp>",
7069
"<boost/beast.hpp>",
70+
"<boost/charconv.hpp>",
7171
"<boost/circular_buffer.hpp>",
7272
"<boost/date_time.hpp>",
7373
"<boost/dynamic_bitset.hpp>",
@@ -102,8 +102,8 @@
102102
for subrepo in ["charconv", "datetime", "filesystem", "iostreams", "locale", "process", "system", "thread"]:
103103
for root, _, files in os.walk(f"./src/boost/libs/{subrepo}/src"):
104104
for file in files:
105-
if ( system == "windows" and not "posix" in f"{root}/{file}" and not "pthread" in f"{root}/{file}" and not "iconv" in f"{root}/{file}") or \
106-
((system == "linux" or system == "macos") and not "win" in f"{root}/{file}" and not "wconv" in f"{root}/{file}" and not "iconv" in f"{root}/{file}"):
105+
if ( system == "windows" and not "posix" in f"{root}/{file}" and not "pthread" in f"{root}/{file}") or \
106+
((system == "linux" or system == "macos") and not "win" in f"{root}/{file}" and not "wconv" in f"{root}/{file}"):
107107
export_headers.append(f"./{root}/{file}")
108108

109109
export_headers.append(f"./src/boost/libs/stacktrace/src/basic.cpp")

‎build/main.cpp

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎build/std.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
elif compiler == "clang++":
1313
if os.path.isdir(f"src/std") and os.path.isfile(f"src/std.cppm"):
14-
run(f"clang++ -std=c++26 -O3 --precompile -c ./src/std.cppm -o ./pcm.cache/std.pcm")
15-
run(f"clang++ -std=c++26 -O3 -c ./pcm.cache/std.pcm -o ./pcm.cache/std.o" )
14+
run(f"clang++ -std=c++26 -O3 --precompile ./src/std.cppm -o ./pcm.cache/std.pcm")
15+
run(f"clang++ -std=c++26 -O3 -c ./pcm.cache/std.pcm -o ./pcm.cache/std.o" )
1616
else:
1717
print(f"{red}e.g.: cp -r .../llvm/share/libc++/v1/std ./src/std && cp .../llvm/share/libc++/v1/std.cppm ./src/std.cppm{white}")

‎build/tbb.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
export_headers = ["<tbb/tbb.h>"]
1515
for root, _, files in os.walk(f"./src/tbb/src"):
1616
for file in files:
17-
if file.endswith(".cpp") and \
18-
not "main.cpp" in file and \
19-
not "dynamic_link.cpp" in file:
17+
if file.endswith(".cpp") and \
18+
file != "./src/tbb/src/tbb/main.cpp":
2019
export_headers.append(f"./{root}/{file}")
2120

2221
export_namespaces = ["tbb"]

‎main.cpp

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎main.exe

-848 KB
Binary file not shown.

‎src/boost

‎src/boost.cppm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ module;
162162
#include <mdspan>
163163
#endif
164164
#define BOOST_LOCALE_WITH_ICU true
165-
#define BOOST_LOCALE_NO_WINAPI_BACKEND
166-
#define BOOST_LOCALE_NO_POSIX_BACKEND true
165+
#define BOOST_LOCALE_WITH_ICONV true
167166
#define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED true
168167
#define BOOST_USE_WINDOWS_H true
168+
#define BOOST_LOCALE_NO_WINAPI_BACKEND true
169169
#include <jerror.h>
170170
#include <jpeglib.h>
171171
#include <openssl/ssl.h>
@@ -273,6 +273,7 @@ import std;
273273
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/foreach_char.hpp"
274274
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/codecvt_converter.cpp"
275275
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/timezone.hpp"
276+
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/iconv.hpp"
276277
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/numeric.hpp"
277278
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/encoding.cpp"
278279
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/util/default_locale.cpp"
@@ -288,6 +289,7 @@ import std;
288289
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/std/all_generator.hpp"
289290
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/std/std_backend.cpp"
290291
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/encoding/uconv_converter.hpp"
292+
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/encoding/iconv_converter.hpp"
291293
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/encoding/codepage.cpp"
292294
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/generator.cpp"
293295
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/ids.cpp"
@@ -296,7 +298,9 @@ import std;
296298
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/message.cpp"
297299
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/ios_prop.hpp"
298300
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/mo_lambda.hpp"
301+
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/iconv_codecvt.hpp"
299302
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/mo_lambda.cpp"
303+
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/iconv_codecvt.cpp"
300304
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/mo_hash.hpp"
301305
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/std_collate_adapter.hpp"
302306
#include "/Users/anonymous/Code/cpp-module-builder/src/boost/libs/locale/src/shared/localization_backend.cpp"

‎src/tbb

‎src/tbb.cppm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ import std;
181181
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/task_dispatcher.cpp"
182182
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/arena_slot.cpp"
183183
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/thread_request_serializer.cpp"
184+
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/dynamic_link.cpp"
184185
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/arena.cpp"
185186
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/task_group_context.cpp"
186187
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/itt_notify.cpp"
@@ -198,6 +199,7 @@ import std;
198199
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/profiling.cpp"
199200
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/semaphore.cpp"
200201
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/concurrent_bounded_queue.cpp"
202+
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbb/main.cpp"
201203
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbbmalloc_proxy/function_replacement.cpp"
202204
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbbmalloc_proxy/proxy.cpp"
203205
#include "/Users/anonymous/Code/cpp-module-builder/src/tbb/src/tbbmalloc/backend.cpp"

0 commit comments

Comments
 (0)