mirror of
https://github.com/TREX-CoE/qmckl.git
synced 2024-07-03 01:46:12 +02:00
Fixing CI
This commit is contained in:
parent
14c216a51a
commit
87ad36e342
|
@ -97,7 +97,7 @@ test: Makefile.generated ../include/qmckl.h
|
||||||
$(MAKE) -f Makefile.generated test
|
$(MAKE) -f Makefile.generated test
|
||||||
|
|
||||||
doc: $(ORG_SOURCE_FILES)
|
doc: $(ORG_SOURCE_FILES)
|
||||||
$(QMCKL_ROOT)/tools/create_doc.sh
|
$(QMCKL_ROOT)/tools/build_doc.sh
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) test_qmckl_* test_qmckl.c test_qmckl \
|
$(RM) test_qmckl_* test_qmckl.c test_qmckl \
|
||||||
|
|
|
@ -65,9 +65,9 @@ echo "#+end_src"
|
||||||
#+begin_src c :tangle no
|
#+begin_src c :tangle no
|
||||||
{ (char*) "test_qmckl_error", test_qmckl_error, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
|
{ (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_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_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_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_ao", test_qmckl_ao, NULL,NULL,MUNIT_TEST_OPTION_NONE,NULL},
|
||||||
#+end_src
|
#+end_src
|
||||||
:end:
|
:end:
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,9 @@ echo "This file was created by tools/Building.org"
|
||||||
|
|
||||||
#+NAME: check-src
|
#+NAME: check-src
|
||||||
#+begin_src bash
|
#+begin_src bash
|
||||||
if [[ $(basename $PWD) != "src" ]] ; then
|
if [[ $(basename ${PWD}) != "src" ]] ; then
|
||||||
echo "This script needs to be run in the src directory"
|
echo "This script needs to be run in the src directory"
|
||||||
exit -1
|
exit -1
|
||||||
fi
|
fi
|
||||||
#+end_src
|
#+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
|
The file is not tangled if the last modification date of the org
|
||||||
file is less recent than one of the tangled files.
|
file is less recent than one of the tangled files.
|
||||||
|
|
||||||
#+begin_src bash
|
#+begin_src bash
|
||||||
function tangle()
|
function tangle()
|
||||||
{
|
{
|
||||||
if [[ -f ${1%.org}.c && $1 -ot ${1%.org}.c ]]
|
local org_file=$1
|
||||||
then return
|
local c_file=${org_file%.org}.c
|
||||||
elif [[ -f ${1%.org}.f90 && $1 -ot ${1%.org}.f90 ]]
|
local f_file=${org_file%.org}.f90
|
||||||
then return
|
|
||||||
fi
|
|
||||||
emacs --batch $1 --load=../tools/config_tangle.el -f org-babel-tangle
|
|
||||||
}
|
|
||||||
|
|
||||||
|
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 $@
|
for i in $@
|
||||||
do
|
do
|
||||||
echo "--- $i ----"
|
echo "--- ${i} ----"
|
||||||
tangle $i
|
tangle ${i}
|
||||||
done
|
done
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
@ -247,14 +251,9 @@ ${QMCKL_ROOT}/tools/tangle.sh *.org
|
||||||
|
|
||||||
#+begin_src bash
|
#+begin_src bash
|
||||||
OBJECTS="qmckl_f.o"
|
OBJECTS="qmckl_f.o"
|
||||||
for i in $(ls qmckl_*.c) ; do
|
for i in $(ls qmckl_*.c qmckl_*f.f90) ; do
|
||||||
FILE=${i%.c}
|
FILE=${i%.*}
|
||||||
OBJECTS="${OBJECTS} ${FILE}.o"
|
OBJECTS+=" ${FILE}.o"
|
||||||
done >> $OUTPUT
|
|
||||||
|
|
||||||
for i in $(ls qmckl*_f.f90) ; do
|
|
||||||
FILE=${i%.f90}
|
|
||||||
OBJECTS="${OBJECTS} ${FILE}.o"
|
|
||||||
done >> $OUTPUT
|
done >> $OUTPUT
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
@ -263,8 +262,8 @@ done >> $OUTPUT
|
||||||
#+begin_src bash
|
#+begin_src bash
|
||||||
TESTS=""
|
TESTS=""
|
||||||
for i in $(ls test_qmckl_*.c) ; do
|
for i in $(ls test_qmckl_*.c) ; do
|
||||||
FILE=${i%.c}.o
|
FILE=${i%.c}
|
||||||
TESTS="${TESTS} ${FILE}"
|
TESTS+=" ${FILE}.o"
|
||||||
done >> $OUTPUT
|
done >> $OUTPUT
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
@ -273,8 +272,8 @@ done >> $OUTPUT
|
||||||
#+begin_src bash
|
#+begin_src bash
|
||||||
TESTS_F=""
|
TESTS_F=""
|
||||||
for i in $(ls test_qmckl_*_f.f90) ; do
|
for i in $(ls test_qmckl_*_f.f90) ; do
|
||||||
FILE=${i%.f90}.o
|
FILE=${i%.f90}
|
||||||
TESTS_F="${TESTS_F} ${FILE}"
|
TESTS_F+=" ${FILE}.o"
|
||||||
done >> $OUTPUT
|
done >> $OUTPUT
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
("gnu" . 10)))
|
("gnu" . 10)))
|
||||||
|
|
||||||
|
|
||||||
(require 'htmlize)
|
|
||||||
(require 'font-lock)
|
(require 'font-lock)
|
||||||
(setq org-confirm-babel-evaluate nil)
|
(setq org-confirm-babel-evaluate nil)
|
||||||
(global-font-lock-mode t)
|
(global-font-lock-mode t)
|
||||||
|
|
|
@ -29,14 +29,9 @@ ${QMCKL_ROOT}/tools/tangle.sh *.org
|
||||||
|
|
||||||
|
|
||||||
OBJECTS="qmckl_f.o"
|
OBJECTS="qmckl_f.o"
|
||||||
for i in $(ls qmckl_*.c) ; do
|
for i in $(ls qmckl_*.c qmckl_*f.f90) ; do
|
||||||
FILE=${i%.c}
|
FILE=${i%.*}
|
||||||
OBJECTS="${OBJECTS} ${FILE}.o"
|
OBJECTS+=" ${FILE}.o"
|
||||||
done >> $OUTPUT
|
|
||||||
|
|
||||||
for i in $(ls qmckl*_f.f90) ; do
|
|
||||||
FILE=${i%.f90}
|
|
||||||
OBJECTS="${OBJECTS} ${FILE}.o"
|
|
||||||
done >> $OUTPUT
|
done >> $OUTPUT
|
||||||
|
|
||||||
|
|
||||||
|
@ -46,8 +41,8 @@ done >> $OUTPUT
|
||||||
|
|
||||||
TESTS=""
|
TESTS=""
|
||||||
for i in $(ls test_qmckl_*.c) ; do
|
for i in $(ls test_qmckl_*.c) ; do
|
||||||
FILE=${i%.c}.o
|
FILE=${i%.c}
|
||||||
TESTS="${TESTS} ${FILE}"
|
TESTS+=" ${FILE}.o"
|
||||||
done >> $OUTPUT
|
done >> $OUTPUT
|
||||||
|
|
||||||
|
|
||||||
|
@ -57,8 +52,8 @@ done >> $OUTPUT
|
||||||
|
|
||||||
TESTS_F=""
|
TESTS_F=""
|
||||||
for i in $(ls test_qmckl_*_f.f90) ; do
|
for i in $(ls test_qmckl_*_f.f90) ; do
|
||||||
FILE=${i%.f90}.o
|
FILE=${i%.f90}
|
||||||
TESTS_F="${TESTS_F} ${FILE}"
|
TESTS_F+=" ${FILE}.o"
|
||||||
done >> $OUTPUT
|
done >> $OUTPUT
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,19 +19,23 @@
|
||||||
# The file is not tangled if the last modification date of the org
|
# The file is not tangled if the last modification date of the org
|
||||||
# file is less recent than one of the tangled files.
|
# file is less recent than one of the tangled files.
|
||||||
|
|
||||||
|
|
||||||
function tangle()
|
function tangle()
|
||||||
{
|
{
|
||||||
if [[ -f ${1%.org}.c && $1 -ot ${1%.org}.c ]]
|
local org_file=$1
|
||||||
then return
|
local c_file=${org_file%.org}.c
|
||||||
elif [[ -f ${1%.org}.f90 && $1 -ot ${1%.org}.f90 ]]
|
local f_file=${org_file%.org}.f90
|
||||||
then return
|
|
||||||
fi
|
|
||||||
emacs --batch $1 --load=../tools/config_tangle.el -f org-babel-tangle
|
|
||||||
}
|
|
||||||
|
|
||||||
|
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 $@
|
for i in $@
|
||||||
do
|
do
|
||||||
echo "--- $i ----"
|
echo "--- ${i} ----"
|
||||||
tangle $i
|
tangle ${i}
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue
Block a user