Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
ef238e3c
Commit
ef238e3c
authored
Jun 16, 2015
by
Uwe Schulzweida
Browse files
added rubyVersionCheck.patch
parent
d3eedb0a
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
ef238e3c
2015-10-28 Uwe Schulzweida
* Version 1.7.0 released
2015-06-16 Uwe Schulzweida
* merge changes from branches/cdi-tiles [from Florian Prill]
* added rubyVersionCheck.patch [from Nathanael Huebbe]
2015-06-02 Uwe Schulzweida
* gribapiDefParam: check range of parameter number
...
...
interfaces/f2003/bindGen.rb
View file @
ef238e3c
...
...
@@ -495,6 +495,17 @@ $definitionLines = []
$opaqueTypes
=
[]
$publicTypes
=
[]
def
rubyVersionOk
()
version
=
RUBY_VERSION
.
split
(
"."
)
if
version
[
0
].
to_i
>
1
return
true
elsif
version
[
0
].
to_i
==
1
return
version
[
1
].
to_i
>=
9
else
return
false
end
end
#This substitutes the placeholders <opaqueTypes> and <publicTypes> in the regexString prior to constructing a Regexp out of it.
def
matchTemplate
(
regexString
,
matchString
)
opaqueTypesString
=
"(
#{
$opaqueTypes
.
collect
{
|
type
|
type
}
.join('|') })"
...
...
@@ -777,4 +788,8 @@ def main
end
end
main
()
if
rubyVersionOk
()
main
()
else
puts
(
"Error: Ruby version
#{
RUBY_VERSION
}
is too old (version 1.9 is required). Skipping fortran interface generation."
)
end
src/Makefile.am
View file @
ef238e3c
...
...
@@ -221,7 +221,7 @@ all-local: $(LOCALTARGETS)
CLEANFILES
=
`
ls
*
~
`
#CLEANFILES += cdilib.c
if
CREATE_ISOC
CLEANFILES
+=
mo_cdi.
$(FCMODEXT)
mo_cdi.
$(OBJEXT)
mo_cdi.f90
CLEANFILES
+=
mo_cdi.
$(FCMODEXT)
mo_cdi.
$(OBJEXT)
endif
if
ENABLE_CDI_LIB
...
...
src/Makefile.in
View file @
ef238e3c
...
...
@@ -90,7 +90,7 @@ host_triplet = @host@
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@
am__append_7
=
pkgconfig/cdipio.pc
@CREATE_ISOC_TRUE@
am__append_8
=
mo_cdi.
$(OBJEXT)
#CLEANFILES += cdilib.c
@CREATE_ISOC_TRUE@
am__append_9
=
mo_cdi.
$(FCMODEXT)
mo_cdi.
$(OBJEXT)
mo_cdi.f90
@CREATE_ISOC_TRUE@
am__append_9
=
mo_cdi.
$(FCMODEXT)
mo_cdi.
$(OBJEXT)
@ENABLE_CDI_LIB_TRUE@
am__append_10
=
pkgconfig/cdi.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@
am__append_11
=
pkgconfig/cdipio.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@
am__append_12
=
pkgconfig/cdipio.pc
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment