Skip to content

Commit

Permalink
Merge branch 'release/1.0.0-beta.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
vector-of-bool committed Jun 26, 2022
2 parents 8ba89da + d549200 commit da8560d
Show file tree
Hide file tree
Showing 609 changed files with 24,204 additions and 36,869 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ Thank you!
2. Second step
3. Third step

**`dds` Output**
**`bpt` Output**

<!--
If applicable, include the output from `dds`.
If applicable, include the output from `bpt`.
PLEASE paste the output in-between the triple-backticks to keep the output
formatted correctly!
Expand All @@ -55,7 +55,7 @@ List the platform(s) and toolsets which are applicable to the issue, and all of

- Operating System: [e.g. macOS, Linux, Windows]
- Compiler: [e.g. MSVC, GCC, Clang]
- `dds` Version: [e.g. `0.1.0-alpha.6`]
- `bpt` Version: [e.g. `0.1.0-alpha.6`]

**Additional context**

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Feature request
about: Suggest a new feature or capability for `dds`
about: Suggest a new feature or capability for `bpt`
title: "[FEATURE]"
labels: enhancement
assignees: ''
Expand All @@ -11,7 +11,7 @@ assignees: ''
Please provide as much information as possible to help us address your concern. When completed, please remove an empty sections.
Before submitting, please consider whether the requested behavior is contrary to the stated goals and non-goals of `dds` itself. If you are unsure whether your request would go against the project's goals, feel free to submit it and we'll discuss it!
Before submitting, please consider whether the requested behavior is contrary to the stated goals and non-goals of `bpt` itself. If you are unsure whether your request would go against the project's goals, feel free to submit it and we'll discuss it!
Thank you!
Expand Down
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
_build/
_site/
__pycache__/
.vscode/
.mypy_cache/
_prebuilt/
.pytest_cache/
.vagrant/
Expand All @@ -13,4 +11,8 @@ external/OpenSSL
.docker-ccache/

*.egg-info
*.stamp
*.stamp

__test_project/
__test_crs/
.dagon.db
161 changes: 0 additions & 161 deletions .pylintrc

This file was deleted.

3 changes: 0 additions & 3 deletions .style.yapf

This file was deleted.

91 changes: 32 additions & 59 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,15 @@
vagrant-freebsd-ci site alpine-static-ci _alpine-static-ci poetry-setup \
full-ci dev-build release-build


clean:
rm -f -vr -- $(shell find -name __pycache__ -type d)
rm -f -vr -- _build/ _prebuilt/
rm -f -v -- $(shell find -name "*.stamp" -type f)

docs:
sphinx-build -b html \
docs \
_build/docs \
-d _build/doctrees \
-Wqanj8
echo "Docs generated to _build/docs"

hugo-docs:
env GEN_FOR_HUGO=1 $(MAKE) docs

docs-server: docs
echo "Docs are visible on http://localhost:9794/"
cd _build/docs && \
python -m http.server 9794

docs-watch: docs
+poetry run sh tools/docs-watch.sh

docs-sync-server:
mkdir -p _build/docs
cd _build/docs && \
browser-sync start --server \
--reload-delay 300 \
--watch **/*.html
docs-server:
poetry run sphinx-autobuild \
-b html \
-j 8 \
-Wna \
--re-ignore "docs/_build" \
--re-ignore "_build" \
docs/ \
_build/docs

.poetry.stamp: poetry.lock
poetry install --no-dev
Expand All @@ -44,65 +22,60 @@ docs-sync-server:
poetry-setup: .poetry.stamp

full-ci: poetry-setup
poetry run dds-ci --clean
poetry run dagon clean ci

dev-build: poetry-setup
poetry run dds-ci --rapid
poetry run dagon clean build.test

release-build: poetry-setup
poetry run dds-ci --no-test
poetry run dagon clean build.main

macos-ci: full-ci
mv _build/dds _build/dds-macos-x64
mv _build/bpt _build/bpt-macos-x64

linux-ci: full-ci
mv _build/dds _build/dds-linux-x64
mv _build/bpt _build/bpt-linux-x64

_alpine-static-ci:
poetry install --no-dev
# Alpine Linux does not ship with ASan nor UBSan, so we can't use them in
# our test-build. Just use the same build for both. CCache will also speed this up.
poetry run dds-ci \
--bootstrap-with=lazy \
--test-toolchain=tools/gcc-9-static-rel.jsonc \
--main-toolchain=tools/gcc-9-static-rel.jsonc
mv _build/dds _build/dds-linux-x64
poetry run dagon \
-o bootstrap-mode=lazy \
-o jobs=4 \
-o test-toolchain=tools/gcc-10-static-rel.jsonc \
--interface simple \
--fail-cancels \
test
poetry run dagon \
-o main-toolchain=tools/gcc-10-static-rel.jsonc \
--interface simple \
--fail-cancels \
build.main
mv _build/bpt _build/bpt-linux-x64

alpine-static-ci:
docker build \
--build-arg DDS_USER_UID=$(shell id -u) \
-t dds-builder \
--build-arg BPT_USER_UID=$(shell id -u) \
-t bpt-builder \
-f tools/Dockerfile.alpine \
tools/
docker run \
-t --rm \
-u $(shell id -u) \
-v $(PWD):/host -w /host \
-e CCACHE_DIR=/host/.docker-ccache \
dds-builder \
bpt-builder \
make _alpine-static-ci

vagrant-freebsd-ci:
vagrant up freebsd11
vagrant rsync
vagrant ssh freebsd11 -c '\
export PATH=$$PATH:$$HOME/.local/bin && \
cd /vagrant && \
make full-ci \
'
mkdir -p _build/
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant scp freebsd11:/vagrant/_build/bpt _build/bpt-freebsd-x64
vagrant halt

site: docs
rm -r -f -- _site/
mkdir -p _site/
cp site/index.html _site/
cp -r _build/docs _site/
echo "Site generated at _site/"

py-check:
poetry run mypy tools/dds_ci $(shell find tests/ -name *.py)
poetry run pylint tools/dds_ci $(shell find tests/ -name *.py)

format:
poetry run dds-format
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `dds` - A Build System and Library Manager
# `bpt` - A Build System and Library Manager

`dds` is a modern take on build system and library dependency management for C
`bpt` is a modern take on build system and library dependency management for C
and C++ projects. It aims to be easy to use for beginners and experts alike,
and maximally discoverable.

To learn more, refer to [the official
documentation](https://vector-of-bool.github.io/docs/dds/index.html).
documentation](https://vector-of-bool.github.io/docs/bpt/index.html).
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Vagrant.configure("2") do |config|

config.vm.synced_folder ".", "/vagrant",
type: 'rsync',
rsync__exclude: ['_build/', '.mypy_cache/', '.pytest_cache/', '_prebuilt/']
rsync__exclude: ['_build/', '.pytest_cache/', '_prebuilt/']

config.vm.define 'freebsd11' do |freebsd11|
freebsd11.vm.box = 'generic/freebsd11'
Expand All @@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
ln -fs gcc9 /usr/local/bin/gcc-9
ln -fs g++8 /usr/local/bin/g++-8
ln -fs gcc8 /usr/local/bin/gcc-8
sudo -u vagrant pip install -q --user pytest pytest-xdist
sudo -u vagrant pip install -q --user poetry
SHELL
end

Expand Down
Loading

0 comments on commit da8560d

Please sign in to comment.