diff --git a/bin/irpf90 b/bin/irpf90 index 09358c1..e537e26 120000 --- a/bin/irpf90 +++ b/bin/irpf90 @@ -1 +1 @@ -/home/scemama/irpf90/src/irpf90.exe \ No newline at end of file +../src/irpf90.exe \ No newline at end of file diff --git a/example/irp_example1.irp.f b/example/irp_example1.irp.f index 5c4bf47..9569645 100644 --- a/example/irp_example1.irp.f +++ b/example/irp_example1.irp.f @@ -1,10 +1,10 @@ program irp_example1 ! integer :: x(W) -! BEGIN_SHELL [ /bin/bash ] -! echo print *, \'Compiled by `whoami` on `date`\' -! echo print *, \'$FC $FCFLAGS\' -! echo print *, \'$IRPF90\' -! END_SHELL + BEGIN_SHELL [ /bin/bash ] + echo print *, \'Compiled by `whoami` on `date`\' + echo print *, \'$FC $FCFLAGS\' + echo print *, \'$IRPF90\' + END_SHELL print *, 't = ', t print *, 'v=', v diff --git a/packages/Makefile b/packages/Makefile index b523cb8..07d5d8e 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,6 @@ include version default: + set -x rm *.rpm *.tar.gz *.exe.gz 2> /dev/null ;\ VERSION=$(VERSION) epm -f portable -a noarch -m noarch irpf90 irpf90.list ;\ cd noarch ;\ diff --git a/src/Makefile b/src/Makefile index 42686bb..74430d5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,12 +1,10 @@ PYTHON=python PYVERSION=$(shell $(PYTHON) -c "import sys; print(sys.version[:3])") HAS_CYTHON=$(shell which cython &> /dev/null && echo 1 || echo 0) -ifeq ($(HAS_CYTHON),0) +ifneq ($(HAS_CYTHON),0) -irpf90.exe: - cp -f irpf90_python.exe irpf90.exe - -else +../bin/irpf90: irpf90.exe + rm ../bin/irpf90 ; cd ../bin ; ln -s ../src/irpf90.exe irpf90 irpf90.exe: irpf90.so gcc build/*/irpf90.o -L/usr/lib64 -lpython$(PYVERSION) -o irpf90.exe @@ -17,6 +15,9 @@ irpf90.so : $(wildcard *.py) irpf90.c irpf90.c: irpf90.py cython --embed irpf90.py +else +../bin/irpf90: irpf90_python.exe + rm ../bin/irpf90 ; cd ../bin ; ln -s ../src/irpf90_python.exe irpf90 endif clean: diff --git a/src/version.py b/src/version.py index 626dbdb..a7c3fc0 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.2.14" +version = "1.2.18"