Skip to content

Commit 9a05c29

Browse files
authored
Merge pull request DrJavaAtRice#8 from elsaturnino/master
Build macOS app using AppBundler
2 parents 86ebec4 + 33ca156 commit 9a05c29

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
@@ -780,31 +780,28 @@
780780
</target>
781781

782782
<target name="mac-app" depends="jar, assert-jar-exists, resolve-version-tag">
783-
<echo message="Creating ${version-tag}-osx.tar.gz" />
783+
<echo message="Creating ${version-tag}-osx.zip" />
784+
<taskdef name="bundleapp"
785+
classname="com.oracle.appbundler.AppBundlerTask"
786+
classpath="lib/buildlib/appbundler-1.0.jar" />
784787
<property name="mac-app-dir" value="${version-tag}/osx" />
785788
<mkdir dir="${mac-app-dir}" />
786-
<copy todir="${mac-app-dir}/${readable-project-name}.app" >
787-
<fileset dir="packaging/mac/${readable-project-name}.app" excludes="**/*jar-goes-here" />
788-
</copy>
789-
<copy todir="${mac-app-dir}/${readable-project-name}.app" overwrite="yes" >
790-
<fileset dir="packaging/mac/${readable-project-name}.app">
791-
<include name="**/*.plist" />
792-
<include name="**/*.xml" />
793-
</fileset>
794-
<filterset>
795-
<filter token="VERSION" value="${version-tag}" />
796-
</filterset>
797-
</copy>
798-
<copy file="${ant.project.name}.jar"
799-
todir="${mac-app-dir}/${readable-project-name}.app/Contents/Resources/Java" />
800-
<!-- A .zip file would be more convenient, because it unzips in one step. Unfortunately,
801-
permissions in .zip files don't seem to be supported before OS X 10.5. -->
802-
<tar tarfile="${version-tag}-osx.tar.gz" compression="gzip">
803-
<tarfileset dir="${mac-app-dir}" includes="${readable-project-name}.app/**"
804-
excludes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
805-
<tarfileset dir="${mac-app-dir}" mode="755"
806-
includes="${readable-project-name}.app/Contents/MacOS/${readable-project-name}" />
807-
</tar>
789+
<bundleapp outputdirectory="${mac-app-dir}"
790+
name="DrJava"
791+
displayname="DrJava"
792+
icon="packaging/mac/DrJava.icns"
793+
signature="DrJa"
794+
shortversion="${version-tag}"
795+
identifier="edu.rice.cs.drjava.DrJava"
796+
mainclassname="edu.rice.cs.drjava.DrJava">
797+
<classpath file="drjava.jar" />
798+
</bundleapp>
799+
<zip destfile="${version-tag}-osx.zip">
800+
<zipfileset dir="${mac-app-dir}"
801+
excludes="${readable-project-name}.app/Contents/MacOS/JavaAppLauncher" />
802+
<zipfileset dir="${mac-app-dir}" filemode="755"
803+
includes="${readable-project-name}.app/Contents/MacOS/JavaAppLauncher" />
804+
</zip>
808805
</target>
809806

810807
<target name="windows-app" depends="assert-launch4j-exists, jar, assert-jar-exists, resolve-version-tag">
130 KB
Binary file not shown.

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

Lines changed: 0 additions & 73 deletions
This file was deleted.
-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)