Fix build script paths to work with new merged repository structure

Co-Authored-By: Geod24 <pro.mathias.lang@gmail.com>
Co-Authored-By: Martin Kinkelin <noone@nowhere.com>
Co-Authored-By: Vladimir Panteleev <git@cy.md>
This commit is contained in:
Iain Buclaw 2022-07-03 17:28:13 +02:00
parent 69ab16a7e8
commit 09d04945bd
56 changed files with 499 additions and 209 deletions

52
dub.sdl
View file

@ -10,25 +10,27 @@ dependency ":frontend" version="*"
subPackage {
name "root"
targetType "library"
sourcePaths "src/dmd/common" "src/dmd/root"
importPaths "compiler/src"
sourcePaths "compiler/src/dmd/common" "compiler/src/dmd/root"
}
subPackage {
name "lexer"
targetType "library"
importPaths "compiler/src"
sourcePaths
sourceFiles \
"src/dmd/console.d" \
"src/dmd/entity.d" \
"src/dmd/errors.d" \
"src/dmd/file_manager.d" \
"src/dmd/globals.d" \
"src/dmd/id.d" \
"src/dmd/identifier.d" \
"src/dmd/lexer.d" \
"src/dmd/tokens.d" \
"src/dmd/utils.d"
"compiler/src/dmd/console.d" \
"compiler/src/dmd/entity.d" \
"compiler/src/dmd/errors.d" \
"compiler/src/dmd/file_manager.d" \
"compiler/src/dmd/globals.d" \
"compiler/src/dmd/id.d" \
"compiler/src/dmd/identifier.d" \
"compiler/src/dmd/lexer.d" \
"compiler/src/dmd/tokens.d" \
"compiler/src/dmd/utils.d"
versions \
"CallbackAPI" \
@ -47,7 +49,7 @@ subPackage {
preGenerateCommands `"%DUB_EXE%" --arch=%DUB_ARCH% --compiler="%DC%" --single "%DUB_PACKAGE_DIR%config.d" -- "%DUB_PACKAGE_DIR%generated/dub" "%DUB_PACKAGE_DIR%VERSION"` platform="windows"
stringImportPaths \
"src/dmd/res" \
"compiler/src/dmd/res" \
"generated/dub"
dependency "dmd:root" version="*"
@ -56,14 +58,15 @@ subPackage {
subPackage {
name "parser"
targetType "library"
importPaths "compiler/src"
sourcePaths
sourceFiles \
"src/dmd/astbase.d" \
"src/dmd/parse.d" \
"src/dmd/transitivevisitor.d" \
"src/dmd/permissivevisitor.d" \
"src/dmd/strictvisitor.d"
"compiler/src/dmd/astbase.d" \
"compiler/src/dmd/parse.d" \
"compiler/src/dmd/transitivevisitor.d" \
"compiler/src/dmd/permissivevisitor.d" \
"compiler/src/dmd/strictvisitor.d"
versions "CallbackAPI"
@ -73,8 +76,9 @@ subPackage {
subPackage {
name "frontend"
targetType "library"
sourcePaths "src/dmd"
stringImportPaths "src/dmd/res"
importPaths "compiler/src"
sourcePaths "compiler/src/dmd"
stringImportPaths "compiler/src/dmd/res"
versions \
"NoBackend" \
@ -83,10 +87,10 @@ subPackage {
"MARS" \
"CallbackAPI"
excludedSourceFiles "src/dmd/backend/*"
excludedSourceFiles "src/dmd/root/*"
excludedSourceFiles "src/dmd/common/*"
excludedSourceFiles "src/dmd/{\
excludedSourceFiles "compiler/src/dmd/backend/*"
excludedSourceFiles "compiler/src/dmd/root/*"
excludedSourceFiles "compiler/src/dmd/common/*"
excludedSourceFiles "compiler/src/dmd/{\
astbase,\
console,\
entity,\
@ -104,7 +108,7 @@ subPackage {
utf,\
utils\
}.d"
excludedSourceFiles "src/dmd/{\
excludedSourceFiles "compiler/src/dmd/{\
dmsc,\
e2ir,\
eh,\