Skip to content
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.

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

Use C++20 for programs that generate the HTML lists #445

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Compile binary programs
run: make pgms
run: make CXX=g++-14 pgms

- name: Check for carriage returns
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Compile binary programs
run: make pgms
run: make CXX=g++-14 pgms

- name: Extract issue timestamps from published files
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
update-html-pages:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Use cached git repo
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
run: make dates

- name: Build programs
run: make pgms -j 4
run: make CXX=g++-14 pgms -j 4

- name: Generate HTML lists
run: make lists
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The binaries that we want to build
PGMS := bin/lists bin/section_data bin/toc_diff bin/list_issues bin/set_status
CXXFLAGS := -std=c++17 -Wall -g -O2 -D_GLIBCXX_ASSERTIONS
CXXFLAGS := -std=c++20 -Wall -g -O2 -D_GLIBCXX_ASSERTIONS
CPPFLAGS := -MMD

# Running 'make debug' is equivalent to 'make DEBUG=1'
Expand Down Expand Up @@ -35,13 +35,13 @@ pgms: $(PGMS)

-include src/*.d

bin/lists: src/date.o src/issues.o src/status.o src/sections.o src/mailing_info.o src/report_generator.o src/lists.o src/metadata.o
bin/lists: src/issues.o src/status.o src/sections.o src/mailing_info.o src/report_generator.o src/lists.o src/metadata.o

bin/section_data: src/section_data.o

bin/toc_diff: src/toc_diff.o

bin/list_issues: src/date.o src/issues.o src/status.o src/sections.o src/list_issues.o src/metadata.o
bin/list_issues: src/issues.o src/status.o src/sections.o src/list_issues.o src/metadata.o

bin/set_status: src/set_status.o src/status.o

Expand Down
10 changes: 5 additions & 5 deletions bin/build_pgms.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
echo "Use -m32 switch to force 32-bit build"
g++ %* -std=c++17 -DNDEBUG -O2 -o bin/lists.exe src/date.cpp src/issues.cpp src/status.cpp src/sections.cpp src/mailing_info.cpp src/report_generator.cpp src/metadata.cpp src/lists.cpp
g++ %* -std=c++17 -o bin/section_data.exe src/section_data.cpp
g++ %* -std=c++17 -o bin/toc_diff.exe src/toc_diff.cpp
g++ %* -std=c++17 -DNDEBUG -O2 -o bin/list_issues.exe src/date.cpp src/issues.cpp src/status.cpp src/sections.cpp src/metadata.cpp src/list_issues.cpp
g++ %* -std=c++17 -DNDEBUG -O2 -o bin/set_status.exe src/set_status.cpp src/status.cpp
g++ %* -std=c++20 -DNDEBUG -O2 -o bin/lists.exe src/issues.cpp src/status.cpp src/sections.cpp src/mailing_info.cpp src/report_generator.cpp src/metadata.cpp src/lists.cpp
g++ %* -std=c++20 -o bin/section_data.exe src/section_data.cpp
g++ %* -std=c++20 -o bin/toc_diff.exe src/toc_diff.cpp
g++ %* -std=c++20 -DNDEBUG -O2 -o bin/list_issues.exe src/issues.cpp src/status.cpp src/sections.cpp src/metadata.cpp src/list_issues.cpp
g++ %* -std=c++20 -DNDEBUG -O2 -o bin/set_status.exe src/set_status.cpp src/status.cpp

2 changes: 1 addition & 1 deletion how-to-docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1>How To Instructions</h1>
<h2>Prerequisites</h2>
<ul>
<li>Git</li>
<li>A C++17 compiler. Clang 9 works. GCC 8.x works for unix-like systems, but GCC 9.3 is recommended (because its <code>std::filesystem</code> supports Windows, and no additional <code>-lstdc++fs</code> linker option is needed).</li>
<li>A C++20 compiler. GCC 13 works, as does Clang 16.</li>
<li>Windows is a prerequisite to use the Windows <code>.bat</code> scripts;
a POSIX environment is a prerequisite to use the equivalent <code>make</code>
commands.</li>
Expand Down
Loading
Loading