Skip to content

Comments

Fix 21569: Set RES path relative to build.d's directory#12143

Merged
dlang-bot merged 1 commit intodlang:stablefrom
MoonlightSentinel:buildd-res-path
Jan 21, 2021
Merged

Fix 21569: Set RES path relative to build.d's directory#12143
dlang-bot merged 1 commit intodlang:stablefrom
MoonlightSentinel:buildd-res-path

Conversation

@MoonlightSentinel
Copy link
Contributor

@MoonlightSentinel MoonlightSentinel commented Jan 21, 2021

This ensures the resulting path is correct even for the sources distributed alongside the official releases.

The issues is a regression introduced by #11269.

This ensures the resulting path is correct even for the sources
distributed alongside the official releases.

This is a regression introduced by dlang#11269.
@dlang-bot
Copy link
Contributor

Thanks for your pull request and interest in making D better, @MoonlightSentinel! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please verify that your PR follows this checklist:

  • My PR is fully covered with tests (you can see the coverage diff by visiting the details link of the codecov check)
  • My PR is as minimal as possible (smaller, focused PRs are easier to review than big ones)
  • I have provided a detailed rationale explaining my changes
  • New or modified functions have Ddoc comments (with Params: and Returns:)

Please see CONTRIBUTING.md for more information.


If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment.

Bugzilla references

Auto-close Bugzilla Severity Description
21569 normal Unable to rebuild DMD build using win32.mak - v2.095.0

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "stable + dmd#12143"

@PetarKirov
Copy link
Member

This ensures the resulting path is correct even for the sources distributed alongside the official releases.

For future reference:

The contents of e.g. http://downloads.dlang.org/releases/2.x/2.095.0/dmd.2.095.0.linux.tar.xz look like this:

dmd2
├── html/
│   └── ...
├── linux/
│   ├── bin32/
│   │   └── ...
│   ├── bin64/
│   │   └── ...
│   ├── lib32/
│   │   └── ...
│   └── lib64/
│   │   └── ...
├── man/
│   └── ...
├── samples/
│   └── ...
├── src/
│   ├── dmd/
│   │   ├── dmd/
│   │   ├── tests/
│   │   ├── vcbuild/
│   │   ├── bootstrap.sh*
│   │   ├── build.d*         <---- the parent dir of `build.d` is not `src/` but `dmd/`
│   │   ├── .dscanner.ini
│   │   ├── osmodel.mak
│   │   ├── posix.mak
│   │   ├── project.ddoc
│   │   ├── README.md
│   │   ├── win32.mak
│   │   └── win64.mak
│   ├── druntime/
│   │   └── ...
│   ├── phobos/
│   │   └── ...
│   └── VERSION
├── license.txt
└── README.TXT

@dlang-bot dlang-bot merged commit a63278b into dlang:stable Jan 21, 2021
@MoonlightSentinel MoonlightSentinel deleted the buildd-res-path branch February 28, 2021 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants