Skip to content

Update thrift to 0.11 #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erikpelgrim wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update thrift to 0.11 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddee588
Upgrade thrift from 0.9 to 0.11
erikpelgrim May 7, 2020
316d0a7
Update comment
erikpelgrim May 7, 2020
dd13642
Windows only thrift build
erikpelgrim May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 68 additions & 10 deletions model_bmi/build_thrift.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<!--
===========================================================================
Compilation
Compilation using-system-thrift
===========================================================================
-->
<target name="build" depends="thrift-jar">
Expand Down Expand Up @@ -71,7 +71,7 @@
<classpath>
<fileset dir="${resourcesdir}">
<include name="thrift/*.jar"/>
<include name="slf4j-api.jar"/>
<include name="slf4j-api-1.7.21.jar"/>
</fileset>
<pathelement path="."/>
</classpath>
Expand All @@ -91,14 +91,72 @@
</antcall>
</target>

<!-- This only works if thrift compiler is on the PATH environment variable and output directory already exists -->
<target name="thrift-execute">
<echo>Generating ${output_language} code in ${output_dir} using thrift code from ${input_file}</echo>
<exec executable="thrift" failonerror="${failonerror}">
<arg line="-out ${output_dir}"/>
<arg line="-gen ${output_language} ${input_file}"/>
</exec>
</target>
<!-- This only works if thrift compiler is on the PATH environment variable and output directory already exists -->
<target name="thrift-execute">
<echo>Generating ${output_language} code in ${output_dir} using thrift code from ${input_file}</echo>
<exec executable="thrift" failonerror="${failonerror}">
<arg line="-out ${output_dir}"/>
<arg line="-gen ${output_language} ${input_file}"/>
</exec>
</target>

<!--
===========================================================================
Compilation using included windows executable
===========================================================================
-->

<target name="build-windows-only">
<antcall target="thrift-jar-windows-only">
<param name="output_dir" value="${thrift_temp_srcdir}"/>
</antcall>
</target>

<target name="thrift-jar-windows-only" depends="thrift-classes-windows-only, manifest">
<jar jarfile="${openda_thrift_jar}" manifest="MANIFEST.MF">
<fileset dir="${thrift_temp_builddir}" includes="**/*.class"/>
</jar>
<zip zipfile="${openda_thrift_src}">
<fileset dir="${thrift_temp_srcdir}" includes="**/*.java"/>
</zip>
</target>

<target name="thrift-classes-windows-only" depends="thrift-src-windows-only">
<!-- run javac on the thrift generated files -->
<javac srcdir="${thrift_temp_srcdir}" destdir="${thrift_temp_builddir}" debug="${debug}" source="1.8" failonerror="${failonerror}" listfiles="${listfiles}" fork="yes" memoryInitialSize="256M"
memoryMaximumSize="256M">
<classpath>
<fileset dir="${resourcesdir}">
<include name="thrift/*.jar"/>
<include name="slf4j-api-1.7.21.jar"/>
</fileset>
<pathelement path="."/>
</classpath>
</javac>
</target>

<target name="thrift-src-windows-only" depends="init">
<antcall target="thrift-execute-windows-only">
<param name="output_dir" value="${thrift_temp_srcdir}"/>
<param name="output_language" value="java"/>
<param name="input_file" value="thrift/src/bmi.thrift"/>
</antcall>
<antcall target="thrift-execute-windows-only">
<param name="output_dir" value="python/resources/openda/thrift_generated_code"/>
<param name="output_language" value="py:new_style"/>
<param name="input_file" value="thrift/src/bmi.thrift"/>
</antcall>
</target>

<!-- This only works if output directory already exists and only on Windows -->
<target name="thrift-execute-windows-only">
<echo>Generating ${output_language} code in ${output_dir} using thrift code from ${input_file}</echo>
<exec executable="${resourcesdir}\thrift\thrift-0.11.0.exe" failonerror="${failonerror}">

<arg line="-out ${output_dir}"/>
<arg line="-gen ${output_language} ${input_file}"/>
</exec>
</target>

<!--
===========================================================================
Expand Down
Binary file modified model_bmi/java/resources/openda/model_bmi_thrift.jar
View file
Open in desktop
Binary file not shown.
Binary file modified model_bmi/java/resources/openda/model_bmi_thrift_src.zip
View file
Open in desktop
Binary file not shown.
Binary file added model_bmi/java/resources/thrift/libthrift-0.11.0.jar
View file
Open in desktop
Binary file not shown.
Binary file removed model_bmi/java/resources/thrift/libthrift-0.9.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added model_bmi/java/resources/thrift/slf4j-api-1.7.21.jar
View file
Open in desktop
Binary file not shown.
Binary file added model_bmi/java/resources/thrift/thrift-0.11.0.exe
View file
Open in desktop
Binary file not shown.