From 00ac8163e28a08fc29722d9aa13883d89ac2c89e Mon Sep 17 00:00:00 2001 From: Steve Downey Date: Wed, 12 Jun 2024 11:53:32 -0400 Subject: [PATCH 1/3] Move P2988 sources to a subdirectory of papers --- .gitignore | 4 ++++ .gitmodules | 2 +- papers/P2988/.gitignore | 1 + papers/{ => P2988}/Makefile | 0 papers/{ => P2988}/abstract.bst | 0 papers/{ => P2988}/common.tex | 0 papers/{ => P2988}/design.org | 0 papers/{ => P2988}/homework-tokyo.html | 0 papers/{ => P2988}/homework-tokyo.org | 0 papers/{ => P2988}/mybiblio.bib | 0 papers/{ => P2988}/optional-ref.md | 0 papers/{ => P2988}/optional_ref.h | 0 papers/{ => P2988}/optional_ref_wording.tex | 0 papers/{ => P2988}/requirements.txt | 0 papers/{ => P2988}/std.tex | 0 papers/{ => P2988}/stdtex/config.tex | 0 papers/{ => P2988}/stdtex/layout.tex | 0 papers/{ => P2988}/stdtex/macros.tex | 0 papers/{ => P2988}/stdtex/paper_macros.tex | 0 papers/{ => P2988}/stdtex/styles.tex | 0 papers/{ => P2988}/stdtex/tables.tex | 0 papers/{ => P2988}/wg21 | 0 papers/{ => P2988}/wg21.bib | 0 23 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 papers/P2988/.gitignore rename papers/{ => P2988}/Makefile (100%) rename papers/{ => P2988}/abstract.bst (100%) rename papers/{ => P2988}/common.tex (100%) rename papers/{ => P2988}/design.org (100%) rename papers/{ => P2988}/homework-tokyo.html (100%) rename papers/{ => P2988}/homework-tokyo.org (100%) rename papers/{ => P2988}/mybiblio.bib (100%) rename papers/{ => P2988}/optional-ref.md (100%) rename papers/{ => P2988}/optional_ref.h (100%) rename papers/{ => P2988}/optional_ref_wording.tex (100%) rename papers/{ => P2988}/requirements.txt (100%) rename papers/{ => P2988}/std.tex (100%) rename papers/{ => P2988}/stdtex/config.tex (100%) rename papers/{ => P2988}/stdtex/layout.tex (100%) rename papers/{ => P2988}/stdtex/macros.tex (100%) rename papers/{ => P2988}/stdtex/paper_macros.tex (100%) rename papers/{ => P2988}/stdtex/styles.tex (100%) rename papers/{ => P2988}/stdtex/tables.tex (100%) rename papers/{ => P2988}/wg21 (100%) rename papers/{ => P2988}/wg21.bib (100%) diff --git a/.gitignore b/.gitignore index 1283c35e..206d9b00 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ compile_commands.json /papers/_minted-optional_ref_wording/ /.cache/ *.pyg +/.build/ +/papers/P2988/.deps/ +/papers/P2988/.venv/ +_minted-* diff --git a/.gitmodules b/.gitmodules index 8a5bab5f..807f4886 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "papers/wg21"] - path = papers/wg21 + path = papers/P2988/wg21 url = https://github.com/mpark/wg21.git [submodule "extern/googletest"] path = extern/googletest diff --git a/papers/P2988/.gitignore b/papers/P2988/.gitignore new file mode 100644 index 00000000..31aaf3f8 --- /dev/null +++ b/papers/P2988/.gitignore @@ -0,0 +1 @@ +/papers/P2988/.deps/ diff --git a/papers/Makefile b/papers/P2988/Makefile similarity index 100% rename from papers/Makefile rename to papers/P2988/Makefile diff --git a/papers/abstract.bst b/papers/P2988/abstract.bst similarity index 100% rename from papers/abstract.bst rename to papers/P2988/abstract.bst diff --git a/papers/common.tex b/papers/P2988/common.tex similarity index 100% rename from papers/common.tex rename to papers/P2988/common.tex diff --git a/papers/design.org b/papers/P2988/design.org similarity index 100% rename from papers/design.org rename to papers/P2988/design.org diff --git a/papers/homework-tokyo.html b/papers/P2988/homework-tokyo.html similarity index 100% rename from papers/homework-tokyo.html rename to papers/P2988/homework-tokyo.html diff --git a/papers/homework-tokyo.org b/papers/P2988/homework-tokyo.org similarity index 100% rename from papers/homework-tokyo.org rename to papers/P2988/homework-tokyo.org diff --git a/papers/mybiblio.bib b/papers/P2988/mybiblio.bib similarity index 100% rename from papers/mybiblio.bib rename to papers/P2988/mybiblio.bib diff --git a/papers/optional-ref.md b/papers/P2988/optional-ref.md similarity index 100% rename from papers/optional-ref.md rename to papers/P2988/optional-ref.md diff --git a/papers/optional_ref.h b/papers/P2988/optional_ref.h similarity index 100% rename from papers/optional_ref.h rename to papers/P2988/optional_ref.h diff --git a/papers/optional_ref_wording.tex b/papers/P2988/optional_ref_wording.tex similarity index 100% rename from papers/optional_ref_wording.tex rename to papers/P2988/optional_ref_wording.tex diff --git a/papers/requirements.txt b/papers/P2988/requirements.txt similarity index 100% rename from papers/requirements.txt rename to papers/P2988/requirements.txt diff --git a/papers/std.tex b/papers/P2988/std.tex similarity index 100% rename from papers/std.tex rename to papers/P2988/std.tex diff --git a/papers/stdtex/config.tex b/papers/P2988/stdtex/config.tex similarity index 100% rename from papers/stdtex/config.tex rename to papers/P2988/stdtex/config.tex diff --git a/papers/stdtex/layout.tex b/papers/P2988/stdtex/layout.tex similarity index 100% rename from papers/stdtex/layout.tex rename to papers/P2988/stdtex/layout.tex diff --git a/papers/stdtex/macros.tex b/papers/P2988/stdtex/macros.tex similarity index 100% rename from papers/stdtex/macros.tex rename to papers/P2988/stdtex/macros.tex diff --git a/papers/stdtex/paper_macros.tex b/papers/P2988/stdtex/paper_macros.tex similarity index 100% rename from papers/stdtex/paper_macros.tex rename to papers/P2988/stdtex/paper_macros.tex diff --git a/papers/stdtex/styles.tex b/papers/P2988/stdtex/styles.tex similarity index 100% rename from papers/stdtex/styles.tex rename to papers/P2988/stdtex/styles.tex diff --git a/papers/stdtex/tables.tex b/papers/P2988/stdtex/tables.tex similarity index 100% rename from papers/stdtex/tables.tex rename to papers/P2988/stdtex/tables.tex diff --git a/papers/wg21 b/papers/P2988/wg21 similarity index 100% rename from papers/wg21 rename to papers/P2988/wg21 diff --git a/papers/wg21.bib b/papers/P2988/wg21.bib similarity index 100% rename from papers/wg21.bib rename to papers/P2988/wg21.bib From 4afc3b1e87a170e3daca7dcf4049cb8e3e8a6bce Mon Sep 17 00:00:00 2001 From: Steve Downey Date: Wed, 12 Jun 2024 11:54:17 -0400 Subject: [PATCH 2/3] Update gitignore for new location --- .gitignore | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 206d9b00..e5240de7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,27 @@ cmake.bld -/papers/generated/ +/papers/**/generated/ compile_commands.json .update-submodules .use-docker -/papers/.venv/ -/papers/_minted-view-maybe/ -/papers/*.aux -/papers/*.bbl -/papers/*.blg -/papers/*.dvi -/papers/*.fdb_latexmk -/papers/*.fls -/papers/*.log -/papers/*.out -/papers/*.pdf -/papers/*.toc -/papers/*.idx -/papers/*.xtr -/papers/.deps/ -/papers/_minted-view-maybe.work/ -/papers/.venv.work/ -/papers/_minted-optional_ref/ -/papers/_minted-optional_ref_wording/ +/papers/**/.venv/ +/papers/**/_minted-*/ +/papers/**/*.aux +/papers/**/*.bbl +/papers/**/*.blg +/papers/**/*.dvi +/papers/**/*.fdb_latexmk +/papers/**/*.fls +/papers/**/*.log +/papers/**/*.out +/papers/**/*.pdf +/papers/**/*.toc +/papers/**/*.idx +/papers/**/*.xtr +/papers/**/.deps/ +/papers/**/_minted-view-maybe.work/ +/papers/**/.venv.work/ +/papers/**/_minted-optional_ref/ +/papers/**/_minted-optional_ref_wording/ /.cache/ *.pyg /.build/ -/papers/P2988/.deps/ -/papers/P2988/.venv/ -_minted-* From 86fb5ce9faa9bc25932cfa929c45b47ca8738e73 Mon Sep 17 00:00:00 2001 From: Steve Downey Date: Wed, 12 Jun 2024 11:55:00 -0400 Subject: [PATCH 3/3] Fix definition order for PYTHON variables Need to get the python executable name while building the virtual env. Found after a realclean build. --- papers/P2988/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/papers/P2988/Makefile b/papers/P2988/Makefile index 2dee632c..3bbfcb7f 100644 --- a/papers/P2988/Makefile +++ b/papers/P2988/Makefile @@ -1,9 +1,9 @@ +PYEXECPATH ?= $(shell which python3.12 || which python3.11 || which python3.10) +PYTHON ?= $(shell basename $(PYEXECPATH)) VENV := .venv/ SOURCE_VENV := . $(VENV)/bin/activate; PYEXEC := $(SOURCE_VENV) $(PYTHON) PIP_SYNC := $(PYEXEC) -m piptools sync -PYEXECPATH ?= $(shell which python3.12 || which python3.11 || which python3.10) -PYTHON ?= $(shell basename $(PYEXECPATH)) REQS_MARKER := $(VENV)/bin/.pip-sync PIP := $(PYEXEC) -m pip DEPS_DIR := .deps