Skip to content

Commit bfbd925

Browse files
author
Federico Fissore
committed
fixing macosx signed build
1 parent 6fa49ab commit bfbd925

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ hardware/arduino/bootloaders/caterina_LUFA/.dep/
1616
build/windows/work/
1717
build/windows/arduino-*.zip
1818
build/windows/dist/gcc-*.tar.gz
19+
build/macosx/arduino-*.zip
20+
build/macosx/dist/gcc-*.tar.gz
1921
build/linux/work/
2022
build/linux/dist/*.tar.gz
2123
build/linux/*.tgz

build/build.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,9 @@
287287
<delete dir="macosx/work/Arduino.app" />
288288

289289
<!-- Unzip unsigned app into working dir -->
290-
<unzip dest="macosx/work" src="macosx/arduino-${version}-${platform}.zip" overwrite="false"/>
290+
<exec executable="unzip" dir="macosx/work">
291+
<arg line="../arduino-${version}-${platform}.zip" />
292+
</exec>
291293

292294
<!-- Unlock keychain file -->
293295
<exec executable="security" dir="macosx/work">
@@ -299,9 +301,11 @@
299301
<arg line="--keychain &quot;${macosx-sign-keychain}&quot; -s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
300302
</exec>
301303

304+
<delete file="macosx/arduino-${version}-${platform}.zip" />
305+
302306
<!-- Create signed zip file -->
303307
<exec executable="zip" dir="macosx/work">
304-
<arg line="-q -r ../arduino-${version}-${platform}-signed.zip ." />
308+
<arg line="-q -r ../arduino-${version}-${platform}.zip ." />
305309
</exec>
306310

307311
<echo>
@@ -349,7 +353,7 @@
349353
=======================================================
350354
Arduino for Mac OS X was built. Grab the image from
351355

352-
build/macosx/arduino-${version}-${platform}.zip
356+
macosx/arduino-${version}-${platform}.zip
353357
=======================================================
354358
</echo>
355359
</target>

0 commit comments

Comments
 (0)