TREX/qmckl
1
0
Fork 0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2025-01-03 10:06:09 +01:00
Code Issues Projects Releases Wiki Activity

Fixing CI

Browse Source
This commit is contained in:
Anthony Scemama 2021-03-19 13:47:50 +01:00
parent 14c216a51a
commit 87ad36e342
7 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -97,7 +97,7 @@ test: Makefile.generated ../include/qmckl.h
$(MAKE) -f Makefile.generated test
doc: $(ORG_SOURCE_FILES)
$(QMCKL_ROOT)/tools/create_doc.sh
$(QMCKL_ROOT)/tools/build_doc.sh
clean:
$(RM) test_qmckl_* test_qmckl.c test_qmckl \

6
src/test_qmckl.org
View File

@ -65,9 +65,9 @@ echo "#+end_src"
#+begin_src c :tangle no
{ (char*) "test_qmckl_error", test_qmckl_error, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
{ (char*) "test_qmckl_context", test_qmckl_context, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
// { (char*) "test_qmckl_memory", test_qmckl_memory, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
// { (char*) "test_qmckl_distance", test_qmckl_distance, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
// { (char*) "test_qmckl_ao", test_qmckl_ao, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
{ (char*) "test_qmckl_memory", test_qmckl_memory, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
{ (char*) "test_qmckl_distance", test_qmckl_distance, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
{ (char*) "test_qmckl_ao", test_qmckl_ao, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
#+end_src
:end:

47
tools/Building.org
View File

@ -10,9 +10,9 @@ echo "This file was created by tools/Building.org"
#+NAME: check-src
#+begin_src bash
if [[ $(basename $PWD) != "src" ]] ; then
echo "This script needs to be run in the src directory"
exit -1
if [[ $(basename ${PWD}) != "src" ]] ; then
echo "This script needs to be run in the src directory"
exit -1
fi
#+end_src
@ -200,22 +200,26 @@ Makefile.generated: Makefile $(QMCKL_ROOT)/tools/create_makefile.sh $(ORG_SOURC
The file is not tangled if the last modification date of the org
file is less recent than one of the tangled files.
#+begin_src bash
function tangle()
{
if [[ -f ${1%.org}.c && $1 -ot ${1%.org}.c ]]
then return
elif [[ -f ${1%.org}.f90 && $1 -ot ${1%.org}.f90 ]]
then return
fi
emacs --batch $1 --load=../tools/config_tangle.el -f org-babel-tangle
}
local org_file=$1
local c_file=${org_file%.org}.c
local f_file=${org_file%.org}.f90
if [[ ${org_file} -ot ${c_file} ]] ; then
return
elif [[ ${org_file} -ot ${f_file} ]] ; then
return
fi
emacs --batch ${org_file} --load=../tools/config_tangle.el -f org-babel-tangle
}
for i in $@
do
echo "--- $i ----"
tangle $i
echo "--- ${i} ----"
tangle ${i}
done
#+end_src
@ -247,14 +251,9 @@ ${QMCKL_ROOT}/tools/tangle.sh *.org
#+begin_src bash
OBJECTS="qmckl_f.o"
for i in $(ls qmckl_*.c) ; do
FILE=${i%.c}
OBJECTS="${OBJECTS} ${FILE}.o"
done >> $OUTPUT
for i in $(ls qmckl*_f.f90) ; do
FILE=${i%.f90}
OBJECTS="${OBJECTS} ${FILE}.o"
for i in $(ls qmckl_*.c qmckl_*f.f90) ; do
FILE=${i%.*}
OBJECTS+=" ${FILE}.o"
done >> $OUTPUT
#+end_src
@ -263,8 +262,8 @@ done >> $OUTPUT
#+begin_src bash
TESTS=""
for i in $(ls test_qmckl_*.c) ; do
FILE=${i%.c}.o
TESTS="${TESTS} ${FILE}"
FILE=${i%.c}
TESTS+=" ${FILE}.o"
done >> $OUTPUT
#+end_src
@ -273,8 +272,8 @@ done >> $OUTPUT
#+begin_src bash
TESTS_F=""
for i in $(ls test_qmckl_*_f.f90) ; do
FILE=${i%.f90}.o
TESTS_F="${TESTS_F} ${FILE}"
FILE=${i%.f90}
TESTS_F+=" ${FILE}.o"
done >> $OUTPUT
#+end_src

1
tools/config_tangle.el
View File

@ -14,7 +14,6 @@
("gnu" . 10)))
(require 'htmlize)
(require 'font-lock)
(setq org-confirm-babel-evaluate nil)
(global-font-lock-mode t)

19
tools/create_makefile.sh
View File

@ -29,14 +29,9 @@ ${QMCKL_ROOT}/tools/tangle.sh *.org
OBJECTS="qmckl_f.o"
for i in $(ls qmckl_*.c) ; do
FILE=${i%.c}
OBJECTS="${OBJECTS} ${FILE}.o"
done >> $OUTPUT
for i in $(ls qmckl*_f.f90) ; do
FILE=${i%.f90}
OBJECTS="${OBJECTS} ${FILE}.o"
for i in $(ls qmckl_*.c qmckl_*f.f90) ; do
FILE=${i%.*}
OBJECTS+=" ${FILE}.o"
done >> $OUTPUT
@ -46,8 +41,8 @@ done >> $OUTPUT
TESTS=""
for i in $(ls test_qmckl_*.c) ; do
FILE=${i%.c}.o
TESTS="${TESTS} ${FILE}"
FILE=${i%.c}
TESTS+=" ${FILE}.o"
done >> $OUTPUT
@ -57,8 +52,8 @@ done >> $OUTPUT
TESTS_F=""
for i in $(ls test_qmckl_*_f.f90) ; do
FILE=${i%.f90}.o
TESTS_F="${TESTS_F} ${FILE}"
FILE=${i%.f90}
TESTS_F+=" ${FILE}.o"
done >> $OUTPUT

22
tools/tangle.sh
View File

@ -19,19 +19,23 @@
# The file is not tangled if the last modification date of the org
# file is less recent than one of the tangled files.
function tangle()
{
if [[ -f ${1%.org}.c && $1 -ot ${1%.org}.c ]]
then return
elif [[ -f ${1%.org}.f90 && $1 -ot ${1%.org}.f90 ]]
then return
fi
emacs --batch $1 --load=../tools/config_tangle.el -f org-babel-tangle
}
local org_file=$1
local c_file=${org_file%.org}.c
local f_file=${org_file%.org}.f90
if [[ ${org_file} -ot ${c_file} ]] ; then
return
elif [[ ${org_file} -ot ${f_file} ]] ; then
return
fi
emacs --batch ${org_file} --load=../tools/config_tangle.el -f org-babel-tangle
}
for i in $@
do
echo "--- $i ----"
tangle $i
echo "--- ${i} ----"
tangle ${i}
done