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.

Sign up for GitHub

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

mklib deletes tmp files also in case of failure #988

Merged
merged 3 commits into from
Nov 29, 2023
Merged

mklib deletes tmp files also in case of failure #988

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9f01ba
mklib deletes tmp files also in case of failure
Iximiel Nov 22, 2023
3a2685d
added a few line explaining the new PLUMED_MKLIB_*FLAGS variables
Iximiel Nov 22, 2023
1ff0a97
Reverted to old formattation for mklib.sh
Iximiel Nov 27, 2023
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
33 changes: 23 additions & 10 deletions scripts/mklib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#! /usr/bin/env bash

if [ "$1" = --description ] ; then
echo "compile a .cpp file into a shared library"
echo "compile one or more *.cpp files into a shared library"
echo " you can create and export the variable PLUMED_MKLIB_CFLAGS with some extra compile time flags to be used"
echo " you can create and export the variable PLUMED_MKLIB_LDFLAGS with some extra link time flags (and libraries) to be used"
exit 0
fi

Expand All @@ -10,18 +12,26 @@ if [ "$1" = --options ] ; then
exit 0
fi

source "$PLUMED_ROOT"/src/config/compile_options.sh

if [ $# == 0 ]
then
echo "ERROR"
echo "type 'plumed mklib file1.cpp [file2.cpp etc]'"
exit 1
fi

source "$PLUMED_ROOT"/src/config/compile_options.sh

lib="${1%%.cpp}".$soext
rm -f "$lib"

toRemove=""
remover() {
#if compilation fails or crashes the trap will delete the temporary files
for f in $toRemove; do
rm -f "${f}"
done
}
trap "remover" EXIT
objs=""

for file
Expand All @@ -44,9 +54,12 @@ do
#adding a simple tmpfile, to preprocess "in place" the input file,
#this assumes the user has write permission in the current directory
#which should be true since we are going to compile and output something here
tmpfile=$(mktemp ${file%.cpp}.XXXXXX).cpp
tmpfile=$(mktemp "${file%.cpp}.XXXXXX")
mv "${tmpfile}" "${tmpfile}.cpp"
tmpfile=${tmpfile}.cpp
cp "${file}" "${tmpfile}"

toRemove="${toRemove} ${tmpfile} ${tmpfile}.bak"

if grep -q '^#include "\(bias\|colvar\|function\|sasa\|vatom\)\/ActionRegister.h"' "${tmpfile}"; then
>&2 echo 'WARNING: using a legacy ActionRegister.h include path, please use <<#include "core/ActionRegister.h">>'
sed -i.bak 's%^#include ".*/ActionRegister.h"%#include "core/ActionRegister.h"%g' "${tmpfile}"
Expand All @@ -64,14 +77,14 @@ do
exit 1
}

rm -f ${tmpfile} ${tmpfile}.bak ${tmpfile%.cpp}
objs="$objs $obj"

done

if test "$PLUMED_IS_INSTALLED" = yes ; then
eval "$link_installed" "$PLUMED_MKLIB_LDFLAGS" -o "$lib" "$objs"
else
eval "$link_uninstalled" "$PLUMED_MKLIB_LDFLAGS" -o "$lib" "$objs"
link_command="$link_uninstalled"

if test "$PLUMED_IS_INSTALLED" = yes; then
link_command="$link_installed"
fi

eval "$link_command" "$PLUMED_MKLIB_LDFLAGS" $objs -o "$lib"
Loading