|
24 | 24 | <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition> |
25 | 25 | <condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition> |
26 | 26 |
|
| 27 | + <condition property="windows_host" value="true"><os family="windows" /></condition> |
| 28 | + |
27 | 29 | <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition> |
28 | 30 | <condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition> |
29 | 31 | <condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition> |
|
856 | 858 | <unzip src="${archive_file}" dest="${dest_folder}"/> |
857 | 859 | </target> |
858 | 860 |
|
| 861 | + <!-- Ensure that the executable flag is set in all enviroments/OS --> |
| 862 | + <target name="make-file-executable" depends="make-file-executable-windows"> |
| 863 | + <chmod perm="755" file="${file}" /> |
| 864 | + </target> |
| 865 | + |
| 866 | + <target name="make-file-executable-windows" if="windows_host"> |
| 867 | + <exec executable="icacls" failonerror="false"> |
| 868 | + <arg value="${file}"/> |
| 869 | + <arg value="/grant"/> |
| 870 | + <arg value="Everyone:(RX)"/> |
| 871 | + </exec> |
| 872 | + </target> |
| 873 | + |
859 | 874 | <target name="linux-dist" depends="build" |
860 | 875 | description="Build .tar.xz of linux version"> |
861 | 876 |
|
|
982 | 997 | <param name="dest_folder" value="${staging_folder}" /> |
983 | 998 | </antcall> |
984 | 999 | <copy file="windows/liblistSerials-${LIBLISTSERIAL-VERSION}/windows/listSerialsj.dll" todir="windows/work/lib/" /> |
985 | | - <chmod perm="755" file="windows/work/lib/listSerialsj.dll" /> |
| 1000 | + <antcall target="make-file-executable"> |
| 1001 | + <param name="file" value="windows/work/lib/listSerialsj.dll" /> |
| 1002 | + </antcall> |
986 | 1003 |
|
987 | 1004 | <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/> |
988 | 1005 | <mkdir dir="${staging_folder}/arduino-builder-windows"/> |
|
993 | 1010 | <param name="dest_folder" value="${staging_folder}/arduino-builder-windows" /> |
994 | 1011 | </antcall> |
995 | 1012 | <copy file="${staging_folder}/arduino-builder-windows/arduino-builder.exe" tofile="windows/work/arduino-builder.exe" /> |
996 | | - <chmod perm="755" file="windows/work/arduino-builder.exe" /> |
| 1013 | + <antcall target="make-file-executable"> |
| 1014 | + <param name="file" value="windows/work/arduino-builder.exe" /> |
| 1015 | + </antcall> |
997 | 1016 | <move file="${staging_folder}/arduino-builder-windows/tools" tofile="windows/work/tools-builder"/> |
998 | | - <chmod perm="755" file="windows/work/tools-builder/ctags/5.8-arduino11/ctags.exe" /> |
| 1017 | + <antcall target="make-file-executable"> |
| 1018 | + <param name="file" value="windows/work/tools-builder/ctags/5.8-arduino11/ctags.exe" /> |
| 1019 | + </antcall> |
999 | 1020 | <copy todir="windows/work/hardware" overwrite="true"> |
1000 | 1021 | <fileset dir="${staging_folder}/arduino-builder-windows/hardware" includes="*.txt"/> |
1001 | 1022 | </copy> |
|
1011 | 1032 | <arg value="com/sun/jna/win32-x86/jnidispatch.dll" /> |
1012 | 1033 | </exec> |
1013 | 1034 | <move file="windows/work/lib/jnidispatch.dll" tofile="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" /> |
1014 | | - <chmod perm="755" file="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" /> |
| 1035 | + <antcall target="make-file-executable"> |
| 1036 | + <param name="file" value="windows/work/lib/jnidispatch-4.2.2-win32-x86.dll" /> |
| 1037 | + </antcall> |
1015 | 1038 |
|
1016 | 1039 | <antcall target="assemble"> |
1017 | 1040 | <param name="target.path" value="windows/work" /> |
|
0 commit comments