Menu
▾
▴
[Phex-svn] SF.net SVN: phex: [3408] phex/trunk/build
|
From: <gr...@us...> - 2006-04-24 15:50:27
|
Revision: 3408 Author: gregork Date: 2006-04-24 08:50:09 -0700 (Mon, 24 Apr 2006) ViewCVS: http://svn.sourceforge.net/phex/?rev=3408&view=rev Log Message: ----------- improved osx release build process using ant jarbuilder. Modified Paths: -------------- phex/trunk/build/release.osx.xml Added Paths: ----------- phex/trunk/thirdparty/apple/lib/jarbundler-1.8.1.jar Removed Paths: ------------- phex/trunk/native/macosx/Phex.app/Contents/PkgInfo Modified: phex/trunk/build/release.osx.xml =================================================================== --- phex/trunk/build/release.osx.xml 2006-04-23 21:21:29 UTC (rev 3407) +++ phex/trunk/build/release.osx.xml 2006-04-24 15:50:09 UTC (rev 3408) @@ -4,73 +4,75 @@ <property name="osx.build.dir" value="${releasedir}/phex_${phex.FullPhexVersion}/osx${create.postfix}" /> <property name="osx.buildSrc.dir" value="${releasedir}/phex_${phex.FullPhexVersion}/osx${create.postfix}/build" /> - <available file="${osx.build.dir}" property="runtime.dir.available" /> - <fail if="runtime.dir.available" /> + <available file="${osx.buildSrc.dir}" property="runtime.dir.available" /> + <fail if="runtime.dir.available"> + The directory '${osx.buildSrc.dir}' is already available. + </fail> <available file="${osx.build.dir}/phex_${phex.FullPhexVersion}.zip" property="runtime.file.available" /> - <fail if="runtime.file.available" /> + <fail if="runtime.file.available"> + The file '${osx.build.dir}/phex_${phex.FullPhexVersion}.zip' is already available. + </fail> - <!-- create directory structure --> + <!-- start jar builder to create the app --> + <taskdef name="jarbundler" classpath="${project.thirdparty}/apple/lib/jarbundler-1.8.1.jar" classname="net.sourceforge.jarbundler.JarBundler" /> <mkdir dir="${osx.buildSrc.dir}" /> - <mkdir dir="${osx.buildSrc.dir}/Phex.app" /> - <mkdir dir="${osx.buildSrc.dir}/Phex.app" /> - <mkdir dir="${osx.buildSrc.dir}/Phex.app/Contents" /> - <mkdir dir="${osx.buildSrc.dir}/Phex.app/Contents/MacOS" /> - <mkdir dir="${osx.buildSrc.dir}/Phex.app/Contents/Resources" /> - <property name="javadir" value="${osx.buildSrc.dir}/Phex.app/Contents/Resources/Java" /> - <mkdir dir="${javadir}" /> - <!--copy all librarys--> - <copy file="${sun.jaxb.lib}/jaxb.jar" todir="${javadir}" /> - <copy file="${apache.logging.lib}/commons-logging.jar" todir="${javadir}" /> - <copy file="${apache.httpclient.lib}/commons-httpclient-3.0.jar" todir="${javadir}" /> - <copy file="${jgoodies.forms.lib}/forms-1.0.6.jar" todir="${javadir}" /> - <copy file="${jgoodies.looks.lib}/looks-2.0.1.jar" todir="${javadir}" /> - <!--copy native stuff--> - <copy todir="${osx.buildSrc.dir}/Phex.app/Contents" filtering="yes"> - <fileset dir="native/macosx/Phex.app/Contents"> - <include name="Info.plist" /> - </fileset> - </copy> - <copy todir="${osx.buildSrc.dir}/Phex.app/Contents"> - <fileset dir="native/macosx/Phex.app/Contents"> - <include name="PkgInfo" /> - <include name="MacOS/JavaApplicationStub" /> - </fileset> - </copy> - <chmod file="${osx.buildSrc.dir}/Phex.app/Contents/PkgInfo" perm="755" /> - <chmod file="${osx.buildSrc.dir}/Phex.app/Contents/MacOS/JavaApplicationStub" perm="755" /> - <copy todir="${osx.buildSrc.dir}/Phex.app/Contents/Resources"> - <fileset dir="native/macosx/Phex.app/Contents/Resources"> - <include name="magma-icon.icns" /> - <include name="phex-osx.icns" /> - <include name="rss-icon.png" /> - <include name="Java/magma-icon.icns" /> - </fileset> - </copy> - <!--copy phex jar--> - <copy file="${project.output}/phex.jar" todir="${javadir}" /> - <!--copy phex urls--> - <copy file="installer/P h e x Homepage.url" todir="${javadir}" /> - <!--copy doc files--> - <mkdir dir="${osx.buildSrc.dir}/Phex.app/Contents/Resources/Java/docs" /> - <copy todir="${osx.buildSrc.dir}/Phex.app/Contents/Resources/Java/docs"> + <jarbundler dir="${osx.buildSrc.dir}" verbose="true" name="Phex" + mainclass="phex.Main" + icon="native/macosx/Phex.app/Contents/Resources/phex-osx.icns" + stubfile="native/macosx/Phex.app/Contents/MacOS/JavaApplicationStub" + bundleid="org.phex" build="${phex.FullPhexVersion}" + version="${phex.Program.Version}" infostring="Phex ${phex.Program.Version}" + jvmversion="1.4*"> + <jarfileset dir="${project.output}"> + <include name="jaxb.jar" /> + <include name="commons-logging.jar" /> + <include name="commons-httpclient-3.0.jar" /> + <include name="forms-1.0.6.jar" /> + <include name="looks-2.0.1.jar" /> + <include name="phex.jar" /> + </jarfileset> + <!-- Adds files to Resources/readme which is not exactly what we like. + <resourcefileset dir="docs/Phex"> + <include name="readme/Phex_win.htm" /> + <include name="readme/Phex_other.htm" /> + <include name="readme/Undocumented.htm" /> + </resourcefileset> --> + <documenttype name="MAGMA List (MAGnet MAnifest)" extensions="magma" iconfile="native/macosx/Phex.app/Contents/Resources/magma-icon.icns" role="viewer" /> + <javaproperty name="apple.laf.useScreenMenuBar" value="true" /> + </jarbundler> + + + <!-- alternative resource file copy --> + <property name="osx.resource.path" value="${osx.buildSrc.dir}/Phex.app/Contents/Resources" /> + <mkdir dir="${osx.resource.path}/Docs" /> + <copy todir="${osx.resource.path}/Docs"> <fileset dir="docs/Phex"> <include name="license/GPL.txt" /> </fileset> </copy> - <copy todir="${osx.buildSrc.dir}/Phex.app/Contents/Resources/Java/docs" filtering="yes"> + <copy todir="${osx.resource.path}/Docs" filtering="yes"> <fileset dir="docs/Phex"> <include name="readme/Phex_win.htm" /> <include name="readme/Phex_other.htm" /> <include name="readme/Undocumented.htm" /> </fileset> </copy> + <copy file="installer/P h e x Homepage.url" todir="${osx.resource.path}/Docs" /> <!-- copy subscription file in case user requested --> <ant antfile="${project.build}/makeRelease.xml" target="-copySubscriptionFile" inheritAll="true"> - <property name="subscriptionDir" value="${javadir}/ext"/> - </ant> - + <property name="subscriptionDir" value="${osx.resource.path}/Java/ext" /> + </ant> + + <!-- do some post operation to set executable flags (does it help?) --> + <chmod file="${osx.buildSrc.dir}/Phex.app/Contents/PkgInfo" perm="755" /> + <chmod file="${osx.buildSrc.dir}/Phex.app/Contents/MacOS/JavaApplicationStub" perm="755" /> + <zip zipfile="${osx.build.dir}/phex_${phex.FullPhexVersion}_osx.zip" update="false"> - <zipfileset dir="${osx.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}" /> + <zipfileset dir="${osx.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}"> + <excludesfile name="${osx.buildSrc.dir}/Phex.app/Contents/PkgInfo" /> + <excludesfile name="${osx.buildSrc.dir}/Phex.app/Contents/MacOS/JavaApplicationStub" /> + </zipfileset> + <zipfileset dir="${osx.buildSrc.dir}/Phex.app/Contents" prefix="phex_${phex.FullPhexVersion}" includes="PkgInfo MacOS/JavaApplicationStub" filemode="755" /> </zip> </target> </project> \ No newline at end of file Deleted: phex/trunk/native/macosx/Phex.app/Contents/PkgInfo =================================================================== --- phex/trunk/native/macosx/Phex.app/Contents/PkgInfo 2006-04-23 21:21:29 UTC (rev 3407) +++ phex/trunk/native/macosx/Phex.app/Contents/PkgInfo 2006-04-24 15:50:09 UTC (rev 3408) @@ -1 +0,0 @@ -APPL???? \ No newline at end of file Added: phex/trunk/thirdparty/apple/lib/jarbundler-1.8.1.jar =================================================================== (Binary files differ) Property changes on: phex/trunk/thirdparty/apple/lib/jarbundler-1.8.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |