From 90c16dc7f5ada52cfdf1d9ce4a3c2bb46ee11047 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 8 Jul 2013 23:57:36 +0200 Subject: [PATCH] Minor changes Version:1.2.20 --- packages/Makefile | 25 ++----------------------- src/.gitignore | 1 + src/preprocessed_text.py | 2 +- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index 07d5d8e..846ef1d 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,30 +1,9 @@ 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 ;\ - cp ~/.rpmmacros .;\ - echo "%_topdir $$PWD" > ~/.rpmmacros ;\ - echo "%buildroot %_topdir/buildroot" >> ~/.rpmmacros ;\ + NAME=irpf90-$(VERSION)-noarch-src.tar.gz ;\ cd ..;\ - VERSION=$(VERSION) epm -a noarch -m noarch -vv -f rpm irpf90 irpf90.list ;\ - 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 ;\ - - - + git archive --format=tar --prefix=irpf90/ HEAD | gzip > $$OLDPWD/$$NAME; version: ../src/version.py ./make_version.py > version diff --git a/src/.gitignore b/src/.gitignore index 58df3e0..afbf1c3 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,4 +1,5 @@ *.o +*.c *.so build/* *~ diff --git a/src/preprocessed_text.py b/src/preprocessed_text.py index a8c4f84..7e7ae4a 100644 --- a/src/preprocessed_text.py +++ b/src/preprocessed_text.py @@ -355,7 +355,7 @@ def add_operators(text): for line in text: buffer = line.text if "+=" in buffer: - if " if " in buffer: + if buffer.lstrip().startswith("if "): re_incr = re.compile(r"(.*)(\))(\s*)(.*)(\+=)(.*$)",re.S) line.text = re.sub(re_incr,r'\1\2\4=\4+(\6)', buffer) else: