You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/06/13 07:26:03 UTC
[3/3] ant-ivyde git commit: Fix package-sources target,
now that we are no longer using SVN for source control
Fix package-sources target, now that we are no longer using SVN for source control
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/41d155cb
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/41d155cb
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/41d155cb
Branch: refs/heads/master
Commit: 41d155cb72b57be6df90db09c0b0dcc3fc7dd225
Parents: f421b03
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Wed Jun 13 12:39:15 2018 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Wed Jun 13 12:39:15 2018 +0530
----------------------------------------------------------------------
build.xml | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/41d155cb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index dd39853..5e8c8aa 100644
--- a/build.xml
+++ b/build.xml
@@ -304,28 +304,24 @@ ivyde.build.version=${build.version}
</echo>
</target>
- <target name="package-sources" depends="compute-version">
- <exec executable="svn" dir="${basedir}" outputproperty="svn.info.url">
- <arg value="--xml"/>
- <arg value="info"/>
- <redirector>
- <outputfilterchain>
- <containsregex pattern="<url>(.*)</url>" replace="\1"/>
- </outputfilterchain>
- </redirector>
- </exec>
+ <target name="package-sources" depends="compute-version" description="Create source archive files">
<delete dir="${work.dir}/sources"/>
<mkdir dir="${work.dir}/sources"/>
- <exec executable="svn" dir="${work.dir}/sources" >
- <arg value="export"/>
- <arg value="${svn.info.url}"/>
- <arg value="apache-ivyde-sources-${build.version}"/>
+ <exec executable="git" dir="${basedir}" >
+ <arg value="archive"/>
+ <arg value="HEAD"/>
+ <arg value="-o"/>
+ <arg value="${work.dir}/sources/apache-ivyde-sources-${build.version}.tar.gz"/>
+ </exec>
+ <exec executable="git" dir="${basedir}" >
+ <arg value="archive"/>
+ <arg value="HEAD"/>
+ <arg value="-o"/>
+ <arg value="${work.dir}/sources/apache-ivyde-sources-${build.version}.zip"/>
</exec>
- <mkdir dir="${dist.dir}"/>
- <zip destfile="${dist.dir}/apache-ivyde-sources-${build.version}.zip" basedir="${work.dir}/sources"/>
- <tar destfile="${dist.dir}/apache-ivyde-sources-${build.version}.tar.gz" basedir="${work.dir}/sources" compression="gzip"/>
</target>
+
<target name="generate-p2-category" depends="compute-version,eclipse-classpath">
<loadfile property="ASL2-header" srcFile="${basedir}/builder/ASL2-header.xml"/>
<echo file="${work.dir}/category.xml"><![CDATA[<?xml version='1.0' encoding='UTF-8'?>