Skip to content

Commit

Permalink
Refine 3rdparty/ layout
Browse files Browse the repository at this point in the history
  • Loading branch information
gavv committed Dec 1, 2022
1 parent 1502084 commit 5388bd0
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "3rdparty/distfiles"]
path = 3rdparty/distfiles
[submodule "3rdparty/_distfiles"]
path = 3rdparty/_distfiles
url = https://github.com/roc-streaming/distfiles.git
2 changes: 1 addition & 1 deletion 3rdparty/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if 'all' in download_dependencies:
system_dependencies = external_dependencies - download_dependencies

if 'hedley' in vendored_dependencies:
env.Append(CPPPATH=['#3rdparty/vendor/hedley'])
env.Append(CPPPATH=['#3rdparty/hedley'])

if 'libuv' in system_dependencies:
conf = Configure(env, custom_tests=env.CustomTests)
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/_distfiles
Submodule _distfiles added at 34cc7c
1 change: 0 additions & 1 deletion 3rdparty/distfiles
Submodule distfiles deleted from 84d64c
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/docs/authors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ temp="$(mktemp)"
cat "$file" > "$temp"

add_contributors "${temp}" "$(basename "$(pwd)")"
add_contributors "${temp}" "$(basename "$(pwd)")/3rdparty/distfiles"
add_contributors "${temp}" "$(basename "$(pwd)")/3rdparty/_distfiles"
add_contributors "${temp}" "roc-go"
add_contributors "${temp}" "roc-java"
add_contributors "${temp}" "rt-tests"
Expand Down
2 changes: 1 addition & 1 deletion scripts/scons/thirdparty.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def ThirdParty(
os.chdir(project_root)

if env.Execute(
'%s scripts/build/3rdparty.py %s 3rdparty/distfiles %s %s %s %s %s' % (
'%s scripts/build/3rdparty.py %s 3rdparty/_distfiles %s %s %s %s %s' % (
quote(env.PythonExecutable()),
quote(os.path.relpath(build_root, project_root)),
quote(toolchain),
Expand Down

0 comments on commit 5388bd0

Please sign in to comment.