mirror of
https://gitlab.com/scemama/irpf90.git
synced 2024-12-21 11:53:32 +01:00
Minor changes
Version:1.2.20
This commit is contained in:
parent
ff34366fde
commit
90c16dc7f5
@ -1,30 +1,9 @@
|
|||||||
include version
|
include version
|
||||||
default:
|
default:
|
||||||
set -x
|
set -x
|
||||||
rm *.rpm *.tar.gz *.exe.gz 2> /dev/null ;\
|
NAME=irpf90-$(VERSION)-noarch-src.tar.gz ;\
|
||||||
VERSION=$(VERSION) epm -f portable -a noarch -m noarch irpf90 irpf90.list ;\
|
|
||||||
cd noarch ;\
|
|
||||||
cp ~/.rpmmacros .;\
|
|
||||||
echo "%_topdir $$PWD" > ~/.rpmmacros ;\
|
|
||||||
echo "%buildroot %_topdir/buildroot" >> ~/.rpmmacros ;\
|
|
||||||
cd ..;\
|
cd ..;\
|
||||||
VERSION=$(VERSION) epm -a noarch -m noarch -vv -f rpm irpf90 irpf90.list ;\
|
git archive --format=tar --prefix=irpf90/ HEAD | gzip > $$OLDPWD/$$NAME;
|
||||||
cp noarch/.rpmmacros ~;\
|
|
||||||
mv noarch/*.tar.gz . ;\
|
|
||||||
mv noarch/*.rpm . ;\
|
|
||||||
rm -rf noarch;\
|
|
||||||
NAME=`basename *.rpm .rpm`;\
|
|
||||||
cd ..;\
|
|
||||||
git archive --format=tar --prefix=irpf90/ HEAD | gzip > $$OLDPWD/$$NAME-src.tar.gz;\
|
|
||||||
cd -;\
|
|
||||||
ls $$NAME*;\
|
|
||||||
$(HOME)/Python2exe/python2exe.py irpf90 /home/scemama/irpf90/src ;\
|
|
||||||
mv irpf90.exe irpf90;\
|
|
||||||
gzip irpf90 ;\
|
|
||||||
mv irpf90.gz irpf90-$(VERSION)-noarch.exe.gz ;\
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
version: ../src/version.py
|
version: ../src/version.py
|
||||||
./make_version.py > version
|
./make_version.py > version
|
||||||
|
1
src/.gitignore
vendored
1
src/.gitignore
vendored
@ -1,4 +1,5 @@
|
|||||||
*.o
|
*.o
|
||||||
|
*.c
|
||||||
*.so
|
*.so
|
||||||
build/*
|
build/*
|
||||||
*~
|
*~
|
||||||
|
@ -355,7 +355,7 @@ def add_operators(text):
|
|||||||
for line in text:
|
for line in text:
|
||||||
buffer = line.text
|
buffer = line.text
|
||||||
if "+=" in buffer:
|
if "+=" in buffer:
|
||||||
if " if " in buffer:
|
if buffer.lstrip().startswith("if "):
|
||||||
re_incr = re.compile(r"(.*)(\))(\s*)(.*)(\+=)(.*$)",re.S)
|
re_incr = re.compile(r"(.*)(\))(\s*)(.*)(\+=)(.*$)",re.S)
|
||||||
line.text = re.sub(re_incr,r'\1\2\4=\4+(\6)', buffer)
|
line.text = re.sub(re_incr,r'\1\2\4=\4+(\6)', buffer)
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user