mirror of
https://github.com/Ed94/gencpp.git
synced 2024-11-10 02:54:53 -08:00
New build script works for clang and msvc!
Need to update singleheader and test to use it.
This commit is contained in:
parent
8985f0a4d9
commit
11679ba8b4
@ -112,16 +112,11 @@
|
||||
<None Include="test\Readme.md" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="project\auxillary\builder.hpp" />
|
||||
<ClInclude Include="project\auxillary\editor.hpp" />
|
||||
<ClInclude Include="project\auxillary\scanner.hpp" />
|
||||
<ClInclude Include="project\components\ast.hpp" />
|
||||
<ClInclude Include="project\components\ast_types.hpp" />
|
||||
<ClInclude Include="project\components\gen.data_structures.hpp" />
|
||||
<ClInclude Include="project\components\gen.ecode.hpp" />
|
||||
<ClInclude Include="project\components\gen.eoperator.hpp" />
|
||||
<ClInclude Include="project\components\gen.especifier.hpp" />
|
||||
<ClInclude Include="project\components\gen.header_end.hpp" />
|
||||
<ClInclude Include="project\components\gen.header_start.hpp" />
|
||||
<ClInclude Include="project\components\gen.interface.hpp" />
|
||||
<ClInclude Include="project\components\gen.types.hpp" />
|
||||
<ClInclude Include="project\components\header_end.hpp" />
|
||||
<ClInclude Include="project\components\header_start.hpp" />
|
||||
<ClInclude Include="project\components\inlines.hpp" />
|
||||
@ -135,19 +130,6 @@
|
||||
<ClInclude Include="project\dependencies\containers.hpp" />
|
||||
<ClInclude Include="project\dependencies\debug.hpp" />
|
||||
<ClInclude Include="project\dependencies\filesystem.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.basic_types.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.containers.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.debug.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.file_handling.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.hashing.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.header_start.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.macros.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.memory.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.parsing.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.printing.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.string.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.string_ops.hpp" />
|
||||
<ClInclude Include="project\dependencies\gen.timing.hpp" />
|
||||
<ClInclude Include="project\dependencies\hashing.hpp" />
|
||||
<ClInclude Include="project\dependencies\header_start.hpp" />
|
||||
<ClInclude Include="project\dependencies\macros.hpp" />
|
||||
@ -157,19 +139,13 @@
|
||||
<ClInclude Include="project\dependencies\strings.hpp" />
|
||||
<ClInclude Include="project\dependencies\string_ops.hpp" />
|
||||
<ClInclude Include="project\dependencies\timing.hpp" />
|
||||
<ClInclude Include="project\filesystem\gen.builder.hpp" />
|
||||
<ClInclude Include="project\filesystem\gen.editor.hpp" />
|
||||
<ClInclude Include="project\filesystem\gen.scanner.hpp" />
|
||||
<ClInclude Include="project\gen.dep.hpp" />
|
||||
<ClInclude Include="project\gen.hpp" />
|
||||
<ClInclude Include="project\helpers\gen.pop_ignores.inline.hpp" />
|
||||
<ClInclude Include="project\helpers\gen.push_ignores.inline.hpp" />
|
||||
<ClInclude Include="project\helpers\gen.undef.macros.hpp" />
|
||||
<ClInclude Include="project\helpers\helper.hpp" />
|
||||
<ClInclude Include="project\helpers\pop_ignores.inline.hpp" />
|
||||
<ClInclude Include="project\helpers\push_ignores.inline.hpp" />
|
||||
<ClInclude Include="project\helpers\undef.macros.hpp" />
|
||||
<ClInclude Include="singleheader\components\gen.header_start.hpp" />
|
||||
<ClInclude Include="singleheader\components\header_start.hpp" />
|
||||
<ClInclude Include="test\DummyInclude.hpp" />
|
||||
<ClInclude Include="test\Parsed\Buffer.Parsed.hpp" />
|
||||
<ClInclude Include="test\Parsed\HashTable.Parsed.hpp" />
|
||||
@ -186,18 +162,11 @@
|
||||
<ClInclude Include="test\Parsed\Sanity.Parsed.hpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="project\auxillary\builder.cpp" />
|
||||
<ClCompile Include="project\auxillary\scanner.cpp" />
|
||||
<ClCompile Include="project\bootstrap.cpp" />
|
||||
<ClCompile Include="project\components\ast.cpp" />
|
||||
<ClCompile Include="project\components\ast_case_macros.cpp" />
|
||||
<ClCompile Include="project\components\gen.ast.cpp" />
|
||||
<ClCompile Include="project\components\gen.ast_case_macros.cpp" />
|
||||
<ClCompile Include="project\components\gen.data.cpp" />
|
||||
<ClCompile Include="project\components\gen.etoktype.cpp" />
|
||||
<ClCompile Include="project\components\gen.impl_start.cpp" />
|
||||
<ClCompile Include="project\components\gen.interface.cpp" />
|
||||
<ClCompile Include="project\components\gen.interface.parsing.cpp" />
|
||||
<ClCompile Include="project\components\gen.interface.upfront.cpp" />
|
||||
<ClCompile Include="project\components\gen.untyped.cpp" />
|
||||
<ClCompile Include="project\components\interface.cpp" />
|
||||
<ClCompile Include="project\components\interface.parsing.cpp" />
|
||||
<ClCompile Include="project\components\interface.upfront.cpp" />
|
||||
@ -207,16 +176,6 @@
|
||||
<ClCompile Include="project\components\untyped.cpp" />
|
||||
<ClCompile Include="project\dependencies\debug.cpp" />
|
||||
<ClCompile Include="project\dependencies\filesystem.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.debug.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.file_handling.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.hashing.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.impl_start.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.memory.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.parsing.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.printing.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.string.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.string_ops.cpp" />
|
||||
<ClCompile Include="project\dependencies\gen.timing.cpp" />
|
||||
<ClCompile Include="project\dependencies\hashing.cpp" />
|
||||
<ClCompile Include="project\dependencies\memory.cpp" />
|
||||
<ClCompile Include="project\dependencies\parsing.cpp" />
|
||||
@ -225,10 +184,9 @@
|
||||
<ClCompile Include="project\dependencies\strings.cpp" />
|
||||
<ClCompile Include="project\dependencies\string_ops.cpp" />
|
||||
<ClCompile Include="project\dependencies\timing.cpp" />
|
||||
<ClCompile Include="project\gen.bootstrap.cpp" />
|
||||
<ClCompile Include="project\gen.cpp" />
|
||||
<ClCompile Include="project\gen.dep.cpp" />
|
||||
<ClCompile Include="singleheader\gen.singleheader.cpp" />
|
||||
<ClCompile Include="singleheader\singleheader.cpp" />
|
||||
<ClCompile Include="test\parsing.cpp" />
|
||||
<ClCompile Include="test\sanity.cpp" />
|
||||
<ClCompile Include="test\SOA.cpp" />
|
||||
@ -242,21 +200,19 @@
|
||||
<Natvis Include="scripts\gencpp.natvis" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="project\components\AttributeTokens.csv" />
|
||||
<Content Include="project\components\ECode.csv" />
|
||||
<Content Include="project\components\EOperator.csv" />
|
||||
<Content Include="project\components\ESpecifier.csv" />
|
||||
<Content Include="project\components\ETokType.csv" />
|
||||
<Content Include="project\meson.build" />
|
||||
<Content Include="project\enums\AttributeTokens.csv" />
|
||||
<Content Include="project\enums\ECode.csv" />
|
||||
<Content Include="project\enums\EOperator.csv" />
|
||||
<Content Include="project\enums\ESpecifier.csv" />
|
||||
<Content Include="project\enums\ETokType.csv" />
|
||||
<Content Include="scripts\.clang-format" />
|
||||
<Content Include="scripts\bootstrap.ci.ps1" />
|
||||
<Content Include="scripts\bootstrap.ps1" />
|
||||
<Content Include="scripts\msvc\build_msvc.ps1" />
|
||||
<Content Include="scripts\msvc\devshell.ps1" />
|
||||
<Content Include="scripts\helpers\devshell.ps1" />
|
||||
<Content Include="scripts\helpers\target_arch.psm1" />
|
||||
<Content Include="scripts\refactor.ps1" />
|
||||
<Content Include="scripts\singleheader.ci.ps1" />
|
||||
<Content Include="scripts\singleheader.ps1" />
|
||||
<Content Include="singleheader\meson.build" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@ -214,7 +214,7 @@ struct AST
|
||||
- sizeof(ModuleFlag)
|
||||
- sizeof(u32)
|
||||
)
|
||||
/ sizeof(SpecifierT) - 1; // -1 for 4 extra bytes
|
||||
/ sizeof(SpecifierT); // -1 for 4 extra bytes
|
||||
|
||||
union {
|
||||
struct
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
# That or just rewrite it in an sh script and call it a day.
|
||||
|
||||
Import-Module ./helpers/target_arch.psm1
|
||||
$devshell = Join-Path $PSScriptRoot 'helpers/devshell.ps1'
|
||||
|
||||
cls
|
||||
|
||||
@ -32,7 +33,9 @@ if ( $args ) { $args | ForEach-Object {
|
||||
write-host "Building gencpp with $compiler"
|
||||
|
||||
if ($IsWindows) {
|
||||
Invoke-Expression "& $(join-path $PSScriptRoot 'helpers/devshell.ps1')"
|
||||
# This library was really designed to only run on 64-bit systems.
|
||||
# (Its a development tool after all)
|
||||
& $devshell -arch amd64
|
||||
}
|
||||
|
||||
$path_root = git rev-parse --show-toplevel
|
||||
@ -62,8 +65,7 @@ function run-compiler
|
||||
}
|
||||
|
||||
$time_taken = Measure-Command {
|
||||
& $compiler $compiler_args
|
||||
| ForEach-Object {
|
||||
& $compiler $compiler_args 2>&1 | ForEach-Object {
|
||||
$color = 'White'
|
||||
switch ($_){
|
||||
{ $_ -match "error" } { $color = 'Red' ; break }
|
||||
@ -92,8 +94,7 @@ function run-linker
|
||||
}
|
||||
|
||||
$time_taken = Measure-Command {
|
||||
& $linker $linker_args
|
||||
| ForEach-Object {
|
||||
& $linker $linker_args 2>&1 | ForEach-Object {
|
||||
$color = 'White'
|
||||
switch ($_){
|
||||
{ $_ -match "error" } { $color = 'Red' ; break }
|
||||
@ -113,9 +114,10 @@ function run-linker
|
||||
|
||||
if ( $compiler -match "clang" )
|
||||
{
|
||||
$target_arch = Get-TargetArchClang
|
||||
|
||||
# https://clang.llvm.org/docs/ClangCommandLineReference.html
|
||||
$flag_compile = '-c'
|
||||
$flag_color_diagnostics = '-fcolor-diagnostics'
|
||||
$flag_no_color_diagnostics = '-fno-color-diagnostics'
|
||||
$flag_debug = '-g'
|
||||
$flag_debug_codeview = '-gcodeview'
|
||||
$flag_define = '-D'
|
||||
@ -128,60 +130,92 @@ if ( $compiler -match "clang" )
|
||||
$flag_link_win_machine_64 = '/MACHINE:X64'
|
||||
$flag_link_win_debug = '/DEBUG'
|
||||
$flag_link_win_pdb = '/PDB:'
|
||||
$flag_link_win_path_output = '/OUT:'
|
||||
$flag_no_optimization = '-O0'
|
||||
$flag_path_output = '-o'
|
||||
$flag_preprocess_non_intergrated = '-no-integrated-cpp'
|
||||
$flag_profiling_debug = '-fdebug-info-for-profiling'
|
||||
$flag_target_arch = '-target'
|
||||
$flag_x_linker = '-Xlinker'
|
||||
$flag_wall = '-Wall'
|
||||
$flag_warning = '-W'
|
||||
$flag_warning_as_error = '-Werror'
|
||||
$flag_win_nologo = '/nologo'
|
||||
|
||||
# $library_paths = @(
|
||||
# 'C:\Windows\System32'
|
||||
$ignore_warning_ms_include = 'no-microsoft-include'
|
||||
|
||||
# )
|
||||
$target_arch = Get-TargetArchClang
|
||||
|
||||
$env:CLANG_FORCE_COLOR_DIAGNOSTICS = 1
|
||||
|
||||
if ( $bootstrap )
|
||||
{
|
||||
$path_build = join-path $path_project build
|
||||
$path_gen = join-path $path_project gen
|
||||
|
||||
if ( -not(Test-Path($path_build) )) {
|
||||
New-Item -ItemType Directory -Path $path_build
|
||||
}
|
||||
if ( -not(Test-Path($path_gen) )) {
|
||||
New-Item -ItemType Directory -Path $path_gen
|
||||
}
|
||||
|
||||
$include = $path_project
|
||||
$unit = join-path $path_project "bootstrap.cpp"
|
||||
$object = join-path $path_build "bootstrap.o"
|
||||
$object = join-path $path_build "bootstrap.obj"
|
||||
$executable = join-path $path_build "bootstrap.exe"
|
||||
|
||||
$warning_ignores = @(
|
||||
$ignore_warning_ms_include
|
||||
)
|
||||
|
||||
$compiler_args = @(
|
||||
$flag_no_color_diagnostics,
|
||||
$flag_target_arch, $target_arch,
|
||||
$flag_wall,
|
||||
$flag_preprocess_non_intergrated,
|
||||
$( $flag_define + 'GEN_TIME' ),
|
||||
$flag_path_output, $executable,
|
||||
$( $flag_include + $include )
|
||||
( $flag_define + 'GEN_TIME' ),
|
||||
( $flag_path_output + $object ),
|
||||
( $flag_include + $include )
|
||||
)
|
||||
|
||||
$warning_ignores | ForEach-Object {
|
||||
$compiler_args += $flag_warning + $_
|
||||
}
|
||||
|
||||
if ( $release -eq $false ) {
|
||||
$compiler_args += $( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += ( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += $flag_debug, $flag_debug_codeview, $flag_profiling_debug
|
||||
}
|
||||
|
||||
$compiler_args += $flag_compile, $unit
|
||||
run-compiler clang++ $executable $path_build $path_gen $compiler_args
|
||||
run-compiler clang++ $unit $compiler_args
|
||||
|
||||
$linker_args = @(
|
||||
$flag_x_linker,
|
||||
$( $flag_linker + $flag_win_subsystem_console ),
|
||||
$( $flag_linker + $flag_machine_64 )
|
||||
$flag_link_win_subsystem_console,
|
||||
$flag_link_win_machine_64,
|
||||
$( $flag_link_win_path_output + $executable )
|
||||
)
|
||||
if ( $release -eq $false ) {
|
||||
$linker_args += $flag_link_win_debug
|
||||
$linker_args += $flag_link_win_pdb + $pdb
|
||||
}
|
||||
else {
|
||||
}
|
||||
|
||||
# https://learn.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-170
|
||||
$libraries = @(
|
||||
'Kernel32', # For Windows API
|
||||
'Kernel32' # For Windows API
|
||||
# 'msvcrt', # For the C Runtime (Dynamically Linked)
|
||||
'libucrt',
|
||||
# 'libucrt',
|
||||
'libcmt' # For the C Runtime (Static Linkage)
|
||||
)
|
||||
|
||||
# $compiler_args += $linker_args
|
||||
# $compiler_args += $libraries | ForEach-Object { $flag_library + $_ }
|
||||
$libraries | ForEach-Object {
|
||||
$linker_args += $_ + '.lib'
|
||||
}
|
||||
|
||||
$linker_args += $object
|
||||
run-linker lld-link $executable $linker_args
|
||||
|
||||
Push-Location $path_project
|
||||
if ( Test-Path( $executable ) ) {
|
||||
@ -208,12 +242,12 @@ if ( $compiler -match "clang" )
|
||||
$compiler_args = @(
|
||||
$flag_target_arch, $target_arch,
|
||||
$flag_preprocess_non_intergrated,
|
||||
$( $flag_define + 'GEN_TIME' ),
|
||||
( $flag_define + 'GEN_TIME' ),
|
||||
$flag_path_output, $executable,
|
||||
$( $flag_include + $include )
|
||||
( $flag_include + $include )
|
||||
)
|
||||
if ( $release -eq $false ) {
|
||||
$compiler_args += $( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += ( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += $flag_debug, $flag_debug_codeview, $flag_profiling_debug
|
||||
}
|
||||
|
||||
@ -241,6 +275,7 @@ if ( $compiler -match "clang" )
|
||||
|
||||
if ( $compiler -match "msvc" )
|
||||
{
|
||||
# https://learn.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-by-category?view=msvc-170
|
||||
$flag_compile = '/c'
|
||||
$flag_debug = '/Zi'
|
||||
$flag_define = '/D'
|
||||
@ -250,6 +285,8 @@ if ( $compiler -match "msvc" )
|
||||
$flag_dll = '/LD'
|
||||
$flag_dll_debug = '/LDd'
|
||||
$flag_linker = '/link'
|
||||
$flag_link_debug = '/DEBUG'
|
||||
$flag_link_pdb = '/PDB:'
|
||||
$flag_link_machine_32 = '/MACHINE:X86'
|
||||
$flag_link_machine_64 = '/MACHINE:X64'
|
||||
$flag_link_path_output = '/OUT:'
|
||||
@ -266,6 +303,7 @@ if ( $compiler -match "msvc" )
|
||||
$flag_preprocess_conform = '/Zc:preprocessor'
|
||||
|
||||
[array] $compiler_args = $null
|
||||
[array] $linker_args = $null
|
||||
|
||||
if ( $bootstrap )
|
||||
{
|
||||
@ -283,21 +321,22 @@ if ( $compiler -match "msvc" )
|
||||
$unit = join-path $path_project "bootstrap.cpp"
|
||||
$object = join-path $path_build "bootstrap.obj"
|
||||
$executable = join-path $path_build "bootstrap.exe"
|
||||
$pdb = join-path $path_build "bootstrap.pdb"
|
||||
|
||||
$compiler_args = @(
|
||||
$flag_nologo,
|
||||
$flag_debug,
|
||||
$flag_preprocess_conform,
|
||||
$( $flag_define + 'GEN_TIME' ),
|
||||
$flag_define + 'GEN_TIME',
|
||||
$flag_full_src_path,
|
||||
$( $flag_path_interm + $path_build + '\' ),
|
||||
$( $flag_path_output + $path_build + '\' ),
|
||||
$( $flag_include + $include )
|
||||
( $flag_path_interm + $path_build + '\' ),
|
||||
( $flag_path_output + $path_build + '\' ),
|
||||
( $flag_include + $include )
|
||||
)
|
||||
|
||||
if ( $release -eq $false ) {
|
||||
$compiler_args += $( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += $( $flag_path_debug + $path_build + '\' )
|
||||
$compiler_args += ( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += $flag_debug
|
||||
$compiler_args += ( $flag_path_debug + $path_build + '\' )
|
||||
$compiler_args += $flag_link_rt_static_debug
|
||||
}
|
||||
else {
|
||||
@ -311,13 +350,16 @@ if ( $compiler -match "msvc" )
|
||||
$flag_nologo,
|
||||
$flag_link_machine_64,
|
||||
$flag_link_subsystem_console,
|
||||
$( $flag_link_path_output + $executable ),
|
||||
$object
|
||||
( $flag_link_path_output + $executable )
|
||||
)
|
||||
if ( $release -eq $false ) {
|
||||
$linker_args += $flag_link_debug
|
||||
$linker_args += $flag_link_pdb + $pdb
|
||||
}
|
||||
else {
|
||||
}
|
||||
|
||||
$linker_args += $object
|
||||
run-linker link $executable $linker_args
|
||||
|
||||
Push-Location $path_project
|
||||
@ -353,16 +395,16 @@ if ( $compiler -match "msvc" )
|
||||
$flag_nologo,
|
||||
$flag_debug,
|
||||
$flag_preprocess_conform,
|
||||
$( $flag_define + 'GEN_TIME' ),
|
||||
( $flag_define + 'GEN_TIME' ),
|
||||
$flag_full_src_path,
|
||||
$( $flag_path_interm + $path_build + '\' ),
|
||||
$( $flag_path_output + $path_build + '\' ),
|
||||
$( $flag_include + $include )
|
||||
( $flag_path_interm + $path_build + '\' ),
|
||||
( $flag_path_output + $path_build + '\' ),
|
||||
( $flag_include + $include )
|
||||
)
|
||||
|
||||
if ( $release -eq $false ) {
|
||||
$compiler_args += $( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += $( $flag_path_debug + $path_build + '\' )
|
||||
$compiler_args += ( $flag_define + 'Build_Debug' )
|
||||
$compiler_args += ( $flag_path_debug + $path_build + '\' )
|
||||
}
|
||||
|
||||
$compiler_args += $unit
|
||||
|
||||
@ -1,8 +1,3 @@
|
||||
param (
|
||||
[ValidateSet("amd64", "x86", "arm", "arm64")]
|
||||
[string]$arch = "amd64"
|
||||
)
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
# Use vswhere to find the latest Visual Studio installation
|
||||
@ -22,10 +17,7 @@ if ( -not (Test-Path $vs_devshell) ) {
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Set the target architecture based on the parameter
|
||||
# $env:VSCMD_ARG_TGT_ARCH=$arch
|
||||
|
||||
# Launch the Visual Studio Developer Shell
|
||||
Push-Location
|
||||
& $vs_devshell -Arch amd64
|
||||
& $vs_devshell @args
|
||||
Pop-Location
|
||||
Loading…
Reference in New Issue
Block a user