Skip to content

MacOSX notarization goodies #9538

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

Merged
merged 9 commits into from
Jan 8, 2020
Merged

MacOSX notarization goodies #9538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96f2c05
macosx notarization: added signed avr* tool and some entitlements
cmaglie Dec 16, 2019
9ab9f2b
macosx notarization: rebuild of libastyle
cmaglie Dec 16, 2019
114649b
macosx notarization: signed libjtouchbar
cmaglie Dec 16, 2019
1965398
macosx notarization: signed arduinoOTA
cmaglie Dec 17, 2019
90efa15
macosx notarization: signed liblistSerials
cmaglie Dec 17, 2019
7958bd8
macosx notarization: removed old avr-gcc and avrdude
cmaglie Dec 17, 2019
ab4cf7e
macosx notarization: signed arduino-builder and tools
cmaglie Dec 17, 2019
0de3906
macosx notarization: signed appbundler
cmaglie Dec 17, 2019
b18d8d0
macosx notarization: fixed build for non-mac targets
cmaglie Dec 18, 2019
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
Binary file modified app/lib/jtouchbar-1.0.0.jar
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions build/arduino-builder-macosx-1.5.0-signed.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8c8cda0f1b02e846f9724eb3e6cfd28864a47942
1 change: 0 additions & 1 deletion build/arduino-builder-macosx-1.5.0.tar.bz2.sha
View file
Open in desktop

This file was deleted.

46 changes: 24 additions & 22 deletions build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<property name="portable" value="false" />

<property name="ARDUINO-BUILDER-VERSION" value="1.5.0" />
<property name="LIBLISTSERIAL-VERSION" value="1.4.2" />
<property name="LIBLISTSERIAL-VERSION" value="1.4.2-2" />
<property name="AVRGCC-VERSION" value="7.3.0-atmel3.6.1-arduino5" />
<property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
<property name="AVRCORE-VERSION" value="1.8.2" />
Expand Down Expand Up @@ -400,13 +400,13 @@
<mkdir dir="${staging_folder}/work" />

<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino5.jar.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip" />
<param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
</antcall>

<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino4/appbundler-1.0ea-arduino4.jar"/>
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino5/appbundler-1.0ea-arduino5.jar"/>

<bundleapp
jvmRequired="1.8"
Expand Down Expand Up @@ -484,8 +484,8 @@
</antcall>

<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1-4.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
<param name="archive_file" value="./libastylej-2.05.1-5.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
Expand All @@ -503,6 +503,7 @@
<copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />

<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="-signed" />
<antcall target="build-arduino-builder" />

<antcall target="portable-${portable}">
Expand All @@ -514,11 +515,11 @@
<target name="macosx-build-avr-toolchain" unless="light_bundle">
<antcall target="avr-toolchain-bundle">
<param name="unpack_target" value="untar-native"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-apple-darwin14.tar.bz2"/>
<param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-apple-darwin14-signed.tar.bz2"/>
<param name="gcc_version" value="${AVRGCC-VERSION}"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-apple-darwin12.tar.bz2"/>
<param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-apple-darwin12-signed.tar.bz2"/>
<param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-darwin_amd64.tar.bz2"/>
<param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-darwin_amd64-signed.tar.bz2"/>
<param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
</antcall>

Expand Down Expand Up @@ -556,7 +557,7 @@

<!-- Sign app -->
<exec executable="codesign" dir="macosx/work" failonerror="true">
<arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; --deep -v Arduino.app/" />
<arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; --timestamp --options runtime --deep -v Arduino.app/" />
</exec>

<!-- Check for successful signing -->
Expand Down Expand Up @@ -672,8 +673,8 @@

<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1-4.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
<param name="archive_file" value="./libastylej-2.05.1-5.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
Expand All @@ -697,8 +698,8 @@

<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1-4.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
<param name="archive_file" value="./libastylej-2.05.1-5.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
Expand Down Expand Up @@ -740,8 +741,8 @@

<target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1-4.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
<param name="archive_file" value="./libastylej-2.05.1-5.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
Expand Down Expand Up @@ -853,11 +854,12 @@
</target>

<target name="build-arduino-builder" unless="no_arduino_builder">
<property name="ARDUINO-BUILDER-EXTRA-VERSION" value="" /> <!-- default if not set already -->
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
<mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
<antcall target="untar-native">
<param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
<param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}${ARDUINO-BUILDER-EXTRA-VERSION}.tar.bz2" />
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}${ARDUINO-BUILDER-EXTRA-VERSION}.tar.bz2" />
<param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
<param name="dest_folder" value="${staging_folder}/arduino-builder-${platform}" />
</antcall>
Expand Down Expand Up @@ -1059,8 +1061,8 @@
<antcall target="windows-build-avr-toolchain" />

<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.05.1-4.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
<param name="archive_file" value="./libastylej-2.05.1-5.zip" />
<param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
<param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
Expand Down
1 change: 0 additions & 1 deletion build/libastylej-2.05.1-4.zip.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/libastylej-2.05.1-5.zip.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06032c6429c8cdd74e5b94cceaa2785987e442e0
1 change: 0 additions & 1 deletion build/liblistSerials-1.4.0-2.zip.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/liblistSerials-1.4.2-2.zip.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b6ddea08153ab811e90482007619d7997f48a02d
1 change: 0 additions & 1 deletion build/liblistSerials-1.4.2.zip.sha
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion build/macosx/appbundler-1.0ea-arduino4.jar.zip.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d7734ca84b802d2b65137b9fc0ee01c5f2108ff0
1 change: 0 additions & 1 deletion build/macosx/arduinoOTA-1.2.1-darwin_amd64.tar.bz2.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/macosx/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
648aa2df70113520a9d143a49e985552f3508023
1 change: 0 additions & 1 deletion build/macosx/arduinoOTA-1.3.0-darwin_amd64.tar.bz2.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c641845446426e3fabf5d1b3f01ef7921ae227cf
1 change: 0 additions & 1 deletion build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14.tar.bz2.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0694b2f647b9cf847e38dacd6b54c6a8591dc323
1 change: 0 additions & 1 deletion build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12.tar.bz2.sha
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions build/macosx/gcc.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
</dict>
</plist>
16 changes: 16 additions & 0 deletions build/macosx/jre2.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
</dict>
</plist>