Repository: ant-ivyde Updated Branches: refs/heads/master 45d03bab8 -> 82ea47ff3
update build dependencies, and reenable the build of the resolve vizualizer Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/82ea47ff Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/82ea47ff Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/82ea47ff Branch: refs/heads/master Commit: 82ea47ff353486da3a34ef290818abadb9609a12 Parents: 45d03ba Author: Nicolas LaleveÌe <[email protected]> Authored: Mon Jul 10 23:33:40 2017 +0200 Committer: Nicolas LaleveÌe <[email protected]> Committed: Mon Jul 10 23:34:28 2017 +0200 ---------------------------------------------------------------------- build.properties | 30 +++++++++---------- build.xml | 49 ++++++++++++++++---------------- builder/component/allElements.xml | 4 +-- builder/component/customTargets.xml | 16 +++++------ builder/maps/ivyde.map | 4 +-- 5 files changed, 51 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/82ea47ff/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index af364d2..fd915ea 100644 --- a/build.properties +++ b/build.properties @@ -30,18 +30,18 @@ eclipse.download.baseurl=http://www.eclipse.org/downloads/download.php eclipse.download.sdk.name=eclipse-SDK-4.3.2-win32 eclipse.download.sdk.dropdir=eclipse/downloads/drops4/R-4.3.2-201402211700 eclipse.download.sdk.md5=6de9fd3670ecd40b0f8adeb4740dc852 -eclipse.download.wtp.name=wtp-R-3.1.2-20100211202452 -eclipse.download.wtp.dropdir=webtools/downloads/drops/R3.1.2/R-3.1.2-20100211202452 -eclipse.download.wtp.md5=e2c17a1d8b475bca50ac9e96ce23564d -eclipse.download.emf.name=emf-runtime-2.5.0 -eclipse.download.emf.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043 -eclipse.download.emf.md5=f12fe508ca23bb11a99d32e946de024f -eclipse.download.xsd.name=xsd-runtime-2.5.0 -eclipse.download.xsd.dropdir=modeling/emf/emf/downloads/drops/2.5.0/R200906151043 -eclipse.download.xsd.md5=e156ae7e25500603ddc3166b18bb7fb6 -eclipse.download.gef.name=GEF-SDK-3.5.2 -eclipse.download.gef.dropdir=tools/gef/downloads/drops/3.5.2/R201002241200 -eclipse.download.gef.md5=e3aeb007140d5b37c91e8d3d82a37b7a -eclipse.download.zest.name=GEF-zest-3.6.2 -eclipse.download.zest.dropdir=tools/gef/downloads/drops/3.6.2/R201102251600 -eclipse.download.zest.md5=b7b6f7f07c876ebebdf987e0b3b758e1 +eclipse.download.wtp.name=wtp4x-R-3.4.2-20130208151217 +eclipse.download.wtp.dropdir=webtools/downloads/drops/R3.4.2/R-3.4.2-20130208151217 +eclipse.download.wtp.md5=db368b786f7a43d373b27f1379b0359f +eclipse.download.emf.name=emf-runtime-2.9.2 +eclipse.download.emf.dropdir=modeling/emf/emf/downloads/drops/2.9.2/R201402031126 +eclipse.download.emf.md5=498713f53a20d7456042beaa3785baa4 +eclipse.download.xsd.name=xsd-runtime-2.9.2 +eclipse.download.xsd.dropdir=modeling/emf/emf/downloads/drops/2.9.2/R201402031126 +eclipse.download.xsd.md5=1262af8447cb193807cd11c8849b5361 +eclipse.download.gef.name=GEF-SDK-3.9.100 +eclipse.download.gef.dropdir=tools/gef/downloads/drops/3.9.100/R201405261516 +eclipse.download.gef.md5=d8e4d18eb8512e8ddd92446aca92599b +eclipse.download.zest.name=GEF-zest-3.9.100 +eclipse.download.zest.dropdir=tools/gef/downloads/drops/3.9.100/R201405261516 +eclipse.download.zest.md5=e1cb23da55ad6528f5c587d0b6521fb9 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/82ea47ff/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b255e5f..fdcd31f 100644 --- a/build.xml +++ b/build.xml @@ -260,7 +260,7 @@ <target name="package-binaries" depends="build,generate-p2-category,generate-dist-doc-files,generate-dist-doc-html"> <mkdir dir="${dist.work.dir}/apache-ivyde-${build.version}" /> <unzip src="${eclipse.work.dir}/${build.version}/org.apache.ivyde.feature-${build.version}.zip" dest="${dist.work.dir}/apache-ivyde-${build.version}" /> - <!--unzip src="${eclipse.work.dir}/${build.version}/org.apache.ivyde.eclipse.resolvevisualizer.feature-${build.version}.zip" dest="${dist.work.dir}/apache-ivyde-${build.version}" /--> + <unzip src="${eclipse.work.dir}/${build.version}/org.apache.ivyde.eclipse.resolvevisualizer.feature-${build.version}.zip" dest="${dist.work.dir}/apache-ivyde-${build.version}" /> <!-- packaging the zip as a p2 repository --> <copy todir="${dist.work.dir}/apache-ivyde-${build.version}"> <fileset dir="${eclipse.work.dir}/p2repo" /> @@ -519,76 +519,75 @@ You have to specify the Ivy to install with one of the following property: <target name="download-eclipse" depends="eclipse-get-sdk,eclipse-get-wtp,eclipse-get-emf,eclipse-get-xsd,eclipse-get-gef,eclipse-get-zest" /> <target name="eclipse-check-download-sdk"> - <check-eclipse-download name="${eclipse.download.sdk.name}" property="eclipse.sdk.downloaded" md5="${eclipse.download.sdk.md5}" /> + <check-eclipse-download id="sdk" /> </target> <target name="eclipse-get-sdk" depends="eclipse-check-download-sdk" unless="eclipse.sdk.downloaded"> - <eclipse-download name="${eclipse.download.sdk.name}" dropdir="${eclipse.download.sdk.dropdir}" /> + <eclipse-download id="sdk" /> </target> <target name="eclipse-check-download-wtp"> - <check-eclipse-download name="${eclipse.download.wtp.name}" property="eclipse.wtp.downloaded" md5="${eclipse.download.wtp.md5}" /> + <check-eclipse-download id="wtp" /> </target> <target name="eclipse-get-wtp" depends="eclipse-check-download-wtp" unless="eclipse.wtp.downloaded"> - <eclipse-download name="${eclipse.download.wtp.name}" dropdir="${eclipse.download.wtp.dropdir}" /> + <eclipse-download id="wtp" /> </target> <target name="eclipse-check-download-emf"> - <check-eclipse-download name="${eclipse.download.emf.name}" property="eclipse.emf.downloaded" md5="${eclipse.download.emf.md5}" /> + <check-eclipse-download id="emf" /> </target> <target name="eclipse-get-emf" depends="eclipse-check-download-emf" unless="eclipse.emf.downloaded"> - <eclipse-download name="${eclipse.download.emf.name}" dropdir="${eclipse.download.emf.dropdir}" /> + <eclipse-download id="emf" /> </target> <target name="eclipse-check-download-xsd"> - <check-eclipse-download name="${eclipse.download.xsd.name}" property="eclipse.xsd.downloaded" md5="${eclipse.download.xsd.md5}" /> + <check-eclipse-download id="xsd" /> </target> <target name="eclipse-get-xsd" depends="eclipse-check-download-xsd" unless="eclipse.xsd.downloaded"> - <eclipse-download name="${eclipse.download.xsd.name}" dropdir="${eclipse.download.xsd.dropdir}" /> + <eclipse-download id="xsd" /> </target> <target name="eclipse-check-download-gef"> - <check-eclipse-download name="${eclipse.download.gef.name}" property="eclipse.gef.downloaded" md5="${eclipse.download.gef.md5}" /> + <check-eclipse-download id="gef" /> </target> <target name="eclipse-get-gef" depends="eclipse-check-download-gef" unless="eclipse.gef.downloaded"> - <eclipse-download name="${eclipse.download.gef.name}" dropdir="${eclipse.download.gef.dropdir}" /> + <eclipse-download id="gef" /> </target> <target name="eclipse-check-download-zest"> - <check-eclipse-download name="${eclipse.download.zest.name}" property="eclipse.zest.downloaded" md5="${eclipse.download.zest.md5}" /> + <check-eclipse-download id="zest" /> </target> <target name="eclipse-get-zest" depends="eclipse-check-download-zest" unless="eclipse.zest.downloaded"> - <eclipse-download name="${eclipse.download.zest.name}" dropdir="${eclipse.download.zest.dropdir}" /> + <eclipse-download id="zest" /> </target> <!-- wrapper of eclipse download urls which have a common pattern --> <macrodef name="check-eclipse-download"> - <attribute name="property" /> - <attribute name="name" /> - <attribute name="md5" /> + <attribute name="id" /> <sequential> - <echo file="${basedir}/dependencies/@{name}.zip.md5" message="@{md5}" /> - <condition property="@{property}"> + <echo file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip.md5" message="${eclipse.download.@{id}.md5}" /> + <condition property="eclipse.@{id}.downloaded"> <and> - <available file="${basedir}/dependencies/@{name}.zip" /> - <checksum file="${basedir}/dependencies/@{name}.zip" algorithm="MD5" /> + <available file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" /> + <checksum file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" algorithm="MD5" /> </and> </condition> </sequential> </macrodef> <macrodef name="eclipse-download"> - <attribute name="name" /> - <attribute name="dropdir" /> + <attribute name="id" /> <sequential> + <property name="eclipse.download.@{id}.baseurl" value="${eclipse.download.baseurl}" /> <mkdir dir="${basedir}/dependencies" /> - <delete file="${basedir}/dependencies/@{name}.zip" failonerror="false" /> - <get src="${eclipse.download.baseurl}?file=/@{dropdir}/@{name}.zip&mirror_id=1" dest="${basedir}/dependencies/@{name}.zip" verbose="yes" /> - <checksum file="${basedir}/dependencies/@{name}.zip" algorithm="MD5" /> + <delete file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" failonerror="false" /> + <get src="${eclipse.download.@{id}.baseurl}?file=/${eclipse.download.@{id}.dropdir}/${eclipse.download.@{id}.name}.zip&mirror_id=1" + dest="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" verbose="yes" /> + <checksum file="${basedir}/dependencies/${eclipse.download.@{id}.name}.zip" algorithm="MD5" /> </sequential> </macrodef> http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/82ea47ff/builder/component/allElements.xml ---------------------------------------------------------------------- diff --git a/builder/component/allElements.xml b/builder/component/allElements.xml index bcc9a48..fb193b1 100644 --- a/builder/component/allElements.xml +++ b/builder/component/allElements.xml @@ -31,10 +31,10 @@ <property name="type" value="feature" /> <property name="id" value="org.apache.ivyde.feature" /> </ant> - <!--ant antfile="${genericTargets}" target="${target}"> + <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> <property name="id" value="org.apache.ivyde.eclipse.resolvevisualizer.feature" /> - </ant--> + </ant> </target> <!-- ===================================================================== --> http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/82ea47ff/builder/component/customTargets.xml ---------------------------------------------------------------------- diff --git a/builder/component/customTargets.xml b/builder/component/customTargets.xml index 5415608..d574abd 100644 --- a/builder/component/customTargets.xml +++ b/builder/component/customTargets.xml @@ -32,9 +32,9 @@ <ant antfile="${assembleScriptName}" dir="${buildDirectory}" /> </target> - <!--target name="assemble.org.apache.ivyde.eclipse.resolvevisualizer.feature"> + <target name="assemble.org.apache.ivyde.eclipse.resolvevisualizer.feature"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}" /> - </target--> + </target> <target name="assemble.org.apache.ivyde.feature.p2"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}" /> @@ -44,13 +44,13 @@ <ant antfile="${assembleScriptName}" dir="${buildDirectory}" /> </target> - <!--target name="assemble.org.apache.ivyde.eclipse.resolvevisualizer.feature.p2"> + <target name="assemble.org.apache.ivyde.eclipse.resolvevisualizer.feature.p2"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}" /> </target> <target name="assemble.org.apache.ivyde.eclipse.resolvevisualizer.feature.group.group.group"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}" /> - </target--> + </target> <!-- ===================================================================== --> <!-- ===================================================================== --> @@ -130,24 +130,24 @@ <include name="NOTICE" /> </fileset> </copy> - <!--copy todir="${buildDirectory}/features/org.apache.ivyde.eclipse.resolvevisualizer.feature/"> + <copy todir="${buildDirectory}/features/org.apache.ivyde.eclipse.resolvevisualizer.feature/"> <fileset dir="${buildDirectory}/../.."> <include name="LICENSE" /> <include name="NOTICE" /> </fileset> - </copy--> + </copy> <copy todir="${buildDirectory}/plugins/org.apache.ivyde.eclipse/META-INF/"> <fileset dir="${buildDirectory}/../.."> <include name="LICENSE" /> <include name="NOTICE" /> </fileset> </copy> - <!--copy todir="${buildDirectory}/plugins/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/"> + <copy todir="${buildDirectory}/plugins/org.apache.ivyde.eclipse.resolvevisualizer/META-INF/"> <fileset dir="${buildDirectory}/../.."> <include name="LICENSE" /> <include name="NOTICE" /> </fileset> - </copy--> + </copy> </target> <!-- ===================================================================== --> http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/82ea47ff/builder/maps/ivyde.map ---------------------------------------------------------------------- diff --git a/builder/maps/ivyde.map b/builder/maps/ivyde.map index da1b785..6c4e605 100644 --- a/builder/maps/ivyde.map +++ b/builder/maps/ivyde.map @@ -17,6 +17,6 @@ # * under the License. # *************************************************************** [email protected]=COPY,.,../org.apache.ivyde.eclipse -#[email protected]=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer [email protected]=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer [email protected]=COPY,.,../org.apache.ivyde.feature -#[email protected]=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer.feature [email protected]=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer.feature
