Explorar el Código

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

default_compile_flags
vector-of-bool hace 4 años
padre
commit
b19fb971be
Se han modificado 10 ficheros con 12 adiciones y 16 borrados
  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 Ver fichero

@@ -36,7 +36,7 @@ linux-ci: nix-ci

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

@@ -50,3 +50,4 @@ vagrant-freebsd-ci:
-T2 tools/freebsd-gcc-9.jsonc \
'
vagrant scp freebsd11:/vagrant/_build/dds _build/dds-freebsd-x64
vagrant halt

+ 1
- 1
azure-pipelines.yml Ver fichero

@@ -12,7 +12,7 @@ jobs:
echo Executing Build and Tests
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 -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
- publish: _build/dds.exe
artifact: DDS Executable - Windows VS2019

+ 0
- 0
docs/_static/tweaks.css Ver fichero


+ 2
- 6
docs/conf.py Ver fichero

@@ -9,7 +9,7 @@ author = 'vector-of-bool'
# The short X.Y version
version = ''
# The full version, including alpha/beta/rc tags
release = '0.1.0'
release = '0.1.0-alpha.2'

# -- General configuration ---------------------------------------------------
extensions = []
@@ -23,9 +23,5 @@ pygments_style = None
# -- Options for HTML output -------------------------------------------------
html_theme = 'pyramid'
html_theme_options = {}
html_static_path = ['_static']
html_static_path = []
html_sidebars = {}


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

+ 1
- 1
docs/guide/toolchains.rst Ver fichero

@@ -52,7 +52,7 @@ For convenience, ``dds`` includes several built-in toolchains that can be
accessed in the ``--toolchain`` command-line option using a colon ``:``
prefix::

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

``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).

+ 1
- 1
package.dds Ver fichero

@@ -1,5 +1,5 @@
Name: dds
Version: 0.1.0
Version: 0.1.0-alpha.3
# SPDX-License-Identifier: MPL-2.0

Depends: spdlog 1.4.2

+ 1
- 1
package.jsonc Ver fichero

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

+ 1
- 1
tools/bootstrap.py Ver fichero

@@ -21,7 +21,7 @@ class BootstrapPhase(NamedTuple):


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-p5.2', 'g++-9', 'cl.exe'),
]

+ 1
- 1
tools/freebsd-gcc-9.dds Ver fichero

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

+ 2
- 3
tools/gcc-9.dds Ver fichero

@@ -4,7 +4,6 @@ C++-Compiler: g++-9
# Range-v3 0.10.0 contains an accidental conversion warning
Flags: -D SPDLOG_COMPILED_LIB -Werror=return-type -Wno-sign-compare -Wno-conversion
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

Cargando…
Cancelar
Guardar