mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 21:51:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

move res/ subdirectory to src/dmd/res/

Browse source
This commit is contained in:
Walter Bright 2020-06-13 22:00:10 -07:00 • committed by Sebastian Wilzbach
parent 6ee04563a3
commit e008ca1df7
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci.sh
View file

@ -115,7 +115,7 @@ test_dub_package() {
done done
popd popd
# Test rdmd build # Test rdmd build
"${build_path}/dmd" -version=NoBackend -version=GC -version=NoMain -Jgenerated/dub -Jres -Isrc -i -run test/dub_package/frontend.d "${build_path}/dmd" -version=NoBackend -version=GC -version=NoMain -Jgenerated/dub -Jsrc/dmd/res -Isrc -i -run test/dub_package/frontend.d
fi fi
deactivate deactivate
} }

2
dub.sdl
View file

@ -71,7 +71,7 @@ subPackage {
name "frontend" name "frontend"
targetType "library" targetType "library"
sourcePaths "src/dmd" sourcePaths "src/dmd"
stringImportPaths "res" stringImportPaths "src/dmd/res"
versions \ versions \
"NoBackend" \ "NoBackend" \

2
src/build.d
View file

@ -916,7 +916,7 @@ void parseEnvironment()
env.getDefault("GIT_HOME", "https://github.com/dlang"); env.getDefault("GIT_HOME", "https://github.com/dlang");
env.getDefault("SYSCONFDIR", "/etc"); env.getDefault("SYSCONFDIR", "/etc");
env.getDefault("TMP", tempDir); env.getDefault("TMP", tempDir);
env.getDefault("RES", dmdRepo.buildPath("res")); env.getDefault("RES", dmdRepo.buildPath("src/dmd/res"));
version (Windows) version (Windows)
enum installPref = ""; enum installPref = "";

0
res/default_ddoc_theme.ddoc → src/dmd/res/default_ddoc_theme.ddoc
View file

8
src/vcbuild/dmd.vcxproj
View file

@ -122,7 +122,7 @@
</Link> </Link>
<DCompile> <DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers> <VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths> <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary> <CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary>
<CompilationModel>Package</CompilationModel> <CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths> <ImportPaths>..</ImportPaths>
@ -146,7 +146,7 @@
</Link> </Link>
<DCompile> <DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers> <VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths> <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary> <CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary>
<CompilationModel>Package</CompilationModel> <CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths> <ImportPaths>..</ImportPaths>
@ -175,7 +175,7 @@
</Link> </Link>
<DCompile> <DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers> <VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths> <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CompilationModel>Package</CompilationModel> <CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths> <ImportPaths>..</ImportPaths>
<Optimizer>true</Optimizer> <Optimizer>true</Optimizer>
@ -204,7 +204,7 @@
</Link> </Link>
<DCompile> <DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers> <VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths> <StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CompilationModel>Package</CompilationModel> <CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths> <ImportPaths>..</ImportPaths>
<Optimizer>true</Optimizer> <Optimizer>true</Optimizer>

2
test/tools/unit_test_runner.d
View file

@ -250,7 +250,7 @@ void writeCmdfile(string path, string runnerPath, string outputPath,
"-version=MARS", "-version=MARS",
"-unittest", "-unittest",
"-J" ~ buildOutputPath, "-J" ~ buildOutputPath,
"-J" ~ projectRootDir.buildPath("res"), "-J" ~ projectRootDir.buildPath("src/dmd/res"),
"-I" ~ projectRootDir.buildPath("src"), "-I" ~ projectRootDir.buildPath("src"),
"-I" ~ unitTestDir, "-I" ~ unitTestDir,
"-i", "-i",