Skip to content

Commit 05bf489

Browse files
PeanutbutterWarriorPeanutbutterWarrior
committed
Update overriding SConscript files
1 parent 7ac66c7 commit 05bf489

File tree

9 files changed

+40
-46
lines changed

9 files changed

+40
-46
lines changed

‎contents/approximate_counting/code/c/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.C(f'#/build/c/{dirname}', Glob('*.c'), LIBS='m')
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.C(build_target, str(file_info.path), LIBS='m')
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/cooley_tukey/code/asm-x64/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.X64(f'#/build/asm-x64/{dirname}', Glob('*.s'), LIBS=['m'], LINKFLAGS='-no-pie')
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.X64(build_target, str(file_info.path), LIBS='m', LINKFLAGS='-no-pie')
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/cooley_tukey/code/c/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.C(f'#/build/c/{dirname}', Glob('*.c'), LIBS=['m', 'fftw3'])
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.C(build_target, str(file_info.path), LIBS=['m', 'fftw3'])
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/euclidean_algorithm/code/fortran/SConscript

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

‎contents/forward_euler_method/code/asm-x64/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.X64(f'#/build/asm-x64/{dirname}', Glob('*.s'), LIBS='m', LINKFLAGS='-no-pie')
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.X64(build_target, str(file_info.path), LIBS='m', LINKFLAGS='-no-pie')
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/forward_euler_method/code/c/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.C(f'#/build/c/{dirname}', Glob('*.c'), LIBS='m')
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.C(build_target, str(file_info.path), LIBS='m')
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/graham_scan/code/c/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.C(f'#/build/c/{dirname}', Glob('*.c'), LIBS='m')
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.C(build_target, str(file_info.path))
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/split-operator_method/code/c/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.C(f'#/build/c/{dirname}', Glob('*.c'), LIBS=['m', 'fftw3'])
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.C(build_target, str(file_info.path), LIBS=['m', 'fftw3'])
6+
env.Alias(str(file_info.chapter), build_result)

‎contents/split-operator_method/code/cpp/SConscript

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Import('*')
2-
from pathlib import Path
1+
Import('files_to_compile env')
32

4-
dirname = Path.cwd().parents[1].stem
5-
6-
env.CPlusPlus(f'#/build/cpp/{dirname}', Glob('*.cpp'), LIBS=['m', 'fftw3'])
3+
for file_info in files_to_compile:
4+
build_target = f'#/build/{file_info.language}/{file_info.chapter}/{file_info.path.stem}'
5+
build_result = env.CPlusPlus(build_target, str(file_info.path), LIBS=['m', 'fftw3'])
6+
env.Alias(str(file_info.chapter), build_result)

0 commit comments

Comments
 (0)