Skip to content

fix support of relative variable overrides #1771

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 2 commits into from
Jun 26, 2017
Merged

fix support of relative variable overrides #1771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16b06c4
fix support of relative variable overrides
MartinNowak Jun 25, 2017
2efc3fd
fix clone targets
MartinNowak Jun 26, 2017
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
28 changes: 14 additions & 14 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ endif
NEXT_VERSION:=$(shell bash -c 'version=$$(cat VERSION);a=($${version//./ });a[1]="10\#$${a[1]}";((a[1]++)); a[2]=0; echo $${a[0]}.0$${a[1]}.$${a[2]};' )

# DLang directories
DMD_DIR=$(PWD)/../dmd
PHOBOS_DIR=$(PWD)/../phobos
DRUNTIME_DIR=$(PWD)/../druntime
TOOLS_DIR=$(PWD)/../tools
INSTALLER_DIR=$(PWD)/../installer
DUB_DIR=$(PWD)/../dub-${DUB_VER}
DMD_DIR=../dmd
PHOBOS_DIR=../phobos
DRUNTIME_DIR=../druntime
TOOLS_DIR=../tools
INSTALLER_DIR=../installer
DUB_DIR=../dub-${DUB_VER}

# External binaries
DMD=$(DMD_DIR)/generated/$(OS)/release/$(MODEL)/dmd
Expand Down Expand Up @@ -113,16 +113,16 @@ endif
DDOC_VARS_STABLE=\
DOC_OUTPUT_DIR="${DOC_OUTPUT_DIR}/phobos" \
STDDOC="$(addprefix $(PWD)/, $(STD_DDOC))" \
DMD="$(DMD_STABLE)" \
DRUNTIME_PATH="${DRUNTIME_DIR}" \
DMD="$(abspath $(DMD_STABLE))" \
DRUNTIME_PATH="$(abspath ${DRUNTIME_DIR})" \
DOCSRC="$(PWD)" \
VERSION="${DMD_DIR}/VERSION"
VERSION="$(abspath ${DMD_DIR}/VERSION)"

DDOC_VARS=\
DMD="${DMD}" \
DRUNTIME_PATH="${DRUNTIME_DIR}" \
DMD="$(abspath ${DMD})" \
DRUNTIME_PATH="$(abspath ${DRUNTIME_DIR})" \
DOCSRC="$(PWD)" \
VERSION="${DMD_DIR}/VERSION"
VERSION="$(abspath ${DMD_DIR}/VERSION)"

DDOC_VARS_HTML=$(DDOC_VARS) \
DOC_OUTPUT_DIR="${DOC_OUTPUT_DIR}/phobos-prerelease" \
Expand Down Expand Up @@ -381,10 +381,10 @@ dlangspec.verbatim.txt : $(DMD) verbatim.ddoc dlangspec-consolidated.d
# Git rules
################################################################################

$(PWD)/%-${LATEST} :
../%-${LATEST} :
git clone -b v${LATEST} --depth=1 ${GIT_HOME}/$(notdir $*) $@

$(PWD)/%-${DUB_VER} :
../%-${DUB_VER} :
git clone --depth=1 -b v${DUB_VER} ${GIT_HOME}/$(notdir $*) $@

${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}:
Expand Down