Author: aadamchik
Date: Sat Sep 16 18:44:26 2006
New Revision: 446994
URL: http://svn.apache.org/viewvc?view=rev&rev=446994
Log:
CAY-656
Added:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/lib/woproject-r3272.jar
(with props)
Removed:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/lib/jarbundler-1.4.jar
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/mac-distro.xml
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/win-distro.xml
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/mac-distro.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/mac-distro.xml?view=diff&rev=446994&r1=446993&r2=446994
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/mac-distro.xml
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/mac-distro.xml
Sat Sep 16 18:44:26 2006
@@ -28,8 +28,8 @@
<property name="build.mac" value="${build}/macosx"/>
<target name="prepare">
- <taskdef name="jarbundler" classpathref="classpath-macosx"
-
classname="com.loomcom.ant.tasks.jarbundler.JarBundler"/>
+ <taskdef name="japplication" classpathref="classpath-macosx"
+ classname="org.objectstyle.woproject.ant.JApplication"/>
<mkdir dir="${dist.mac}"/>
<mkdir dir="${build.mac}/lib"/>
@@ -86,20 +86,17 @@
<delete dir="${dist.mac}/CayenneModeler.app"/>
- <jarbundler dir="${dist.mac}" verbose="true"
name="CayenneModeler"
- mainclass="org.apache.cayenne.modeler.MacOSXMain"
+ <japplication destDir="${dist.mac}" name="CayenneModeler"
+ mainClass="org.apache.cayenne.modeler.MacOSXMain"
icon="${cayenne.other}/platform-macosx/src/resources/CayenneModeler.icns"
- bundleid="org.apache.cayenne.modeler.CayenneModeler"
version="${project.version}"
- infostring="CayenneModeler ${project.version}"
- aboutmenuname="CayenneModeler" jvmversion="1.4+"
signature="CAYM"
- type="APPL" vmoptions="-Xmx500m" smalltabs="true"
- antialiasedgraphics="true" antialiasedtext="true"
liveresize="true"
- growboxintrudes="false" screenmenu="true">
+ longName="CayenneModeler ${project.version}"
+ jvm="1.4+"
+ jvmOptions="-Xmx500m" os="mac">
- <jarfileset dir="${dist}/lib" includes="cayenne.jar"/>
- <jarfileset dir="${dist}/lib/modeler" includes="*.jar"/>
- <jarfileset dir="${build.mac}/lib" includes="*.jar"/>
- </jarbundler>
+ <lib dir="${dist}/lib" includes="cayenne.jar"/>
+ <lib dir="${dist}/lib/modeler" includes="*.jar"/>
+ <lib dir="${build.mac}/lib" includes="*.jar"/>
+ </japplication>
</target>
</project>
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/win-distro.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/win-distro.xml?view=diff&rev=446994&r1=446993&r2=446994
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/win-distro.xml
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/ant/win-distro.xml
Sat Sep 16 18:44:26 2006
@@ -29,6 +29,9 @@
<target name="prepare">
<mkdir dir="${dist.win}"/>
+
+ <taskdef name="japplication" classpathref="classpath-macosx"
+ classname="org.objectstyle.woproject.ant.JApplication"/>
</target>
<target name="zip" depends="prepare,exe">
@@ -58,7 +61,19 @@
<delete file="${build.win}/CayenneModeler.exe"/>
- <!-- assemble a single jar -->
+ <japplication destDir="${dist.mac}" name="CayenneModeler"
+ mainClass="org.apache.cayenne.modeler.MacOSXMain"
+
icon="${cayenne.other}/platform-macosx/src/resources/CayenneModeler.icns"
+ version="${project.version}"
+ longName="CayenneModeler ${project.version}"
+ jvm="1.4+"
+ jvmOptions="-Xmx500m" os="windows">
+
+ <lib dir="${dist}/lib" includes="cayenne.jar"/>
+ <lib dir="${dist}/lib/modeler" includes="*.jar"/>
+ <lib dir="${build.mac}/lib" includes="*.jar"/>
+ </japplication>
+
<mkdir dir="${build.win}/classes"/>
<unjar dest="${build.win}/classes">
<fileset dir="${dist}/lib"
includes="cayenne.jar,modeler/*.jar"/>
Added:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/lib/woproject-r3272.jar
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/lib/woproject-r3272.jar?view=auto&rev=446994
==============================================================================
Binary file - no diff available.
Propchange:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-ant/lib/woproject-r3272.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
