Author: hibou
Date: Mon Jul 13 09:30:24 2009
New Revision: 793515
URL: http://svn.apache.org/viewvc?rev=793515&view=rev
Log:
Update IvyDE version and make the build support an empty qualifier in the
version
Modified:
ant/ivy/ivyde/trunk/build.properties
ant/ivy/ivyde/trunk/build.xml
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml
Modified: ant/ivy/ivyde/trunk/build.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.properties?rev=793515&r1=793514&r2=793515&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Mon Jul 13 09:30:24 2009
@@ -17,7 +17,7 @@
# * under the License.
# ***************************************************************
-version.qualifier=final
+version.qualifier=
# For deeper debugging of the build system, set it to true
eclipse.consoleLog=false
Modified: ant/ivy/ivyde/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=793515&r1=793514&r2=793515&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Mon Jul 13 09:30:24 2009
@@ -49,6 +49,9 @@
<target name="/release" description="Make the build artifacts tagged with
the release version">
<tstamp />
+ <condition property="forceContextQualifier"
value="${DSTAMP}${TSTAMP}-RELEASE">
+ <length string="${version.qualifier}" trim="true" length="0" />
+ </condition>
<property name="forceContextQualifier"
value="${version.qualifier}-${DSTAMP}${TSTAMP}-RELEASE" />
</target>
@@ -101,6 +104,9 @@
<target name="compute-version">
<tstamp />
+ <condition property="forceContextQualifier"
value="${DSTAMP}${TSTAMP}-dev">
+ <length string="${version.qualifier}" trim="true" length="0" />
+ </condition>
<property name="forceContextQualifier"
value="${version.qualifier}-${DSTAMP}${TSTAMP}-dev" />
<loadfile srcfile="org.apache.ivyde.eclipse/META-INF/MANIFEST.MF"
property="build.version">
<filterchain>
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF?rev=793515&r1=793514&r2=793515&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF Mon Jul
13 09:30:24 2009
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: IvyDE Eclipse Plug-in
Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
Bundle-ClassPath: ivyde-eclipse.jar
Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin
Bundle-Vendor: Apache Software Foundation
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml?rev=793515&r1=793514&r2=793515&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.feature/feature.xml Mon Jul 13
09:30:24 2009
@@ -20,7 +20,7 @@
<feature
id="org.apache.ivyde.feature"
label="%featureName"
- version="2.0.0.qualifier"
+ version="2.0.1.qualifier"
provider-name="%providerName">
<description url="http://ant.apache.org/ivy/ivyde";>
