Skip to content

move res/ subdirectory to src/dmd/res/ #11269

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
dlang-bot merged 1 commit into from
Jun 15, 2020
Merged

move res/ subdirectory to src/dmd/res/ #11269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ test_dub_package() {
done
popd
# 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
deactivate
}
Expand Down
2 changes: 1 addition & 1 deletion dub.sdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ subPackage {
name "frontend"
targetType "library"
sourcePaths "src/dmd"
stringImportPaths "res"
stringImportPaths "src/dmd/res"
Copy link
Contributor

@wilzbach wilzbach Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to merge dlang.org PR without duplication, you need to temporarily add both directories here as dlang.org uses dmd as a library:

stringImportPaths "res"
stringImportPaths "src/dmd/res"


versions \
"NoBackend" \
Expand Down
2 changes: 1 addition & 1 deletion src/build.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ void parseEnvironment()
env.getDefault("GIT_HOME", "https://github.com/dlang");
env.getDefault("SYSCONFDIR", "/etc");
env.getDefault("TMP", tempDir);
env.getDefault("RES", dmdRepo.buildPath("res"));
env.getDefault("RES", dmdRepo.buildPath("src/dmd/res"));

version (Windows)
enum installPref = "";
Expand Down
0 res/default_ddoc_theme.ddoc → src/dmd/res/default_ddoc_theme.ddoc
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/vcbuild/dmd.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</Link>
<DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
<StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
Copy link
Contributor

@wilzbach wilzbach Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<StringImportPaths>..\dmd\res;$(OutDir)</StringImportPaths>

(similar for the changes below)

This is the Visual Studio project file, so I am pretty sure the Windows slashes should be kept.

<CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary>
<CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths>
Expand All @@ -146,7 +146,7 @@
</Link>
<DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
<StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CRuntimeLibrary>MultiThreadedDebug</CRuntimeLibrary>
<CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths>
Expand Down Expand Up @@ -175,7 +175,7 @@
</Link>
<DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
<StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths>
<Optimizer>true</Optimizer>
Expand Down Expand Up @@ -204,7 +204,7 @@
</Link>
<DCompile>
<VersionIdentifiers>MARS</VersionIdentifiers>
<StringImportPaths>..\..\res;$(OutDir)</StringImportPaths>
<StringImportPaths>../dmd/res;$(OutDir)</StringImportPaths>
<CompilationModel>Package</CompilationModel>
<ImportPaths>..</ImportPaths>
<Optimizer>true</Optimizer>
Expand Down
2 changes: 1 addition & 1 deletion test/tools/unit_test_runner.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ void writeCmdfile(string path, string runnerPath, string outputPath,
"-version=MARS",
"-unittest",
"-J" ~ buildOutputPath,
"-J" ~ projectRootDir.buildPath("res"),
"-J" ~ projectRootDir.buildPath("src/dmd/res"),
"-I" ~ projectRootDir.buildPath("src"),
"-I" ~ unitTestDir,
"-i",
Expand Down