Skip to content

Commit

Permalink
Removed "macosx-fix-bundled-toolchain-missing-symlinks" build task
Browse files Browse the repository at this point in the history
This is no more needed since avrdude is compiled with libusb*
statically linked
  • Loading branch information
cmaglie committed Jun 16, 2016
1 parent 0290830 commit 24badb0
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,6 @@

<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>

<!-- XXX: This is a temporary hack to let the IDE select the correct bundled tools. -->
<!-- XXX: THE FOLLOWING LINES MUST BE REMOVED BEFORE MERGING! -->
Expand Down Expand Up @@ -1190,17 +1189,6 @@
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
</target>

<target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
<exec executable="mv" failonerror="true">
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb.dylib"/>
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
</exec>
<exec executable="mv" failonerror="true">
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb-1.0.dylib"/>
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
</exec>
</target>

<target name="generate-hourly-build-txt" if="hourly">
<echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
</target>
Expand Down

0 comments on commit 24badb0

Please sign in to comment.