Commit 18ee451c authored by Randall Radmer's avatar Randall Radmer
Browse files

Change Fortran wrapper building script (wrappers/FortranWrapper_Header.xslt)...

Change Fortran wrapper building script (wrappers/FortranWrapper_Header.xslt) to add line breaks between function and subroutine arguments.  This was needed to keep lines under 132 characters in length
parent ef7ce026
...@@ -18,7 +18,7 @@ ADD_CUSTOM_COMMAND(OUTPUT OpenMMCWrapper.h COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_ ...@@ -18,7 +18,7 @@ ADD_CUSTOM_COMMAND(OUTPUT OpenMMCWrapper.h COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_
ADD_CUSTOM_COMMAND(OUTPUT OpenMMCWrapper.cpp COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml ADD_CUSTOM_COMMAND(OUTPUT OpenMMCWrapper.cpp COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml
-xsl:${CMAKE_SOURCE_DIR}/wrappers/CWrapper_Source.xslt -o:OpenMMCWrapper.cpp DEPENDS OpenMMApi.xml) -xsl:${CMAKE_SOURCE_DIR}/wrappers/CWrapper_Source.xslt -o:OpenMMCWrapper.cpp DEPENDS OpenMMApi.xml)
ADD_CUSTOM_COMMAND(OUTPUT OpenMMFortranModule.f90 COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml ADD_CUSTOM_COMMAND(OUTPUT OpenMMFortranModule.f90 COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml
-xsl:${CMAKE_SOURCE_DIR}/wrappers/FortranWrapper_Header.xslt -o:OpenMMFortranModule.f90 DEPENDS OpenMMApi.xml) -xsl:${CMAKE_SOURCE_DIR}/wrappers/FortranWrapper_Header.xslt -o:OpenMMFortranModule.f90 DEPENDS OpenMMApi.xml ${CMAKE_SOURCE_DIR}/wrappers/FortranWrapper_Header.xslt)
ADD_CUSTOM_COMMAND(OUTPUT OpenMMFortranWrapper.cpp COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml ADD_CUSTOM_COMMAND(OUTPUT OpenMMFortranWrapper.cpp COMMAND ${JAVA_RUNTIME} -jar ${CMAKE_SOURCE_DIR}/wrappers/saxonb9-1-0-7j/saxon9.jar -t -s:OpenMMApi.xml
-xsl:${CMAKE_SOURCE_DIR}/wrappers/FortranWrapper_Source.xslt -o:OpenMMFortranWrapper.cpp DEPENDS OpenMMApi.xml) -xsl:${CMAKE_SOURCE_DIR}/wrappers/FortranWrapper_Source.xslt -o:OpenMMFortranWrapper.cpp DEPENDS OpenMMApi.xml)
......
...@@ -396,11 +396,17 @@ END MODULE OpenMM ...@@ -396,11 +396,17 @@ END MODULE OpenMM
<xsl:value-of select="'target'"/> <xsl:value-of select="'target'"/>
</xsl:if> </xsl:if>
<xsl:for-each select="Argument"> <xsl:for-each select="Argument">
<xsl:if test="position() > 1 or not($method/@static='1')">, </xsl:if> <xsl:if test="position() > 1 or not($method/@static='1')">
<xsl:text>, &amp;
</xsl:text>
</xsl:if>
<xsl:value-of select="@name"/> <xsl:value-of select="@name"/>
</xsl:for-each> </xsl:for-each>
<xsl:if test="$has_return_arg"> <xsl:if test="$has_return_arg">
<xsl:if test="not(@static='1') or not(empty(Argument))">, </xsl:if> <xsl:if test="not(@static='1') or not(empty(Argument))">
<xsl:text>, &amp;
</xsl:text>
</xsl:if>
<xsl:value-of select="'result'"/> <xsl:value-of select="'result'"/>
</xsl:if> </xsl:if>
<xsl:value-of select="')'"/> <xsl:value-of select="')'"/>
...@@ -532,4 +538,4 @@ END MODULE OpenMM ...@@ -532,4 +538,4 @@ END MODULE OpenMM
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment