From c37818e6e56661c4c41ca823546ebba5f09379ab Mon Sep 17 00:00:00 2001 From: Daniel Marchand Date: Thu, 8 Apr 2021 15:02:01 +0200 Subject: [PATCH 1/2] changed regex seperation in sed for makefile. Forward slashes are often used for branch names but would cause the makefile to crash. --- src/libnnp/makefile | 12 ++++++------ src/libnnp/version.h | 6 +++--- src/libnnpif/LAMMPS/Makefile.lammps | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libnnp/makefile b/src/libnnp/makefile index 813e918c7..ff20f5377 100644 --- a/src/libnnp/makefile +++ b/src/libnnp/makefile @@ -72,11 +72,11 @@ headers: version version: @$(eval GIT_VERSION = $(shell git describe --tags --always)) - @sed -i.bak -E "s/(N2P2_GIT_VERSION) .*/\1 \"$(GIT_VERSION)\"/" version.h + @sed -i.bak -E "s+(N2P2_GIT_VERSION) .*+\1 \"$(GIT_VERSION)\"+" version.h @$(eval GIT_REV = $(shell git rev-parse HEAD)) - @sed -i.bak -E "s/(N2P2_GIT_REV) .*/\1 \"$(GIT_REV)\"/" version.h + @sed -i.bak -E "s+(N2P2_GIT_REV) .*+\1 \"$(GIT_REV)\"+" version.h @$(eval GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)) - @sed -i.bak -E "s/(N2P2_GIT_BRANCH) .*/\1 \"$(GIT_BRANCH)\"/" version.h + @sed -i.bak -E "s+(N2P2_GIT_BRANCH) .*+\1 \"$(GIT_BRANCH)\"+" version.h @rm version.h.bak $(LIB).so: CFLAGS+= -fPIC @@ -97,9 +97,9 @@ clean: clean-version clean-headers $(RM) $(PROJECT_LIB)/$(LIB).so $(PROJECT_LIB)/$(LIB).a clean-version: - @sed -i.bak -E "s/(N2P2_GIT_VERSION) .*/\1 \"\"/" version.h - @sed -i.bak -E "s/(N2P2_GIT_REV) .*/\1 \"\"/" version.h - @sed -i.bak -E "s/(N2P2_GIT_BRANCH) .*/\1 \"\"/" version.h + @sed -i.bak -E "s+(N2P2_GIT_VERSION) .*+\1 \"\"+" version.h + @sed -i.bak -E "s+(N2P2_GIT_REV) .*+\1 \"\"+" version.h + @sed -i.bak -E "s+(N2P2_GIT_BRANCH) .*+\1 \"\"+" version.h @rm version.h.bak clean-headers: diff --git a/src/libnnp/version.h b/src/libnnp/version.h index 992d82785..935ef78cf 100644 --- a/src/libnnp/version.h +++ b/src/libnnp/version.h @@ -18,8 +18,8 @@ #define VERSION_H #define N2P2_VERSION "v2.1.1" -#define N2P2_GIT_VERSION "" -#define N2P2_GIT_REV "" -#define N2P2_GIT_BRANCH "" +#define N2P2_GIT_VERSION "v2.1.1-20-g3f03449" +#define N2P2_GIT_REV "3f03449f24b1ef1704cb29d8c978f1459667e138" +#define N2P2_GIT_BRANCH "fix/make_sed_error" #endif diff --git a/src/libnnpif/LAMMPS/Makefile.lammps b/src/libnnpif/LAMMPS/Makefile.lammps index 144fd0dbc..ab4d5900f 100644 --- a/src/libnnpif/LAMMPS/Makefile.lammps +++ b/src/libnnpif/LAMMPS/Makefile.lammps @@ -1,5 +1,5 @@ # Settings that the LAMMPS build will import when this package library is used -nnp_SYSINC = +nnp_SYSINC = nnp_SYSLIB = nnp_SYSPATH = From 0f4663694cb8b59383ea0600706b89cdb6270e72 Mon Sep 17 00:00:00 2001 From: Andreas Singraber Date: Mon, 23 May 2022 11:29:31 +0200 Subject: [PATCH 2/2] Switched to ? as sed delimiter ? is not allowed in Git branch names --- src/libnnp/makefile | 12 ++++++------ src/libnnpif/LAMMPS/Makefile.lammps | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libnnp/makefile b/src/libnnp/makefile index ff20f5377..fea67d54e 100644 --- a/src/libnnp/makefile +++ b/src/libnnp/makefile @@ -72,11 +72,11 @@ headers: version version: @$(eval GIT_VERSION = $(shell git describe --tags --always)) - @sed -i.bak -E "s+(N2P2_GIT_VERSION) .*+\1 \"$(GIT_VERSION)\"+" version.h + @sed -i.bak -E "s?(N2P2_GIT_VERSION) .*?\1 \"$(GIT_VERSION)\"?" version.h @$(eval GIT_REV = $(shell git rev-parse HEAD)) - @sed -i.bak -E "s+(N2P2_GIT_REV) .*+\1 \"$(GIT_REV)\"+" version.h + @sed -i.bak -E "s?(N2P2_GIT_REV) .*?\1 \"$(GIT_REV)\"?" version.h @$(eval GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)) - @sed -i.bak -E "s+(N2P2_GIT_BRANCH) .*+\1 \"$(GIT_BRANCH)\"+" version.h + @sed -i.bak -E "s?(N2P2_GIT_BRANCH) .*?\1 \"$(GIT_BRANCH)\"?" version.h @rm version.h.bak $(LIB).so: CFLAGS+= -fPIC @@ -97,9 +97,9 @@ clean: clean-version clean-headers $(RM) $(PROJECT_LIB)/$(LIB).so $(PROJECT_LIB)/$(LIB).a clean-version: - @sed -i.bak -E "s+(N2P2_GIT_VERSION) .*+\1 \"\"+" version.h - @sed -i.bak -E "s+(N2P2_GIT_REV) .*+\1 \"\"+" version.h - @sed -i.bak -E "s+(N2P2_GIT_BRANCH) .*+\1 \"\"+" version.h + @sed -i.bak -E "s?(N2P2_GIT_VERSION) .*?\1 \"\"?" version.h + @sed -i.bak -E "s?(N2P2_GIT_REV) .*?\1 \"\"?" version.h + @sed -i.bak -E "s?(N2P2_GIT_BRANCH) .*?\1 \"\"?" version.h @rm version.h.bak clean-headers: diff --git a/src/libnnpif/LAMMPS/Makefile.lammps b/src/libnnpif/LAMMPS/Makefile.lammps index c9a75d141..fc83b61f8 100644 --- a/src/libnnpif/LAMMPS/Makefile.lammps +++ b/src/libnnpif/LAMMPS/Makefile.lammps @@ -2,4 +2,4 @@ hdnnp_SYSINC = hdnnp_SYSLIB = -lnnpif -lnnp -hdnnp_SYSPATH = \ No newline at end of file +hdnnp_SYSPATH =