commit 4bc6aef5b7a422caca699576309edfeb101c73a8
parent d474076e41d73412b8a06ecfcc031c8a92ac1685
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Sat, 27 Apr 2024 13:49:32 +0200
Merge branch 'release_0.10.1'
Diffstat:
6 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -11,5 +11,6 @@ src/stardis-green-types.h
src/stardis-prog-properties.h
src/stardis-version.h
stardis
+stardis.pc
doc/stardis.1
doc/stardis-input.5
diff --git a/Makefile b/Makefile
@@ -170,10 +170,16 @@ doc/stardis-input.5: doc/stardis-input.5.in
################################################################################
# Installation
################################################################################
-install: all
+pkg:
+ sed -e 's#@PREFIX@#$(PREFIX)#g'\
+ -e 's#@VERSION@#$(VERSION)#g'\
+ stardis.pc.in > stardis.pc
+
+install: all pkg
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/bin" stardis
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/include/stardis" src/stardis-green-types.h
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/include/stardis" src/stardis-prog-properties.h
+ @$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/lib/pkgconfig" stardis.pc
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/share/doc/stardis" COPYING README.md
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/share/man/man1" doc/stardis.1
@$(SHELL) make.sh install "$(DESTDIR)$(PREFIX)/share/man/man5" doc/stardis-input.5
@@ -183,6 +189,7 @@ uninstall:
rm -f "$(DESTDIR)$(PREFIX)/bin/stardis"
rm -f "$(DESTDIR)$(PREFIX)/include/stardis/stardis-green-types.h"
rm -f "$(DESTDIR)$(PREFIX)/include/stardis/stardis-prog-properties.h"
+ rm -f "$(DESTDIR)$(PREFIX)/lib/pkgconfig/stardis.pc"
rm -f "$(DESTDIR)$(PREFIX)/share/doc/stardis/COPYING"
rm -f "$(DESTDIR)$(PREFIX)/share/doc/stardis/README.md"
rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/stardis.1"
@@ -193,7 +200,8 @@ uninstall:
# Miscellaneous targets
################################################################################
clean:
- rm -f $(HDR) $(OBJ) .config stardis doc/stardis.1 doc/stardis-input.5
+ rm -f $(HDR) $(OBJ) .config stardis stardis.pc
+ rm -f doc/stardis.1 doc/stardis-input.5
distclean: clean
rm -f $(DEP)
diff --git a/README.md b/README.md
@@ -33,6 +33,11 @@ Edit config.mk as needed, then run:
## Release notes
+### Version 0.10.1
+
+Add a pkg-config file to support the use of Stardis header files such as
+the one declaring function profiles for programmable properties.
+
### Version 0.10
#### New conduction algorithm
diff --git a/config.mk b/config.mk
@@ -1,6 +1,6 @@
VERSION_MAJOR = 0
VERSION_MINOR = 10
-VERSION_PATCH = 0
+VERSION_PATCH = 1
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
PREFIX = /usr/local
diff --git a/doc/stardis.1.in b/doc/stardis.1.in
@@ -12,7 +12,7 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
-.Dd April 24, 2024
+.Dd April 26, 2024
.Dt STARDIS 1
.Os
.Sh NAME
@@ -81,7 +81,8 @@ information on the system in an unbiased and very-fast statistical model.
.Pp
.Nm
also provides two additional functionalities: converting the
-.Xr stardis-input 5 geometry into a VTK file and rendering an infrared image of
+.Xr stardis-input 5
+geometry into a VTK file and rendering an infrared image of
the submitted system.
.Pp
.Nm Ns '
@@ -401,7 +402,7 @@ computations.
.Ex -std
.Sh EXAMPLES
Preprocess the system as described in
-.Dq Pa scene 5.txt
+.Pa scene 5.txt
when intending to compute the mean flux on the triangles from the file
.Pa edge.stl ,
and write its geometry in the file
diff --git a/stardis.pc.in b/stardis.pc.in
@@ -0,0 +1,7 @@
+prefix=@PREFIX@
+includedir=${prefix}/include
+
+Name: stardis
+Description: Stardis
+Version: @VERSION@
+CFlags: -I${includedir}
