Skip to content

Fix building dlang.org from scratch #2340

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

Closed
wilzbach wants to merge 1 commit into from
Closed

Fix building dlang.org from scratch #2340

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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ os:
- linux

script:
- make -f posix.mak test
- make -f posix.mak html
- make -f posix.mak clean && rm -rf ../{dmd,druntime,phobos,tools,installer,dub}
- make -f posix.mak all
Copy link
Contributor Author

@wilzbach wilzbach Apr 13, 2018

Choose a reason for hiding this comment

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

I thought we should test the two most important targets: html and all

14 changes: 14 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ website pages. You may see warnings while the compiler is built. After `make`
ended with error code 0, directory `web` contains the produced HTML
files. Take a moment to open `web/index.html` in a browser.

### Building with a slow internet connection

The dlang.org build process depends on files which are downloaded during
the build process. If you happen to have a slow internet connection, you can skip
these downloads with `DIFFABLE=1`:

```
make -f posix.mak html DIFFABLE=1
```

## Building the standard library documentation

Now that the main site is in place, the standard library documentation would be
Expand Down Expand Up @@ -99,3 +109,7 @@ The output is in `web/phobos` and `web/library`.
### Learning more about DDoc

Please see the [Ddoc fundamentals](https://wiki.dlang.org/Contributing_to_dlang.org).

### Learn about more Makefile targets and options

The full list of available targets and options is documented in the header of `posix.mak`.
9 changes: 5 additions & 4 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ DRUNTIME_DIR=../druntime
TOOLS_DIR=../tools
INSTALLER_DIR=../installer
DUB_DIR=../dub
GIT_HOME=https://github.com/dlang

# Auto-cloning missing directories
$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
Copy link
Contributor Author

@wilzbach wilzbach Apr 13, 2018

Choose a reason for hiding this comment

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

Now GIT_HOME is no longer undefined and checking out /dmd doesn't fail.

Expand All @@ -166,7 +167,6 @@ PHOBOS_LIB=$(PHOBOS_DIR)/generated/$(OS)/release/$(MODEL)/dmd/libphobos2.a
# External directories
DOC_OUTPUT_DIR:=$(PWD)/web
W:=$(DOC_OUTPUT_DIR)
GIT_HOME=https://github.com/dlang
DPL_DOCS_PATH=dpl-docs
DPL_DOCS=$(DPL_DOCS_PATH)/dpl-docs
REMOTE_DIR=d-programming@digitalmars.com:data
Expand Down Expand Up @@ -598,7 +598,8 @@ $(DMD) : ${DMD_DIR}

$(DMD_LATEST) : ${DMD_LATEST_DIR}
${MAKE} --directory=${DMD_LATEST_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
sed -i -e "s|../druntime/import |../druntime-${LATEST}/import |" -e "s|../phobos |../phobos-${LATEST} |" $@.conf
sed -e "s|../druntime/import |../druntime-${LATEST}/import |" -e "s|../phobos |../phobos-${LATEST} |" $@.conf > $@.conf.tmp \
&& mv $@.conf.tmp $@.conf

dmd-prerelease : $(STD_DDOC_PRERELEASE) druntime-target $G/changelog/next-version
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML)
Expand Down Expand Up @@ -877,13 +878,13 @@ $G/changelog/next-version: ${DMD_DIR}/VERSION
@echo $(NEXT_VERSION) > $@

changelog/prerelease.dd: $G/changelog/next-version $(LOOSE_CHANGELOG_FILES) | \
${STABLE_DMD} $(TOOLS_DIR) $(INSTALLER_DIR) $(DUB_DIR)
${STABLE_DMD} $(DMD_DIR) $(DRUNTIME_DIR) $(PHOBOS_DIR) $(TOOLS_DIR) $(INSTALLER_DIR) $(DUB_DIR)
Copy link
Contributor Author

@wilzbach wilzbach Apr 13, 2018

Choose a reason for hiding this comment

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

druntime and phobos weren't cloned by default for the changelog script anymore.

$(STABLE_RDMD) -version=Contributors_Lib $(TOOLS_DIR)/changed.d \
$(CHANGELOG_VERSION_STABLE) -o $@ --version "${NEXT_VERSION}" \
--prev-version="${LATEST}" --date "To be released"

changelog/pending.dd: $G/changelog/next-version $(LOOSE_CHANGELOG_FILES) | \
${STABLE_DMD} $(TOOLS_DIR) $(INSTALLER_DIR) $(DUB_DIR)
${STABLE_DMD} $(DMD_DIR) $(DRUNTIME_DIR) $(PHOBOS_DIR) $(TOOLS_DIR) $(INSTALLER_DIR) $(DUB_DIR)
$(STABLE_RDMD) -version=Contributors_Lib $(TOOLS_DIR)/changed.d \
$(CHANGELOG_VERSION_MASTER) -o $@ --version "${NEXT_VERSION}" \
--prev-version="${LATEST}" --date "To be released"
Expand Down