Skip to content

Change SCons output structure #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Amaras merged 11 commits into from
Dec 5, 2021
Merged

Change SCons output structure #963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
92fdb5e
Add language aliases
PeanutbutterWarrior Dec 1, 2021
9993efe
Refactor SConsctruct
PeanutbutterWarrior Dec 1, 2021
b72b38d
Search for files recursively
PeanutbutterWarrior Dec 1, 2021
a5526c3
Handle nested chapter folders
PeanutbutterWarrior Dec 1, 2021
1a59003
Update C to use new build stuff
PeanutbutterWarrior Dec 1, 2021
60c44ac
Update all languages to use new build stuff
PeanutbutterWarrior Dec 1, 2021
7ac66c7
Fix aliasing for chapter names
PeanutbutterWarrior Dec 1, 2021
05bf489
Update overriding SConscript files
PeanutbutterWarrior Dec 1, 2021
8f87c7a
Merge branch 'main' into change-scons-output-structure
ntindle Dec 2, 2021
28cb6f9
Fixed build failure on Graham scan
Amaras Dec 2, 2021
17754ad
Merge branch 'main' into change-scons-output-structure
ntindle Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix aliasing for chapter names
  • Loading branch information
@PeanutbutterWarrior
PeanutbutterWarrior committed Dec 1, 2021
commit 7ac66c72e73dfcf20e7fc74191f01d328f014eab
3 changes: 2 additions & 1 deletion sconscripts/asm-x64_SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ Import('files_to_compile env')

for file_info in files_to_compile:
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
env.X64(build_target, str(file_info.path), LINKFLAGS='-no-pie')
build_result = env.X64(build_target, str(file_info.path), LINKFLAGS='-no-pie')
env.Alias(str(file_info.chapter), build_result)
7 changes: 2 additions & 5 deletions sconscripts/c_SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@ Import('files_to_compile env')

for file_info in files_to_compile:
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'

env.C(build_target, str(file_info.path))
# Gives error e.g. when running 'scons flood_fill'
# scons: *** [flood_fill] Source `build\c\flood_fill\flood_fill' not found, needed by target `flood_fill'
env.Alias(str(file_info.chapter), build_target)
build_result = env.C(build_target, str(file_info.path))
env.Alias(str(file_info.chapter), build_result)
3 changes: 2 additions & 1 deletion sconscripts/cpp_SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ Import('files_to_compile env')

for file_info in files_to_compile:
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
env.CPlusPlus(build_target, str(file_info.path))
build_result = env.CPlusPlus(build_target, str(file_info.path))
env.Alias(str(file_info.chapter), build_result)
3 changes: 2 additions & 1 deletion sconscripts/fortran_SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ Import('files_to_compile env')

for file_info in files_to_compile:
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
env.Fortran(build_target, str(file_info.path))
build_result = env.Fortran(build_target, str(file_info.path))
env.Alias(str(file_info.chapter), build_result)
3 changes: 2 additions & 1 deletion sconscripts/go_SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ Import('files_to_compile env')

for file_info in files_to_compile:
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
env.Go(build_target, str(file_info.path))
build_result = env.Go(build_target, str(file_info.path))
env.Alias(str(file_info.chapter), build_result)
12 changes: 7 additions & 5 deletions sconscripts/rust_SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ Import('files_to_compile env')
for file_info in files_to_compile:
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
if (file_info.path.parent / 'Cargo.toml').exists():
env.cargo(target=build_target,
source=str(file_info.path),
MANIFEST=str(file_info.path.parent / 'Cargo.toml'),
SOURCE_DIR=str(file_info.path.parent))
build_result = env.cargo(target=build_target,
source=str(file_info.path),
MANIFEST=str(file_info.path.parent / 'Cargo.toml'),
SOURCE_DIR=str(file_info.path.parent))
env.Clean('rust', str(file_info.path.parent / 'target'))
else:
env.rustc(build_target, str(file_info.path))
build_result = env.rustc(build_target, str(file_info.path))
env.Clean('rust', f'{build_target}.pdb')

env.Alias(str(file_info.chapter), build_result)