Skip to content

Commit bb7122b

Browse files
coder137coder137
committed
deploy: b9b37cb 
1 parent 48b31e0 commit bb7122b

File tree

14 files changed

+155
-204
lines changed

14 files changed

+155
-204
lines changed

‎.doctrees/environment.pickle

-6.29 KB
Binary file not shown.

‎.doctrees/examples/hybrid.doctree

78 Bytes
Binary file not shown.

‎.doctrees/user_api/args.doctree

-35.3 KB
Binary file not shown.

‎.doctrees/user_api/toolchain.doctree

18.1 KB
Binary file not shown.

‎_sources/examples/hybrid.rst.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ For super customized targets and toolchains
352352
Toolchain_gcc gcc;
353353
Toolchain_msvc msvc;
354354
// Get custom toolchain from the command line, supplied at run time
355-
BaseToolchain clang = toolchain_clang_gnu.ConstructToolchain();
355+
auto &clang = toolchain_clang_gnu;
356+
clang.SetToolchainInfoFunc(GlobalToolchainInfo::Get(clang.id));
356357
357358
ExecutableTarget_gcc g_foolib("foolib", gcc, "");
358359
ExecutableTarget_msvc m_foolib("foolib", msvc, "");

‎_sources/user_api/args.rst.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ Example
5454
// .build, .test
5555
arg_gcc_toolchain.state;
5656
// .id, .name, .asm_compiler, .c_compiler, .cpp_compiler, .archiver, .linker -> BaseToolchain
57-
BaseToolchain gcc_toolchain = arg_gcc_toolchain.ConstructToolchain();
57+
auto &gcc_toolchain = arg_gcc_toolchain;
58+
gcc_toolchain.SetToolchainInfoFunc(GlobalToolchainInfo::Get(gcc_toolchain.id));
5859
return 0;
5960
}
6061

‎_static/pygments.css

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

‎examples/hybrid.html

Lines changed: 33 additions & 32 deletions
Large diffs are not rendered by default.

‎genindex.html

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -308,20 +308,6 @@ <h2>B</h2>
308308
<li><a href="user_api/args.html#_CPPv4N7buildcc9ArgTarget15GetTargetConfigEv">buildcc::ArgTarget::GetTargetConfig (C++ function)</a>
309309
</li>
310310
<li><a href="user_api/args.html#_CPPv4N7buildcc9ArgTarget12link_commandE">buildcc::ArgTarget::link_command (C++ member)</a>
311-
</li>
312-
<li><a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchainE">buildcc::ArgToolchain (C++ struct)</a>
313-
</li>
314-
<li><a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain12ArgToolchainE11ToolchainIdRKNSt6stringERK20ToolchainExecutables">buildcc::ArgToolchain::ArgToolchain (C++ function)</a>, <a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain12ArgToolchainE11ToolchainIdRKNSt6stringERKNSt6stringERKNSt6stringERKNSt6stringERKNSt6stringERKNSt6stringE">[1]</a>, <a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain12ArgToolchainEv">[2]</a>
315-
</li>
316-
<li><a href="user_api/args.html#_CPPv4NK7buildcc12ArgToolchain18ConstructToolchainEv">buildcc::ArgToolchain::ConstructToolchain (C++ function)</a>
317-
</li>
318-
<li><a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain11executablesE">buildcc::ArgToolchain::executables (C++ member)</a>
319-
</li>
320-
<li><a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain2idE">buildcc::ArgToolchain::id (C++ member)</a>
321-
</li>
322-
<li><a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain4nameE">buildcc::ArgToolchain::name (C++ member)</a>
323-
</li>
324-
<li><a href="user_api/args.html#_CPPv4N7buildcc12ArgToolchain5stateE">buildcc::ArgToolchain::state (C++ member)</a>
325311
</li>
326312
<li><a href="user_api/args.html#_CPPv4N7buildcc17ArgToolchainStateE">buildcc::ArgToolchainState (C++ struct)</a>
327313
</li>
@@ -625,8 +611,6 @@ <h2>B</h2>
625611
</li>
626612
<li><a href="user_api/target.html#_CPPv4NK7buildcc8internal16TargetInfoGetter11GetPchFilesEv">buildcc::internal::TargetInfoGetter::GetPchFiles (C++ function)</a>
627613
</li>
628-
</ul></td>
629-
<td style="width: 33%; vertical-align: top;"><ul>
630614
<li><a href="user_api/target.html#_CPPv4NK7buildcc8internal16TargetInfoGetter14GetSourceFilesEv">buildcc::internal::TargetInfoGetter::GetSourceFiles (C++ function)</a>
631615
</li>
632616
<li><a href="user_api/target.html#_CPPv4NK7buildcc8internal16TargetInfoGetter17GetTargetBuildDirEv">buildcc::internal::TargetInfoGetter::GetTargetBuildDir (C++ function)</a>
@@ -635,6 +619,8 @@ <h2>B</h2>
635619
</li>
636620
<li><a href="arch/testing.html#_CPPv4N7buildcc1m30GeneratorExpect_CommandChangedEjP9Generator">buildcc::m::GeneratorExpect_CommandChanged (C++ function)</a>
637621
</li>
622+
</ul></td>
623+
<td style="width: 33%; vertical-align: top;"><ul>
638624
<li><a href="arch/testing.html#_CPPv4N7buildcc1m26GeneratorExpect_InputAddedEjP9Generator">buildcc::m::GeneratorExpect_InputAdded (C++ function)</a>
639625
</li>
640626
<li><a href="arch/testing.html#_CPPv4N7buildcc1m28GeneratorExpect_InputRemovedEjP9Generator">buildcc::m::GeneratorExpect_InputRemoved (C++ function)</a>
@@ -891,19 +877,25 @@ <h2>B</h2>
891877
</li>
892878
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc9ToolchainaSERK9Toolchain">buildcc::Toolchain::operator= (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9ToolchainaSERR9Toolchain">[1]</a>
893879
</li>
894-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainE11ToolchainIdNSt11string_viewENSt11string_viewENSt11string_viewENSt11string_viewENSt11string_viewENSt11string_viewEbRK15ToolchainConfig">buildcc::Toolchain::Toolchain (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainE11ToolchainIdNSt11string_viewERK20ToolchainExecutablesbRK15ToolchainConfig">[1]</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainERK9Toolchain">[2]</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainERR9Toolchain">[3]</a>
880+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainE11ToolchainIdNSt11string_viewENSt11string_viewENSt11string_viewENSt11string_viewENSt11string_viewENSt11string_viewERK15ToolchainConfig">buildcc::Toolchain::Toolchain (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainE11ToolchainIdNSt11string_viewERK20ToolchainExecutablesRK15ToolchainConfig">[1]</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainERK9Toolchain">[2]</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc9Toolchain9ToolchainERR9Toolchain">[3]</a>
895881
</li>
896882
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc13Toolchain_gccE">buildcc::Toolchain_gcc (C++ class)</a>
897883
</li>
898-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc13Toolchain_gcc13Toolchain_gccERK13Toolchain_gcc">buildcc::Toolchain_gcc::Toolchain_gcc (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc13Toolchain_gcc13Toolchain_gccEv">[1]</a>
884+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc13Toolchain_gcc13Toolchain_gccERK13Toolchain_gcc">buildcc::Toolchain_gcc::Toolchain_gcc (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc13Toolchain_gcc13Toolchain_gccERKNSt6stringENSt8optionalI20ToolchainExecutablesEENSt8optionalI15ToolchainConfigEE">[1]</a>
885+
</li>
886+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc13Toolchain_gccD0Ev">buildcc::Toolchain_gcc::~Toolchain_gcc (C++ function)</a>
899887
</li>
900888
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15Toolchain_mingwE">buildcc::Toolchain_mingw (C++ class)</a>
901889
</li>
902-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15Toolchain_mingw15Toolchain_mingwERK15Toolchain_mingw">buildcc::Toolchain_mingw::Toolchain_mingw (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc15Toolchain_mingw15Toolchain_mingwEv">[1]</a>
890+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15Toolchain_mingw15Toolchain_mingwERK15Toolchain_mingw">buildcc::Toolchain_mingw::Toolchain_mingw (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc15Toolchain_mingw15Toolchain_mingwERKNSt6stringENSt8optionalI20ToolchainExecutablesEENSt8optionalI15ToolchainConfigEE">[1]</a>
891+
</li>
892+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15Toolchain_mingwD0Ev">buildcc::Toolchain_mingw::~Toolchain_mingw (C++ function)</a>
903893
</li>
904894
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc14Toolchain_msvcE">buildcc::Toolchain_msvc (C++ class)</a>
905895
</li>
906-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc14Toolchain_msvc14Toolchain_msvcERK14Toolchain_msvc">buildcc::Toolchain_msvc::Toolchain_msvc (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc14Toolchain_msvc14Toolchain_msvcEv">[1]</a>
896+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc14Toolchain_msvc14Toolchain_msvcERK14Toolchain_msvc">buildcc::Toolchain_msvc::Toolchain_msvc (C++ function)</a>, <a href="user_api/toolchain.html#_CPPv4N7buildcc14Toolchain_msvc14Toolchain_msvcERKNSt6stringENSt8optionalI20ToolchainExecutablesEENSt8optionalI15ToolchainConfigEE">[1]</a>
897+
</li>
898+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc14Toolchain_msvcD0Ev">buildcc::Toolchain_msvc::~Toolchain_msvc (C++ function)</a>
907899
</li>
908900
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc21ToolchainCompilerInfoE">buildcc::ToolchainCompilerInfo (C++ struct)</a>
909901
</li>
@@ -989,15 +981,13 @@ <h2>B</h2>
989981
</li>
990982
<li><a href="user_api/toolchain.html#_CPPv4I0EN7buildcc15ToolchainVerifyE">buildcc::ToolchainVerify (C++ class)</a>
991983
</li>
992-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15ToolchainVerify19AddVerificationFuncE11ToolchainIdRK25ToolchainVerificationFuncRKNSt8optionalINSt6stringEEE">buildcc::ToolchainVerify::AddVerificationFunc (C++ function)</a>
993-
</li>
994-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15ToolchainVerify15ToolchainVerifyEv">buildcc::ToolchainVerify::ToolchainVerify (C++ function)</a>
984+
<li><a href="user_api/toolchain.html#_CPPv4NK7buildcc15ToolchainVerify20GetToolchainInfoFuncEv">buildcc::ToolchainVerify::GetToolchainInfoFunc (C++ function)</a>
995985
</li>
996-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15ToolchainVerify6VerifyERK21ToolchainVerifyConfig">buildcc::ToolchainVerify::Verify (C++ function)</a>
986+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15ToolchainVerify20SetToolchainInfoFuncERK17ToolchainInfoFunc">buildcc::ToolchainVerify::SetToolchainInfoFunc (C++ function)</a>
997987
</li>
998-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc21ToolchainVerifyConfigE">buildcc::ToolchainVerifyConfig (C++ struct)</a>
988+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15ToolchainVerify15ToolchainVerifyEv">buildcc::ToolchainVerify::ToolchainVerify (C++ function)</a>
999989
</li>
1000-
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc21ToolchainVerifyConfig23verification_identifierE">buildcc::ToolchainVerifyConfig::verification_identifier (C++ member)</a>
990+
<li><a href="user_api/toolchain.html#_CPPv4N7buildcc15ToolchainVerify6VerifyERK19ToolchainFindConfig">buildcc::ToolchainVerify::Verify (C++ function)</a>
1001991
</li>
1002992
</ul></td>
1003993
</tr></table>

‎getting_started/buildexe_package_manager.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,13 +372,13 @@ <h3>Write your fmtlib build files<a class="headerlink" href="#write-your-fmtlib-
372372
<span class="linenos">10</span><span class="w"> </span><span class="c1">// if default_flags == true</span>
373373
<span class="linenos">11</span><span class="w"> </span><span class="k">if</span><span class="w"> </span><span class="p">(</span><span class="n">config</span><span class="p">.</span><span class="n">default_flags</span><span class="p">)</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
374374
<span class="linenos">12</span><span class="w"> </span><span class="k">switch</span><span class="w"> </span><span class="p">(</span><span class="n">target</span><span class="p">.</span><span class="n">GetToolchain</span><span class="p">().</span><span class="n">GetId</span><span class="p">())</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
375-
<span class="linenos">13</span><span class="w"> </span><span class="k">case</span><span class="w"> </span><span class="n">ToolchainId</span><span class="o">::</span><span class="n">Gcc</span><span class="o">:</span><span class="w"></span>
375+
<span class="linenos">13</span><span class="w"> </span><span class="k">case</span><span class="w"> </span><span class="no">ToolchainId</span><span class="o">::</span><span class="no">Gcc</span><span class="p">:</span><span class="w"></span>
376376
<span class="linenos">14</span><span class="w"> </span><span class="n">target</span><span class="p">.</span><span class="n">AddCppCompileFlag</span><span class="p">(</span><span class="s">"-std=c++11"</span><span class="p">);</span><span class="w"></span>
377377
<span class="linenos">15</span><span class="w"> </span><span class="k">break</span><span class="p">;</span><span class="w"></span>
378-
<span class="linenos">16</span><span class="w"> </span><span class="k">case</span><span class="w"> </span><span class="n">ToolchainId</span><span class="o">::</span><span class="n">MinGW</span><span class="o">:</span><span class="w"></span>
378+
<span class="linenos">16</span><span class="w"> </span><span class="k">case</span><span class="w"> </span><span class="no">ToolchainId</span><span class="o">::</span><span class="no">MinGW</span><span class="p">:</span><span class="w"></span>
379379
<span class="linenos">17</span><span class="w"> </span><span class="n">target</span><span class="p">.</span><span class="n">AddCppCompileFlag</span><span class="p">(</span><span class="s">"-std=c++11"</span><span class="p">);</span><span class="w"></span>
380380
<span class="linenos">18</span><span class="w"> </span><span class="k">break</span><span class="p">;</span><span class="w"></span>
381-
<span class="linenos">19</span><span class="w"> </span><span class="k">case</span><span class="w"> </span><span class="n">ToolchainId</span><span class="o">::</span><span class="n">Msvc</span><span class="o">:</span><span class="w"></span>
381+
<span class="linenos">19</span><span class="w"> </span><span class="k">case</span><span class="w"> </span><span class="no">ToolchainId</span><span class="o">::</span><span class="no">Msvc</span><span class="p">:</span><span class="w"></span>
382382
<span class="linenos">20</span><span class="w"> </span><span class="n">target</span><span class="p">.</span><span class="n">AddCppCompileFlag</span><span class="p">(</span><span class="s">"/std:c++11"</span><span class="p">);</span><span class="w"></span>
383383
<span class="linenos">21</span><span class="w"> </span><span class="k">break</span><span class="p">;</span><span class="w"></span>
384384
<span class="linenos">22</span><span class="w"> </span><span class="k">default</span><span class="o">:</span><span class="w"></span>

‎objects.inv

-279 Bytes
Binary file not shown.

‎searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)