You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2006/07/31 19:41:24 UTC
svn commit: r427181 - in /incubator/abdera/java:
branches/0.1.0/build/build.xml trunk/build/build.xml
Author: jmsnell
Date: Mon Jul 31 10:41:24 2006
New Revision: 427181
URL: http://svn.apache.org/viewvc?rev=427181&view=rev
Log:
Creating a better MANIFEST.MF file. Probably need to check on what Maven does.
Modified:
incubator/abdera/java/branches/0.1.0/build/build.xml
incubator/abdera/java/trunk/build/build.xml
Modified: incubator/abdera/java/branches/0.1.0/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/0.1.0/build/build.xml?rev=427181&r1=427180&r2=427181&view=diff
==============================================================================
--- incubator/abdera/java/branches/0.1.0/build/build.xml (original)
+++ incubator/abdera/java/branches/0.1.0/build/build.xml Mon Jul 31 10:41:24 2006
@@ -144,6 +144,16 @@
</and>
</condition>
+ <mkdir dir="${work}" />
+ <manifest file="${work}/MANIFEST.MF">
+ <attribute name="Specification-Title" value="Apache Abdera"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ <attribute name="Specification-Vendor" value="The Apache Software Foundation - Incubator"/>
+ <attribute name="Implementation-Title" value="org.apache.abdera"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation - Incubator"/>
+ </manifest>
+
<echo>Building Security? ${do.security}</echo>
<antcall target="download"/>
@@ -165,7 +175,7 @@
<include name="LICENSE" />
<include name="NOTICE" />
</fileset>
- </copy>
+ </copy>
</target>
<target name="compile.parser" depends="init,compile.core">
@@ -301,10 +311,10 @@
<target name="dist" depends="clean,build,test,docs">
<mkdir dir="${dist}" />
<mkdir dir="${dist_lib}" />
- <jar destfile="${core.jar}" basedir="${core.work}" />
- <jar destfile="${parser.jar}" basedir="${parser.work}" />
- <jar destfile="${server.jar}" basedir="${server.work}" />
- <jar destfile="${extensions.jar}" basedir="${extensions.work}" />
+ <jar destfile="${core.jar}" basedir="${core.work}" manifest="${work}/MANIFEST.MF"/>
+ <jar destfile="${parser.jar}" basedir="${parser.work}" manifest="${work}/MANIFEST.MF" />
+ <jar destfile="${server.jar}" basedir="${server.work}" manifest="${work}/MANIFEST.MF" />
+ <jar destfile="${extensions.jar}" basedir="${extensions.work}" manifest="${work}/MANIFEST.MF" />
<antcall target="dist.security" />
<copy todir="${dist_lib}">
<fileset dir="${dependencies}" />
@@ -314,7 +324,7 @@
</target>
<target name="dist.security" if="do.security">
- <jar destfile="${security.jar}" basedir="${security.work}" />
+ <jar destfile="${security.jar}" basedir="${security.work}" manifest="${work}/MANIFEST.MF" />
</target>
<target name="zip" depends="retro">
Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=427181&r1=427180&r2=427181&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Mon Jul 31 10:41:24 2006
@@ -144,6 +144,16 @@
</and>
</condition>
+ <mkdir dir="${work}" />
+ <manifest file="${work}/MANIFEST.MF">
+ <attribute name="Specification-Title" value="Apache Abdera"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ <attribute name="Specification-Vendor" value="The Apache Software Foundation - Incubator"/>
+ <attribute name="Implementation-Title" value="org.apache.abdera"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation - Incubator"/>
+ </manifest>
+
<echo>Building Security? ${do.security}</echo>
<antcall target="download"/>
@@ -301,10 +311,10 @@
<target name="dist" depends="clean,build,test,docs">
<mkdir dir="${dist}" />
<mkdir dir="${dist_lib}" />
- <jar destfile="${core.jar}" basedir="${core.work}" />
- <jar destfile="${parser.jar}" basedir="${parser.work}" />
- <jar destfile="${server.jar}" basedir="${server.work}" />
- <jar destfile="${extensions.jar}" basedir="${extensions.work}" />
+ <jar destfile="${core.jar}" basedir="${core.work}" manifest="${work}/MANIFEST.MF" />
+ <jar destfile="${parser.jar}" basedir="${parser.work}" manifest="${work}/MANIFEST.MF" />
+ <jar destfile="${server.jar}" basedir="${server.work}" manifest="${work}/MANIFEST.MF" />
+ <jar destfile="${extensions.jar}" basedir="${extensions.work}" manifest="${work}/MANIFEST.MF" />
<antcall target="dist.security" />
<copy todir="${dist_lib}">
<fileset dir="${dependencies}" />
@@ -314,7 +324,7 @@
</target>
<target name="dist.security" if="do.security">
- <jar destfile="${security.jar}" basedir="${security.work}" />
+ <jar destfile="${security.jar}" basedir="${security.work}" manifest="${work}/MANIFEST.MF" />
</target>
<target name="zip" depends="retro">
Re: svn commit: r427181 - in /incubator/abdera/java: branches/0.1.0/build/build.xml
trunk/build/build.xml
Posted by James M Snell <ja...@gmail.com>.
not a problem
Garrett Rooney wrote:
> On 7/31/06, jmsnell@apache.org <jm...@apache.org> wrote:
>> Author: jmsnell
>> Date: Mon Jul 31 10:41:24 2006
>> New Revision: 427181
>>
>> URL: http://svn.apache.org/viewvc?rev=427181&view=rev
>> Log:
>> Creating a better MANIFEST.MF file. Probably need to check on what
>> Maven does.
>
> Could you please not commit to two branches at once. It's incredibly
> bad practice. Commit to trunk and then merge to the 0.1.0 branch
> (preferable), or commit to 0.1.0 and then merge to trunk, but don't do
> both at once.
>
> -garrett
>
Re: svn commit: r427181 - in /incubator/abdera/java: branches/0.1.0/build/build.xml trunk/build/build.xml
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/31/06, jmsnell@apache.org <jm...@apache.org> wrote:
> Author: jmsnell
> Date: Mon Jul 31 10:41:24 2006
> New Revision: 427181
>
> URL: http://svn.apache.org/viewvc?rev=427181&view=rev
> Log:
> Creating a better MANIFEST.MF file. Probably need to check on what Maven does.
Could you please not commit to two branches at once. It's incredibly
bad practice. Commit to trunk and then merge to the 0.1.0 branch
(preferable), or commit to 0.1.0 and then merge to trunk, but don't do
both at once.
-garrett