Browse Source

Merge branch 'release/0.1.0-alpha.3' into develop

default_compile_flags
vector-of-bool 5 years ago
parent
commit
b19fb971be
10 changed files with 12 additions and 16 deletions
  1. +2
    -1
      Makefile
  2. +1
    -1
      azure-pipelines.yml
  3. +0
    -0
      docs/_static/tweaks.css
  4. +2
    -6
      docs/conf.py
  5. +1
    -1
      docs/guide/toolchains.rst
  6. +1
    -1
      package.dds
  7. +1
    -1
      package.jsonc
  8. +1
    -1
      tools/bootstrap.py
  9. +1
    -1
      tools/freebsd-gcc-9.dds
  10. +2
    -3
      tools/gcc-9.dds

+ 2
- 1
Makefile View File



nix-ci: nix-ci:
python3 -u tools/ci.py \ python3 -u tools/ci.py \
-B download \
-B build \
-T tools/gcc-9.dds \ -T tools/gcc-9.dds \
-T2 tools/gcc-9.jsonc -T2 tools/gcc-9.jsonc


-T2 tools/freebsd-gcc-9.jsonc \ -T2 tools/freebsd-gcc-9.jsonc \
' '
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64 vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant halt

+ 1
- 1
azure-pipelines.yml View File

echo Executing Build and Tests echo Executing Build and Tests
reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f || exit 1 reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t REG_DWORD /d 1 /f || exit 1
python -m pip install pytest pytest-xdist || exit 1 python -m pip install pytest pytest-xdist || exit 1
python -u tools/ci.py -B download -T tools\msvc.dds -T2 tools\msvc.jsonc || exit 1
python -u tools/ci.py -B build -T tools\msvc.dds -T2 tools\msvc.jsonc || exit 1
displayName: Full CI displayName: Full CI
- publish: _build/dds.exe - publish: _build/dds.exe
artifact: DDS Executable - Windows VS2019 artifact: DDS Executable - Windows VS2019

+ 0
- 0
docs/_static/tweaks.css View File


+ 2
- 6
docs/conf.py View File

# The short X.Y version # The short X.Y version
version = '' version = ''
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '0.1.0'
release = '0.1.0-alpha.2'


# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
extensions = [] extensions = []
# -- Options for HTML output ------------------------------------------------- # -- Options for HTML output -------------------------------------------------
html_theme = 'pyramid' html_theme = 'pyramid'
html_theme_options = {} html_theme_options = {}
html_static_path = ['_static']
html_static_path = []
html_sidebars = {} html_sidebars = {}


def setup(app):
app.add_stylesheet('tweaks.css')

+ 1
- 1
docs/guide/toolchains.rst View File

accessed in the ``--toolchain`` command-line option using a colon ``:`` accessed in the ``--toolchain`` command-line option using a colon ``:``
prefix:: prefix::


$ dds build -T :gcc
$ dds build -t :gcc


``dds`` will treat the leading colon (``:``) as a name for a built-in ``dds`` will treat the leading colon (``:``) as a name for a built-in
toolchain (this means that a toolchain's filepath may not begin with a colon). toolchain (this means that a toolchain's filepath may not begin with a colon).

+ 1
- 1
package.dds View File

Name: dds Name: dds
Version: 0.1.0
Version: 0.1.0-alpha.3
# SPDX-License-Identifier: MPL-2.0 # SPDX-License-Identifier: MPL-2.0


Depends: spdlog 1.4.2 Depends: spdlog 1.4.2

+ 1
- 1
package.jsonc View File

{ {
"$schema": "./res/package-schema.json", "$schema": "./res/package-schema.json",
"name": "dds", "name": "dds",
"version": "0.1.0",
"version": "0.1.0-alpha.3",
"namespace": "dds", "namespace": "dds",
"depends": { "depends": {
"spdlog": "1.4.2", "spdlog": "1.4.2",

+ 1
- 1
tools/bootstrap.py View File





BOOTSTRAP_PHASES = [ BOOTSTRAP_PHASES = [
BootstrapPhase('bootstrap-p1.1', 'g++-8', 'cl.exe'),
BootstrapPhase('bootstrap-p1.2', 'g++-8', 'cl.exe'),
BootstrapPhase('bootstrap-p4.2', 'g++-8', 'cl.exe'), BootstrapPhase('bootstrap-p4.2', 'g++-8', 'cl.exe'),
BootstrapPhase('bootstrap-p5.2', 'g++-9', 'cl.exe'), BootstrapPhase('bootstrap-p5.2', 'g++-9', 'cl.exe'),
] ]

+ 1
- 1
tools/freebsd-gcc-9.dds View File

Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-conversion Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-conversion
C++-Flags: -std=c++2a -fconcepts C++-Flags: -std=c++2a -fconcepts
Link-Flags: -static-libgcc -static-libstdc++ Link-Flags: -static-libgcc -static-libstdc++
Debug: True
Optimize: True
Compiler-Launcher: ccache Compiler-Launcher: ccache

+ 2
- 3
tools/gcc-9.dds View File

# Range-v3 0.10.0 contains an accidental conversion warning # Range-v3 0.10.0 contains an accidental conversion warning
Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-sign-compare -Wno-conversion Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-sign-compare -Wno-conversion
C++-Flags: -fconcepts -std=c++2a C++-Flags: -fconcepts -std=c++2a
# Link-Flags: -static-libgcc -static-libstdc++
Debug: True
#Optimize: True
Link-Flags: -static-libgcc -static-libstdc++
Optimize: True
Compiler-Launcher: ccache Compiler-Launcher: ccache

Loading…
Cancel
Save