Author: xavier
Date: Wed Dec 19 06:54:03 2007
New Revision: 605559
URL: http://svn.apache.org/viewvc?rev=605559&view=rev
Log:
- make Ivy a PDE project in eclipse to benefit from MANIFEST.MF validation and
ease development of IvyDE
- fix an error in OSGi MANIFEST.MF, a package removed from Ivy shouldn't be
declared as exported any more
Added:
ant/ivy/core/trunk/META-INF/
ant/ivy/core/trunk/META-INF/MANIFEST.MF
- copied, changed from r602317, ant/ivy/core/trunk/MANIFEST.MF
Removed:
ant/ivy/core/trunk/MANIFEST.MF
Modified:
ant/ivy/core/trunk/.project
ant/ivy/core/trunk/build.properties
ant/ivy/core/trunk/build.xml
Modified: ant/ivy/core/trunk/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/.project?rev=605559&r1=605558&r2=605559&view=diff
==============================================================================
--- ant/ivy/core/trunk/.project (original)
+++ ant/ivy/core/trunk/.project Wed Dec 19 06:54:03 2007
@@ -11,12 +11,18 @@
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
</natures>
Copied: ant/ivy/core/trunk/META-INF/MANIFEST.MF (from r602317,
ant/ivy/core/trunk/MANIFEST.MF)
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/META-INF/MANIFEST.MF?p2=ant/ivy/core/trunk/META-INF/MANIFEST.MF&p1=ant/ivy/core/trunk/MANIFEST.MF&r1=602317&r2=605559&rev=605559&view=diff
==============================================================================
--- ant/ivy/core/trunk/MANIFEST.MF (original)
+++ ant/ivy/core/trunk/META-INF/MANIFEST.MF Wed Dec 19 06:54:03 2007
@@ -1,4 +1,5 @@
Manifest-Version: 1.0
+Bundle-Version: 0.0.0
Bundle-Name: Ivy
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.ivy
@@ -70,7 +71,6 @@
org.apache.ivy.plugins.repository.vsftp;version="2.0.0",
org.apache.ivy.plugins.resolver;version="2.0.0",
org.apache.ivy.plugins.resolver.util;version="2.0.0",
- org.apache.ivy.plugins.util;version="2.0.0",
org.apache.ivy.plugins.trigger;version="2.0.0",
org.apache.ivy.plugins.version;version="2.0.0",
org.apache.ivy.tools.analyser;version="2.0.0",
Modified: ant/ivy/core/trunk/build.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.properties?rev=605559&r1=605558&r2=605559&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.properties (original)
+++ ant/ivy/core/trunk/build.properties Wed Dec 19 06:54:03 2007
@@ -48,3 +48,7 @@
test.class.pattern = *Test
+source.. = src/java/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=605559&r1=605558&r2=605559&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Wed Dec 19 06:54:03 2007
@@ -168,7 +168,7 @@
</tstamp>
<property name="version.prefix" value="${target.ivy.version}-local-" />
<property name="build.version" value="${version.prefix}${pubdate}" />
- <property name="bundle.version" value="${target.ivy.bundle.version}" />
+ <property name="bundle.version"
value="${target.ivy.bundle.version}_${pubdate}" />
</target>
<!-- =================================================================
@@ -285,10 +285,23 @@
<echo message="date=${pubdate}${line.separator}"
file="${core.classes.build.dir}/module.properties" append="true" />
<mkdir dir="${artifacts.build.dir}/jars/"/>
+
+ <!--
+ there is a default Bundle-Version attribute in the source
MANIFEST, used to ease
+ development in eclipse.
+ We remove this line to make sure we get the Bundle-Version as
set in the jar task
+ -->
+ <copy file="${basedir}/META-INF/MANIFEST.MF"
tofile="${artifacts.build.dir}/MANIFEST.MF">
+ <filterchain>
+ <linecontains negate="true">
+ <contains value="Bundle-Version"/>
+ </linecontains>
+ </filterchain>
+ </copy>
<!-- package the two ivy jars -->
<jar destfile="${artifacts.build.dir}/jars/${final.name}"
- manifest="${basedir}/MANIFEST.MF">
+ manifest="${artifacts.build.dir}/MANIFEST.MF">
<metainf dir="${basedir}" includes="LICENSE,DISCLAIMER,NOTICE" />
<manifest>
<attribute name="Specification-Title" value="Apache Ivy with
Ant tasks" />
@@ -321,6 +334,9 @@
<fileset dir="${core.classes.build.dir}" />
<fileset dir="${optional.classes.build.dir}" />
</jar>
+ <!-- copy main jar to ease its use as an OSGi bundle -->
+ <copy file="${artifacts.build.dir}/jars/${final.name}"
+
tofile="${artifacts.build.dir}/org.apache.ivy_${bundle.version}.jar" />
<echo file="${artifacts.build.dir}/readme.txt">The Ivy jars
explained${line.separator}
${line.separator}
${final.name} The full Ivy jar, including all Ivy classes.${line.separator}
