|
159 | 159 |
|
160 | 160 | <!-- For now, just using the os.arch as the dist suffix; not sure if |
161 | 161 | the alternatives (x64, arm32, arm64) are better/worth the trouble. --> |
162 | | - <property name="dist.suffix" value="${os.arch}" /> |
| 162 | + <!-- <property name="dist.suffix" value="${os.arch}" /> --> |
163 | 163 |
|
164 | 164 | <!-- Figure out the platform-specific output directory for all this work. --> |
165 | 165 | <condition property="target.path" |
|
897 | 897 |
|
898 | 898 | <antcall target="macos-dist-sign" /> |
899 | 899 |
|
| 900 | + <condition property="dist.suffix" value="x64" else="${os.arch}"> |
| 901 | + <equals arg1="${os.arch}" arg2="x86_64" /> |
| 902 | + </condition> |
| 903 | + |
900 | 904 | <exec executable="ditto" dir="macos/work"> |
901 | 905 | <arg line="-c -k -rsrc . ../processing-${version}-macos-${dist.suffix}.zip" /> |
902 | 906 | </exec> |
|
1064 | 1068 | <target name="linux-dist" depends="linux-build" |
1065 | 1069 | description="Build .tar.gz of linux version"> |
1066 | 1070 |
|
1067 | | - <!-- |
1068 | | - <tar compression="gzip" destfile="linux/processing-${version}.tgz"> |
1069 | | - <tarfileset dir="linux/work" prefix="processing-${version}" /> |
1070 | | - </tar> |
1071 | | - --> |
| 1071 | + <!-- rename the work folder temporarily --> |
| 1072 | + <move file="linux/work" tofile="linux/processing-${version}" /> |
1072 | 1073 |
|
1073 | | - <!-- rename the work folder temporarily --> |
1074 | | - <move file="linux/work" tofile="linux/processing-${version}" /> |
| 1074 | + <condition property="dist.suffix" value="x64"> |
| 1075 | + <equals arg1="${os.arch}" arg2="amd64" /> |
| 1076 | + </condition> |
1075 | 1077 |
|
1076 | | - <property name="linux.dist" value="linux/processing-${version}-linux-${dist.suffix}.tgz" /> |
| 1078 | + <condition property="dist.suffix" value="arm32"> |
| 1079 | + <equals arg1="${os.arch}" arg2="arm" /> |
| 1080 | + </condition> |
1077 | 1081 |
|
1078 | | - <exec executable="tar"> |
1079 | | - <arg value="--directory=linux" /> |
1080 | | - <arg value="--file=${linux.dist}" /> |
1081 | | - <arg value="-cpz" /> |
1082 | | - <arg value="processing-${version}" /> |
1083 | | - </exec> |
| 1082 | + <condition property="dist.suffix" value="arm64"> |
| 1083 | + <equals arg1="${os.arch}" arg2="aarch64" /> |
| 1084 | + </condition> |
| 1085 | + |
| 1086 | + <property name="linux.dist" value="linux/processing-${version}-linux-${dist.suffix}.tgz" /> |
1084 | 1087 |
|
1085 | | - <!-- put... the candle... back --> |
1086 | | - <!-- (rename the work processing-NNNN version to work) --> |
1087 | | - <move file="linux/processing-${version}" tofile="linux/work" /> |
| 1088 | + <exec executable="tar"> |
| 1089 | + <arg value="--directory=linux" /> |
| 1090 | + <arg value="--file=${linux.dist}" /> |
| 1091 | + <arg value="-cpz" /> |
| 1092 | + <arg value="processing-${version}" /> |
| 1093 | + </exec> |
| 1094 | + |
| 1095 | + <!-- put... the candle... back --> |
| 1096 | + <!-- (rename the work processing-NNNN version to work) --> |
| 1097 | + <move file="linux/processing-${version}" tofile="linux/work" /> |
1088 | 1098 |
|
1089 | 1099 | <echo> |
1090 | 1100 | ======================================================= |
|
1095 | 1105 | </echo> |
1096 | 1106 | </target> |
1097 | 1107 |
|
| 1108 | + <!-- TODO Hasn't been tested for a bit, so this is probably broken... |
| 1109 | + In particular, the JavaScript stanza is unlikely to work |
| 1110 | + in Java 17, but there may be other issues. [fry 220124] --> |
1098 | 1111 | <target name="deb" depends="dist" |
1099 | 1112 | description="Build .deb of the Linux version"> |
1100 | 1113 |
|
|
1325 | 1338 | <target name="windows-dist" depends="windows-build" |
1326 | 1339 | description="Create .zip files of windows version"> |
1327 | 1340 |
|
| 1341 | + <condition property="dist.suffix" value="x64" else="${os.arch}"> |
| 1342 | + <equals arg1="${os.arch}" arg2="amd64" /> |
| 1343 | + </condition> |
| 1344 | + |
1328 | 1345 | <property name="windows.dist" value="windows/processing-${version}-windows-${dist.suffix}.zip" /> |
1329 | 1346 |
|
1330 | 1347 | <zip destfile="${windows.dist}"> |
|
0 commit comments