Skip to content

Commit 33ca156

Browse files
SatGarciaSatGarcia
committed
mac app builds using oracle's appbuilder, making it more suitable for a post-AppleJava 1.6 world
1 parent d4f7356 commit 33ca156

File tree

7 files changed

+20
-97
lines changed

7 files changed

+20
-97
lines changed

‎drjava/build.xml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -794,31 +794,28 @@
794794
</target>
795795

796796
<target name="mac-app" depends="jar, assert-jar-exists, resolve-version-tag">
797-
<echo message="Creating ${version-tag}-osx.tar.gz" />
797+
<echo message="Creating ${version-tag}-osx.zip" />
798+
<taskdef name="bundleapp"
799+
classname="com.oracle.appbundler.AppBundlerTask"
800+
classpath="lib/buildlib/appbundler-1.0.jar" />
798801
<property name="mac-app-dir" value="${version-tag}/osx" />
799802
<mkdir dir="${mac-app-dir}" />
800-
<copy todir="${mac-app-dir}/${readable-project-name}.app" >
801-
<fileset dir="packaging/mac/${readable-project-name}.app" excludes="**/*jar-goes-here" />
802-
</copy>
803-
<copy todir="${mac-app-dir}/${readable-project-name}.app" overwrite="yes" >
804-
<fileset dir="packaging/mac/${readable-project-name}.app">
805-
<include name="**/*.plist" />
806-
<include name="**/*.xml" />
807-
</fileset>
808-
<filterset>
809-
<filter token="VERSION" value="${version-tag}" />
810-
</filterset>
811-
</copy>
812-
<copy file="${ant.project.name}.jar"
813-
todir="${mac-app-dir}/${readable-project-name}.app/Contents/Resources/Java" />
814-
<!-- A .zip file would be more convenient, because it unzips in one step. Unfortunately,
815-
permissions in .zip files don't seem to be supported before OS X 10.5. -->
816-
<tar tarfile="${version-tag}-osx.tar.gz" compression="gzip">
817-
<tarfileset dir="${mac-app-dir}" includes="${readable-project-name}.app/**"
818-
excludes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
819-
<tarfileset dir="${mac-app-dir}" mode="755"
820-
includes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
821-
</tar>
803+
<bundleapp outputdirectory="${mac-app-dir}"
804+
name="DrJava"
805+
displayname="DrJava"
806+
icon="packaging/mac/DrJava.icns"
807+
signature="DrJa"
808+
shortversion="${version-tag}"
809+
identifier="edu.rice.cs.drjava.DrJava"
810+
mainclassname="edu.rice.cs.drjava.DrJava">
811+
<classpath file="drjava.jar" />
812+
</bundleapp>
813+
<zip destfile="${version-tag}-osx.zip">
814+
<zipfileset dir="${mac-app-dir}"
815+
excludes="${readable-project-name}.app/Contents/MacOS/JavaAppLauncher" />
816+
<zipfileset dir="${mac-app-dir}" filemode="755"
817+
includes="${readable-project-name}.app/Contents/MacOS/JavaAppLauncher" />
818+
</zip>
822819
</target>
823820

824821
<target name="windows-app" depends="assert-launch4j-exists, jar, assert-jar-exists, resolve-version-tag">

‎drjava/lib/buildlib/appbundler-1.0.jar‎

130 KB
Binary file not shown.

‎drjava/packaging/mac/DrJava.app/Contents/Info.plist‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎drjava/packaging/mac/DrJava.app/Contents/MacOS/DrJava‎

-57.8 KB
Binary file not shown.

‎drjava/packaging/mac/DrJava.app/Contents/PkgInfo‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎drjava/packaging/mac/DrJava.app/Contents/Resources/Java/DrJava.jar-goes-here‎

Whitespace-only changes.

drjava/packaging/mac/DrJava.app/Contents/Resources/DrJava.icns renamed to drjava/packaging/mac/DrJava.icns

File renamed without changes.

0 commit comments

Comments
 (0)