mirror of
https://gitlab.com/scemama/irpf90.git
synced 2024-12-21 20:03:33 +01:00
Fixed AR with ninja
This commit is contained in:
parent
f1c8d20fa8
commit
a13a4a0741
@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
|
||||
|
||||
setuptools.setup(
|
||||
name = 'irpf90',
|
||||
version = '2.0.2',
|
||||
version = '2.0.3',
|
||||
scripts = ["irpf90", "irpman", "irpf90_indent"],
|
||||
author = 'Anthony Scemama',
|
||||
author_email = 'scemama@irsamc.ups-tlse.fr',
|
||||
@ -15,7 +15,7 @@ setuptools.setup(
|
||||
long_description=long_description,
|
||||
long_description_content_type="text/markdown",
|
||||
url="https://irpf90.ups-tlse.fr",
|
||||
download_url = 'https://gitlab.com/scemama/irpf90/-/archive/v2.0.2/irpf90-v2.0.2.tar.gz',
|
||||
download_url = 'https://gitlab.com/scemama/irpf90/-/archive/v2.0.3/irpf90-v2.0.3.tar.gz',
|
||||
packages=setuptools.find_packages(),
|
||||
classifiers=[
|
||||
"Programming Language :: Python :: 3",
|
||||
|
@ -272,7 +272,7 @@ def run():
|
||||
except KeyError: FC="gfortran -ffree-line-length-none"
|
||||
|
||||
try: AR = os.environ["AR"]
|
||||
except KeyError: AR="ar"
|
||||
except KeyError: AR="ar crs"
|
||||
|
||||
try: CC = os.environ["CC"]
|
||||
except KeyError: CC="gcc"
|
||||
@ -329,7 +329,7 @@ def run():
|
||||
" description = C++ : $short_in -> $short_out",
|
||||
"",
|
||||
"rule link_lib_{id}",
|
||||
" command = {AR} crf $out $in" ,
|
||||
" command = {AR} $out $in" ,
|
||||
" description = Link: $short_out",
|
||||
"",
|
||||
"rule link_{id}",
|
||||
|
@ -29,6 +29,9 @@ from variable import *
|
||||
from irpf90_t import *
|
||||
from command_line import command_line
|
||||
from util import *
|
||||
import error
|
||||
|
||||
forbidden_names = ["type", "double precision", "integer", "use", "character", "real"]
|
||||
|
||||
######################################################################
|
||||
def create_variables():
|
||||
@ -52,6 +55,9 @@ def create_variables():
|
||||
print("- ", v.line.filename[0], " line ", v.line.i)
|
||||
print("- ", result[v.name].line.filename[0], " line ", result[v.name].line.i)
|
||||
print("Choosing first version")
|
||||
print (v.name)
|
||||
if v.name in forbidden_names:
|
||||
error.fail(line,"A variable can't be named %s"%(v.name))
|
||||
result[v.name] = v
|
||||
for other in v.others:
|
||||
if other in result:
|
||||
|
@ -1 +1 @@
|
||||
version = "2.0.2"
|
||||
version = "2.0.3"
|
||||
|
Loading…
Reference in New Issue
Block a user