Repository: ant-ivyde Updated Branches: refs/heads/master 229435f1c -> 9c23a435e
- make the path absolute on Jenkins - rename targets and properties from hudson to jenkins Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/9c23a435 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/9c23a435 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/9c23a435 Branch: refs/heads/master Commit: 9c23a435eac0923f733e3781b7b17ddbb7e35588 Parents: 229435f Author: Nicolas LaleveÌe <[email protected]> Authored: Sun Jun 25 15:09:03 2017 +0200 Committer: Nicolas LaleveÌe <[email protected]> Committed: Sun Jun 25 15:09:03 2017 +0200 ---------------------------------------------------------------------- build.properties | 50 +++++++++++------------ build.xml | 110 +++++++++++++++++++++++++------------------------- 2 files changed, 80 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/9c23a435/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index 6a4b24d..2a2d03f 100644 --- a/build.properties +++ b/build.properties @@ -25,29 +25,29 @@ eclipse.consoleLog=false # URL of the mirror to use when trying to install Ivy from an official release mirror.url=http://archive.apache.org/dist/ -# properties for hudson build environment -hudson.download.baseurl=http://www.eclipse.org/downloads/download.php -hudson.download.mirror.url=http://carroll.aset.psu.edu/pub/eclipse -hudson.download.mirror.id=546 -hudson.download.sdk.name=eclipse-SDK-3.7.1-win32 -hudson.download.sdk.dropdir=eclipse/downloads/drops/R-3.7.1-201109091335 -hudson.download.sdk.md5=078df5550176e176abdbac1f444725fe -hudson.download.wtp.name=wtp-R-3.1.2-20100211202452 -hudson.download.wtp.dropdir=webtools/downloads/drops/R3.1.2/R-3.1.2-20100211202452 -hudson.download.wtp.md5=e2c17a1d8b475bca50ac9e96ce23564d -hudson.download.emf.name=emf-runtime-2.5.0 -hudson.download.emf.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043 -hudson.download.emf.md5=f12fe508ca23bb11a99d32e946de024f -hudson.download.xsd.name=xsd-runtime-2.5.0 -hudson.download.xsd.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043 -hudson.download.xsd.md5=e156ae7e25500603ddc3166b18bb7fb6 -hudson.download.gef.name=GEF-SDK-3.5.2 -hudson.download.gef.dropdir=tools/gef/downloads/drops/3.5.2/R201002241200 -hudson.download.gef.md5=e3aeb007140d5b37c91e8d3d82a37b7a -hudson.download.zest.name=GEF-zest-3.6.2 -hudson.download.zest.dropdir=tools/gef/downloads/drops/3.6.2/R201102251600 -hudson.download.zest.md5=b7b6f7f07c876ebebdf987e0b3b758e1 +# properties for jenkins build environment +jenkins.download.baseurl=http://www.eclipse.org/downloads/download.php +jenkins.download.mirror.url=http://carroll.aset.psu.edu/pub/eclipse +jenkins.download.mirror.id=546 +jenkins.download.sdk.name=eclipse-SDK-3.7.1-win32 +jenkins.download.sdk.dropdir=eclipse/downloads/drops/R-3.7.1-201109091335 +jenkins.download.sdk.md5=078df5550176e176abdbac1f444725fe +jenkins.download.wtp.name=wtp-R-3.1.2-20100211202452 +jenkins.download.wtp.dropdir=webtools/downloads/drops/R3.1.2/R-3.1.2-20100211202452 +jenkins.download.wtp.md5=e2c17a1d8b475bca50ac9e96ce23564d +jenkins.download.emf.name=emf-runtime-2.5.0 +jenkins.download.emf.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043 +jenkins.download.emf.md5=f12fe508ca23bb11a99d32e946de024f +jenkins.download.xsd.name=xsd-runtime-2.5.0 +jenkins.download.xsd.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043 +jenkins.download.xsd.md5=e156ae7e25500603ddc3166b18bb7fb6 +jenkins.download.gef.name=GEF-SDK-3.5.2 +jenkins.download.gef.dropdir=tools/gef/downloads/drops/3.5.2/R201002241200 +jenkins.download.gef.md5=e3aeb007140d5b37c91e8d3d82a37b7a +jenkins.download.zest.name=GEF-zest-3.6.2 +jenkins.download.zest.dropdir=tools/gef/downloads/drops/3.6.2/R201102251600 +jenkins.download.zest.md5=b7b6f7f07c876ebebdf987e0b3b758e1 -#hudson.ivy.version=2.4.0-rc1 -#hudson.ivy.jar.url=http://builds.apache.org/job/Ivy/lastSuccessfulBuild/artifact/build/artifact/jars/ivy.jar -hudson.ivy.jar.url=file://./dependencies/build/artifact/jars/ivy.jar +#jenkins.ivy.version=2.4.0-rc1 +#jenkins.ivy.jar.url=http://builds.apache.org/job/Ivy/lastSuccessfulBuild/artifact/build/artifact/jars/ivy.jar +jenkins.ivy.jar.url=file://${jenkins.workspace}/dependencies/build/artifact/jars/ivy.jar http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/9c23a435/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 3e0b461..11ce5fb 100644 --- a/build.xml +++ b/build.xml @@ -219,7 +219,7 @@ <zip destfile="${dist.dir}/apache-ivyde-${build.version}.zip" basedir="${dist.work.dir}" /> <tar destfile="${dist.dir}/apache-ivyde-${build.version}.tar.gz" basedir="${dist.work.dir}" compression="gzip" /> <!-- put the version in a file so it will be easier in the build of the - updatesite on hudson to find out which version it is --> + updatesite on jenkins to find out which version it is --> <echo file="${dist.dir}/version.properties"> ivyde.build.version=${build.version} </echo> @@ -454,63 +454,63 @@ You have to specify the Ivy to install with one of the following property: <!-- ====================================================================================== - Targets related to prepare the build environment of IvyDE on hudson. + Targets related to prepare the build environment of IvyDE on jenkins. ====================================================================================== --> - <target name="hudson-prepare" depends="hudson-prepare-eclipse,hudson-prepare-properties,hudson-install-ivy" /> + <target name="jenkins-prepare" depends="jenkins-prepare-eclipse,jenkins-prepare-properties,jenkins-install-ivy" /> - <target name="hudson-prepare-eclipse" depends="hudson-get-eclipse,hudson-unzip-eclipse" /> + <target name="jenkins-prepare-eclipse" depends="jenkins-get-eclipse,jenkins-unzip-eclipse" /> - <target name="hudson-check-download-sdk"> - <check-eclipse-download name="${hudson.download.sdk.name}" property="hudson.sdk.downloaded" md5="${hudson.download.sdk.md5}" /> + <target name="jenkins-check-download-sdk"> + <check-eclipse-download name="${jenkins.download.sdk.name}" property="jenkins.sdk.downloaded" md5="${jenkins.download.sdk.md5}" /> </target> - <target name="hudson-get-sdk" depends="hudson-check-download-sdk" unless="hudson.sdk.downloaded"> - <eclipse-download name="${hudson.download.sdk.name}" dropdir="${hudson.download.sdk.dropdir}" /> + <target name="jenkins-get-sdk" depends="jenkins-check-download-sdk" unless="jenkins.sdk.downloaded"> + <eclipse-download name="${jenkins.download.sdk.name}" dropdir="${jenkins.download.sdk.dropdir}" /> </target> - <target name="hudson-check-download-wtp"> - <check-eclipse-download name="${hudson.download.wtp.name}" property="hudson.wtp.downloaded" md5="${hudson.download.wtp.md5}" /> + <target name="jenkins-check-download-wtp"> + <check-eclipse-download name="${jenkins.download.wtp.name}" property="jenkins.wtp.downloaded" md5="${jenkins.download.wtp.md5}" /> </target> - <target name="hudson-get-wtp" depends="hudson-check-download-wtp" unless="hudson.wtp.downloaded"> - <eclipse-download name="${hudson.download.wtp.name}" dropdir="${hudson.download.wtp.dropdir}" /> + <target name="jenkins-get-wtp" depends="jenkins-check-download-wtp" unless="jenkins.wtp.downloaded"> + <eclipse-download name="${jenkins.download.wtp.name}" dropdir="${jenkins.download.wtp.dropdir}" /> </target> - <target name="hudson-check-download-emf"> - <check-eclipse-download name="${hudson.download.emf.name}" property="hudson.emf.downloaded" md5="${hudson.download.emf.md5}" /> + <target name="jenkins-check-download-emf"> + <check-eclipse-download name="${jenkins.download.emf.name}" property="jenkins.emf.downloaded" md5="${jenkins.download.emf.md5}" /> </target> - <target name="hudson-get-emf" depends="hudson-check-download-emf" unless="hudson.emf.downloaded"> - <eclipse-download name="${hudson.download.emf.name}" dropdir="${hudson.download.emf.dropdir}" /> + <target name="jenkins-get-emf" depends="jenkins-check-download-emf" unless="jenkins.emf.downloaded"> + <eclipse-download name="${jenkins.download.emf.name}" dropdir="${jenkins.download.emf.dropdir}" /> </target> - <target name="hudson-check-download-xsd"> - <check-eclipse-download name="${hudson.download.xsd.name}" property="hudson.xsd.downloaded" md5="${hudson.download.xsd.md5}" /> + <target name="jenkins-check-download-xsd"> + <check-eclipse-download name="${jenkins.download.xsd.name}" property="jenkins.xsd.downloaded" md5="${jenkins.download.xsd.md5}" /> </target> - <target name="hudson-get-xsd" depends="hudson-check-download-xsd" unless="hudson.xsd.downloaded"> - <eclipse-download name="${hudson.download.xsd.name}" dropdir="${hudson.download.xsd.dropdir}" /> + <target name="jenkins-get-xsd" depends="jenkins-check-download-xsd" unless="jenkins.xsd.downloaded"> + <eclipse-download name="${jenkins.download.xsd.name}" dropdir="${jenkins.download.xsd.dropdir}" /> </target> - <target name="hudson-check-download-gef"> - <check-eclipse-download name="${hudson.download.gef.name}" property="hudson.gef.downloaded" md5="${hudson.download.gef.md5}" /> + <target name="jenkins-check-download-gef"> + <check-eclipse-download name="${jenkins.download.gef.name}" property="jenkins.gef.downloaded" md5="${jenkins.download.gef.md5}" /> </target> - <target name="hudson-get-gef" depends="hudson-check-download-gef" unless="hudson.gef.downloaded"> - <eclipse-download name="${hudson.download.gef.name}" dropdir="${hudson.download.gef.dropdir}" /> + <target name="jenkins-get-gef" depends="jenkins-check-download-gef" unless="jenkins.gef.downloaded"> + <eclipse-download name="${jenkins.download.gef.name}" dropdir="${jenkins.download.gef.dropdir}" /> </target> - <target name="hudson-check-download-zest"> - <check-eclipse-download name="${hudson.download.zest.name}" property="hudson.zest.downloaded" md5="${hudson.download.zest.md5}" /> + <target name="jenkins-check-download-zest"> + <check-eclipse-download name="${jenkins.download.zest.name}" property="jenkins.zest.downloaded" md5="${jenkins.download.zest.md5}" /> </target> - <target name="hudson-get-zest" depends="hudson-check-download-zest" unless="hudson.zest.downloaded"> - <eclipse-download name="${hudson.download.zest.name}" dropdir="${hudson.download.zest.dropdir}" /> + <target name="jenkins-get-zest" depends="jenkins-check-download-zest" unless="jenkins.zest.downloaded"> + <eclipse-download name="${jenkins.download.zest.name}" dropdir="${jenkins.download.zest.dropdir}" /> </target> - <target name="hudson-get-eclipse" depends="hudson-get-sdk,hudson-get-wtp,hudson-get-emf,hudson-get-xsd,hudson-get-gef,hudson-get-zest" /> + <target name="jenkins-get-eclipse" depends="jenkins-get-sdk,jenkins-get-wtp,jenkins-get-emf,jenkins-get-xsd,jenkins-get-gef,jenkins-get-zest" /> <!-- wrapper of eclipse download urls which have a common pattern --> <macrodef name="check-eclipse-download"> @@ -533,57 +533,57 @@ You have to specify the Ivy to install with one of the following property: <sequential> <mkdir dir="${basedir}/dependencies" /> <delete file="${basedir}/dependencies/@{name}.zip" failonerror="false" /> - <get src="${hudson.download.baseurl}?file=/@{dropdir}/@{name}.zip&url=${hudson.download.mirror.url}/@{dropdir}/@{name}.zip&mirror_id=${hudson.download.mirror.id}" dest="${basedir}/dependencies/@{name}.zip" verbose="yes" /> + <get src="${jenkins.download.baseurl}?file=/@{dropdir}/@{name}.zip&url=${jenkins.download.mirror.url}/@{dropdir}/@{name}.zip&mirror_id=${jenkins.download.mirror.id}" dest="${basedir}/dependencies/@{name}.zip" verbose="yes" /> <checksum file="${basedir}/dependencies/@{name}.zip" algorithm="MD5" /> </sequential> </macrodef> - <target name="hudson-check-unzip-eclipse"> - <condition property="hudson.eclipse.unzipped"> - <available file="${basedir}/dependencies/${hudson.download.sdk.name}" /> + <target name="jenkins-check-unzip-eclipse"> + <condition property="jenkins.eclipse.unzipped"> + <available file="${basedir}/dependencies/${jenkins.download.sdk.name}" /> </condition> </target> - <target name="hudson-unzip-eclipse" depends="hudson-check-unzip-eclipse" unless="hudson.eclipse.unzipped"> + <target name="jenkins-unzip-eclipse" depends="jenkins-check-unzip-eclipse" unless="jenkins.eclipse.unzipped"> <delete dir="${basedir}/dependencies/eclipse" failonerror="false" /> - <delete dir="${basedir}/dependencies/${hudson.download.sdk.name}" failonerror="false" /> - <unzip src="${basedir}/dependencies/${hudson.download.sdk.name}.zip" dest="${basedir}/dependencies/" /> - <unzip src="${basedir}/dependencies/${hudson.download.wtp.name}.zip" dest="${basedir}/dependencies/" /> - <unzip src="${basedir}/dependencies/${hudson.download.emf.name}.zip" dest="${basedir}/dependencies/" /> - <unzip src="${basedir}/dependencies/${hudson.download.xsd.name}.zip" dest="${basedir}/dependencies/" /> - <unzip src="${basedir}/dependencies/${hudson.download.gef.name}.zip" dest="${basedir}/dependencies/" /> - <unzip src="${basedir}/dependencies/${hudson.download.zest.name}.zip" dest="${basedir}/dependencies/" /> - <move file="${basedir}/dependencies/eclipse" tofile="${basedir}/dependencies/${hudson.download.sdk.name}" /> + <delete dir="${basedir}/dependencies/${jenkins.download.sdk.name}" failonerror="false" /> + <unzip src="${basedir}/dependencies/${jenkins.download.sdk.name}.zip" dest="${basedir}/dependencies/" /> + <unzip src="${basedir}/dependencies/${jenkins.download.wtp.name}.zip" dest="${basedir}/dependencies/" /> + <unzip src="${basedir}/dependencies/${jenkins.download.emf.name}.zip" dest="${basedir}/dependencies/" /> + <unzip src="${basedir}/dependencies/${jenkins.download.xsd.name}.zip" dest="${basedir}/dependencies/" /> + <unzip src="${basedir}/dependencies/${jenkins.download.gef.name}.zip" dest="${basedir}/dependencies/" /> + <unzip src="${basedir}/dependencies/${jenkins.download.zest.name}.zip" dest="${basedir}/dependencies/" /> + <move file="${basedir}/dependencies/eclipse" tofile="${basedir}/dependencies/${jenkins.download.sdk.name}" /> </target> - <target name="hudson-prepare-properties"> + <target name="jenkins-prepare-properties"> <tstamp /> - <property name="baseLocation" value="${basedir}/dependencies/${hudson.eclipse.name}" /> - <condition property="hudson.version.qualifier" value="${DSTAMP}${TSTAMP}-hudson-${env.BUILD_NUMBER}"> + <property name="baseLocation" value="${basedir}/dependencies/${jenkins.eclipse.name}" /> + <condition property="jenkins.version.qualifier" value="${DSTAMP}${TSTAMP}-jenkins-${env.BUILD_NUMBER}"> <length string="${version.qualifier}" trim="true" length="0" /> </condition> - <property name="hudson.version.qualifier" value="${version.qualifier}-${DSTAMP}${TSTAMP}-hudson-${env.BUILD_NUMBER}" /> + <property name="jenkins.version.qualifier" value="${version.qualifier}-${DSTAMP}${TSTAMP}-jenkins-${env.BUILD_NUMBER}" /> <echo file="local.build.properties"> -baseLocation=${basedir}/dependencies/${hudson.download.sdk.name} -forceContextQualifier=${hudson.version.qualifier} +baseLocation=${basedir}/dependencies/${jenkins.download.sdk.name} +forceContextQualifier=${jenkins.version.qualifier} </echo> </target> - <target name="hudson-install-ivy-jar" if="hudson.ivy.jar.url"> + <target name="jenkins-install-ivy-jar" if="jenkins.ivy.jar.url"> <ant antfile="build.xml" target="install-ivy"> - <property name="ivy.jar.url" value="${hudson.ivy.jar.url}" /> - <property name="baseLocation" location="${basedir}/dependencies/${hudson.download.sdk.name}" /> + <property name="ivy.jar.url" value="${jenkins.ivy.jar.url}" /> + <property name="baseLocation" location="${basedir}/dependencies/${jenkins.download.sdk.name}" /> </ant> </target> - <target name="hudson-install-ivy-release" unless="hudson.ivy.jar.url"> + <target name="jenkins-install-ivy-release" unless="jenkins.ivy.jar.url"> <ant antfile="build.xml" target="install-ivy"> - <property name="ivy.version" value="${hudson.ivy.version}" /> - <property name="baseLocation" location="${basedir}/dependencies/${hudson.download.sdk.name}" /> + <property name="ivy.version" value="${jenkins.ivy.version}" /> + <property name="baseLocation" location="${basedir}/dependencies/${jenkins.download.sdk.name}" /> </ant> </target> - <target name="hudson-install-ivy" depends="hudson-install-ivy-jar,hudson-install-ivy-release" /> + <target name="jenkins-install-ivy" depends="jenkins-install-ivy-jar,jenkins-install-ivy-release" /> <!-- ======================================================================================
