From 2ff577957d250674522198b78af85a091a8e2e89 Mon Sep 17 00:00:00 2001 From: Milan Skocic Date: Mon, 18 Nov 2024 05:26:36 +0100 Subject: [PATCH] Rename nist folder to data. --- Makefile | 12 ++++++------ {nist => data}/Makefile | 0 {nist => data}/codata_2010.toml | 0 {nist => data}/codata_2010.txt | 0 {nist => data}/codata_2014.toml | 0 {nist => data}/codata_2014.txt | 0 {nist => data}/codata_2018.toml | 0 {nist => data}/codata_2018.txt | 0 {nist => data}/codata_2022.toml | 0 {nist => data}/codata_2022.txt | 0 include/Makefile | 2 +- py/src/pycodata/Makefile | 5 +++-- src/Makefile | 2 +- 13 files changed, 11 insertions(+), 10 deletions(-) rename {nist => data}/Makefile (100%) rename {nist => data}/codata_2010.toml (100%) rename {nist => data}/codata_2010.txt (100%) rename {nist => data}/codata_2014.toml (100%) rename {nist => data}/codata_2014.txt (100%) rename {nist => data}/codata_2018.toml (100%) rename {nist => data}/codata_2018.txt (100%) rename {nist => data}/codata_2022.toml (100%) rename {nist => data}/codata_2022.txt (100%) diff --git a/Makefile b/Makefile index c52b018c..20015f8e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ endif SRC_FYPP=$(wildcard ./src/*.fypp) -.PHONY: build nist stdlib sources doc docs clean logo +.PHONY: build data stdlib sources doc docs clean logo all: $(LIBNAME) @@ -72,10 +72,10 @@ uninstall: rm -f $(install_dir)/lib/$(LIBNAME).dll rm -f $(install_dir)/bin/$(LIBNAME).dll -nist: - make -C nist +data: + make -C data -sources: nist +sources: data make -C src headers: sources @@ -84,7 +84,7 @@ headers: sources cpython: sources make -C py/src/pycodata -python: nist +python: data make -C py/src/pycodata stdlib: sources @@ -101,7 +101,7 @@ logo: make -C media clean: - make -C nist clean + make -C data clean make -C src clean make -C include clean make -C stdlib clean diff --git a/nist/Makefile b/data/Makefile similarity index 100% rename from nist/Makefile rename to data/Makefile diff --git a/nist/codata_2010.toml b/data/codata_2010.toml similarity index 100% rename from nist/codata_2010.toml rename to data/codata_2010.toml diff --git a/nist/codata_2010.txt b/data/codata_2010.txt similarity index 100% rename from nist/codata_2010.txt rename to data/codata_2010.txt diff --git a/nist/codata_2014.toml b/data/codata_2014.toml similarity index 100% rename from nist/codata_2014.toml rename to data/codata_2014.toml diff --git a/nist/codata_2014.txt b/data/codata_2014.txt similarity index 100% rename from nist/codata_2014.txt rename to data/codata_2014.txt diff --git a/nist/codata_2018.toml b/data/codata_2018.toml similarity index 100% rename from nist/codata_2018.toml rename to data/codata_2018.toml diff --git a/nist/codata_2018.txt b/data/codata_2018.txt similarity index 100% rename from nist/codata_2018.txt rename to data/codata_2018.txt diff --git a/nist/codata_2022.toml b/data/codata_2022.toml similarity index 100% rename from nist/codata_2022.toml rename to data/codata_2022.toml diff --git a/nist/codata_2022.txt b/data/codata_2022.txt similarity index 100% rename from nist/codata_2022.txt rename to data/codata_2022.txt diff --git a/include/Makefile b/include/Makefile index 3f128a97..bfb7aee0 100644 --- a/include/Makefile +++ b/include/Makefile @@ -2,7 +2,7 @@ PY=python GEN=../scripts/gen_headers.py CONC=../scripts/gen_header.py -AST_DIR=../nist +AST_DIR=../data AST_SRC=$(wildcard $(AST_DIR)/*.toml) C_HEADER = codata_constants_2010.h codata_constants_2014.h codata_constants_2018.h codata_constants_2022.h diff --git a/py/src/pycodata/Makefile b/py/src/pycodata/Makefile index 0b386632..032b4639 100644 --- a/py/src/pycodata/Makefile +++ b/py/src/pycodata/Makefile @@ -2,7 +2,7 @@ PY=python GEN=../../../scripts/gen_cpython.py GENPY=../../../scripts/gen_python.py -AST_DIR=../../../nist +AST_DIR=../../../data AST_SRC=$(wildcard $(AST_DIR)/*.toml) CPYTHON = cpy_codata_constants_2010.c cpy_codata_constants_2014.c cpy_codata_constants_2018.c cpy_codata_constants_2022.c @@ -10,7 +10,8 @@ PYTHON = constants_2010.py constants_2014.py constants_2018.py constants_2022.py .PHONY: clean -all: $(CPYTHON) $(PYTHON) +# all: $(CPYTHON) $(PYTHON) +all: $(PYTHON) cpy_codata_constants_2010.c: $(AST_DIR)/codata_2010.toml $(PY) $(GEN) $< $@ diff --git a/src/Makefile b/src/Makefile index c83e934a..dc1826d2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ PY=python GEN_FORTRAN=../scripts/gen_fortran.py GEN_CAPI=../scripts/gen_capi.py -AST_DIR=../nist +AST_DIR=../data SRC_DIR=. AST_SRC=$(wildcard $(AST_DIR)/*.toml)