rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

MacOSX: removed pre 10.7 build.xml portions and files

Browse Source
This commit is contained in:
Federico Fissore 2015-07-06 09:25:37 +02:00
parent e4a3033d2b
commit 8df0fbfbb3
12 changed files with 6 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
build/build.xml
View File

@ -15,12 +15,14 @@
<matches string="${os.version}" pattern="^10.[56]." />
</and>
</condition>
<condition property="macosx-old"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<fail if="macosx-old" message="MacOSX older than 10.7 are not supported"/>
<condition property="platform" value="macosx"><os family="mac" /></condition>
<condition property="platform" value="windows"><os family="windows" /></condition>
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
<condition property="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
@ -29,13 +31,11 @@
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx-old" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
@ -247,10 +247,7 @@
<!-- - - - - - - - -->
<!-- Mac OS X -->
<!-- - - - - - - - -->
<target name="macosx-clean" depends="macosx-old-clean" description="Clean Mac OS X build"/>
<target name="macosx-old-clean" depends="subprojects-clean" description="Clean Mac OS X build">
<target name="macosx-clean" depends="subprojects-clean" description="Clean Mac OS X build">
<delete dir="macosx/work" />
<delete dir="macosx/working_dir" />
<delete dir="macosx/working.dmg" />
@ -271,35 +268,6 @@
<fail message="wrong platform (${os.name})" />
</target>
<target name="macosx-old-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
<mkdir dir="macosx/work" />
<mkdir dir="macosx/work/${staging_hardware_folder}" />
<!-- assemble the pde -->
<copy todir="macosx/work/Arduino.app">
<fileset dir="macosx/template.app" includes="**"/>
</copy>
<chmod file="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="755" />
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java" flatten="true">
<fileset refid="runtime.jars"/>
</copy>
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java">
<fileset dir="shared" includes="lib/**" />
<fileset file="shared/revisions.txt" />
</copy>
<antcall target="macosx-build-common"/>
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
token="VERSION" value="${version}" />
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
token="REVISION" value="${revision}" />
</target>
<target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
<fail unless="MACOSX_BUNDLED_JVM" message="MacOSX requires MACOSX_BUNDLED_JVM property set"/>
<mkdir dir="${staging_folder}/work" />
@ -324,7 +292,7 @@
shortversion="${version}"
version="${revision}"
signature="Pde1"
icon="macosx/template.app/Contents/Resources/processing.icns"
icon="macosx/processing.icns"
mainclassname="processing.app.Base"
copyright="Arduino LLC"
applicationCategory="public.app-category.education"
@ -365,7 +333,7 @@
<option value="-splash:$APP_ROOT/Contents/Java/lib/splash.png"/>
<bundledocument extensions="ino,c,cpp,h"
icon="macosx/template.app/Contents/Resources/pde.icns"
icon="macosx/pde.icns"
name="Arduino Source File"
role="Editor" ispackage="false">
</bundledocument>
@ -424,18 +392,10 @@
</chmod>
</target>
<target name="macosx-old-run" depends="macosx-old-build" description="Run Mac OS X version">
<antcall target="macosx-run-common"/>
</target>
<target name="macosx-run" depends="build" description="Run Mac OS X version">
<antcall target="macosx-run-common"/>
</target>
<target name="macosx-old-debug" depends="macosx-old-build" description="Run Mac OS X version">
<antcall target="macosx-debug-common"/>
</target>
<target name="macosx-debug" depends="build" description="Run Mac OS X version">
<antcall target="macosx-debug-common"/>
</target>
@ -507,10 +467,6 @@
<!-- - - - - - - - - - - - - - - - - - - -->
<!-- Build distribution file for MacOSX. -->
<!-- - - - - - - - - - - - - - - - - - - -->
<target name="macosx-old-dist" if="macosx" depends="macosx-old-build" description="Create a downloadable .zip for the Mac OS X version">
<antcall target="macosx-dist-common"/>
</target>
<target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
<antcall target="macosx-dist-common"/>
</target>
@ -529,71 +485,6 @@
</echo>
</target>
<!--<target name="macosx-dist-old" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">-->
<!--&lt;!&ndash; now build the dmg &ndash;&gt;-->
<!--<gunzip src="macosx/template.dmg.gz" dest="macosx/working.dmg" />-->
<!--<mkdir dir="macosx/working_dir" />-->
<!--<exec executable="hdiutil">-->
<!--<arg line="attach macosx/working.dmg -noautoopen -mountpoint macosx/working_dir" />-->
<!--&lt;!&ndash;<arg line="attach macosx/working.dmg -noautoopen -quiet -mountpoint macosx/working_dir" />&ndash;&gt;-->
<!--</exec>-->
<!--<copy todir="macosx/working_dir">-->
<!--<fileset dir="macosx/work" />-->
<!--</copy>-->
<!--&lt;!&ndash; The ant copy command does not preserve permissions. &ndash;&gt;-->
<!--<chmod file="macosx/working_dir/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />-->
<!--<chmod perm="+x">-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/3.4.6/" includes="**/cc1*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />-->
<!--</chmod>-->
<!--&lt;!&ndash; Pause briefly for the OS to catch up with the DMG changes. -->
<!--This prevents "hdiutil: couldn't eject "disk3" - Resource busy"-->
<!--errors when ejecting the disk in the next step.-->
<!--You may need to set this value higher for your system. &ndash;&gt;-->
<!--<sleep seconds="3" />-->
<!--<exec executable="hdiutil">-->
<!--&lt;!&ndash;<arg line="detach macosx/working_dir -quiet -force" />&ndash;&gt;-->
<!--<arg line="detach macosx/working_dir" />-->
<!--</exec>-->
<!--<delete file="macosx/arduino-*.dmg" />-->
<!--<exec executable="hdiutil">-->
<!--<arg line="convert macosx/working.dmg -quiet -format UDZO -imagekey zlib-level=9 -o macosx/arduino-${version}.dmg" />-->
<!--</exec>-->
<!--&lt;!&ndash; Clean up the interim files. &ndash;&gt;-->
<!--<delete file="macosx/working.dmg" />-->
<!--<delete dir="macosx/working_dir" />-->
<!--<echo>-->
<!--=======================================================-->
<!--Arduino for Mac OS X was built. Grab the image from-->
<!--macosx/arduino-${version}.dmg-->
<!--=======================================================-->
<!--</echo>-->
<!--</target>-->
<!--<target name="macosx-dist-old-fix-perms" unless="light_bundle">-->
<!--<chmod perm="+x">-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/3.4.6/" includes="**/cc1*" />-->
<!--<fileset dir="macosx/working_dir/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />-->
<!--</chmod>-->
<!--</target>-->
<!-- - - - - - - - -->
<!-- Linux -->
<!-- - - - - - - - -->

0
build/macosx/template.app/Contents/Resources/pde.icns → build/macosx/pde.icns
View File

0
build/macosx/template.app/Contents/Resources/processing.icns → build/macosx/processing.icns
View File

137
build/macosx/template.app/Contents/Info.plist
View File

@ -1,137 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<dict>
<key>CFBundleName</key>
<string>Arduino</string>
<!-- all these need to change for new releases -->
<key>CFBundleGetInfoString</key>
<string>VERSION</string>
<key>CFBundleVersion</key>
<string>REVISION</string>
<key>CFBundleShortVersionString</key>
<string>VERSION</string>
<!-- now stop changing things and get outta here -->
<key>NSHighResolutionCapable</key>
<true/>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>CFBundleExecutable</key>
<string>JavaApplicationStub</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>Pde1</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIconFile</key>
<string>processing.icns</string>
<key>CFBundleIdentifier</key>
<string>cc.arduino.Arduino</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>ino</string>
<string>c</string>
<string>cpp</string>
<string>h</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>pde.icns</string>
<key>CFBundleTypeName</key>
<string>Arduino Source File</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>text/plain</string>
</array>
<key>CFBundleTypeOSTypes</key>
<array>
<string>TEXT</string>
</array>
<key>CFBundleTypeRole</key>
<string>Editor</string>
</dict>
</array>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.c-plus-plus-source</string>
</array>
<key>UTTypeIdentifier</key>
<string>cc.arduino.Arduino.source</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>ino</string>
</array>
</dict>
</dict>
</array>
<key>Java</key>
<dict>
<key>VMOptions</key>
<array>
<string>-Xms128M</string>
<string>-Xmx512M</string>
</array>
<key>MainClass</key>
<string>processing.app.Base</string>
<key>SplashFile</key>
<string>$APP_PACKAGE/Contents/Resources/Java/lib/splash.png</string>
<key>JVMVersion</key>
<string>1.6*</string>
<key>ClassPath</key>
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
it can cause problems if users have installed weird files there.
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
<string>$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/bcpg-jdk15on-152.jar:$JAVAROOT/bcprov-jdk15on-152.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-lang3-3.3.2.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/guava-18.0.jar:$JAVAROOT/jackson-annotations-2.2.3.jar:$JAVAROOT/jackson-core-2.2.3.jar:$JAVAROOT/jackson-databind-2.2.3.jar:$JAVAROOT/jackson-module-mrbean-2.2.3.jar:$JAVAROOT/java-semver-0.8.0.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/pde.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/rsyntaxtextarea-2.5.6.1+arduino.jar</string>
<key>JVMArchs</key>
<array>
<!--<string>x86_64</string>--> <!-- currently no 64 bit support -->
<string>i386</string>
<string>ppc</string>
</array>
<!-- More properties can be found in http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
<key>Properties</key>
<dict>
<!-- Pass the full path of Contents/Resources/Java to the PDE -->
<key>javaroot</key>
<string>$JAVAROOT</string>
<!-- as of 1.0.8, it's safe to use this option again -->
<key>apple.laf.useScreenMenuBar</key>
<string>true</string>
<key>apple.awt.showGrowBox</key>
<string>false</string>
<key>com.apple.smallTabs</key>
<string>true</string>
<key>apple.awt.Antialiasing</key>
<string>false</string>
<key>apple.awt.TextAntialiasing</key>
<string>true</string>
<key>com.apple.hwaccel</key>
<string>true</string>
<key>apple.awt.use-file-dialog-packages</key>
<string>false</string>
<key>apple.awt.graphics.UseQuartz</key>
<string>true</string>
</dict>
</dict>
</dict>
</plist>

BIN
build/macosx/template.app/Contents/MacOS/JavaApplicationStub
View File

Binary file not shown.

1
build/macosx/template.app/Contents/PkgInfo
View File

@ -1 +0,0 @@
APPLPde1

BIN
build/macosx/template.app/Contents/Resources/Java/libquaqua.jnilib
View File

Binary file not shown.

BIN
build/macosx/template.app/Contents/Resources/Java/libquaqua64.dylib
View File

Binary file not shown.

BIN
build/macosx/template.app/Contents/Resources/Java/libquaqua64.jnilib
View File

Binary file not shown.

0
build/macosx/template.app/Contents/Resources/Java/quaqua.LICENSE.BSD.LGPL-2.1.txt
View File

BIN
build/macosx/template.app/Contents/Resources/Java/quaqua.jar
View File

Binary file not shown.

BIN
build/macosx/template.dmg.gz
View File

Binary file not shown.