You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2017/07/01 18:02:07 UTC
[1/2] ant-ivyde git commit: Use a newer Eclipse to build IvyDE
Repository: ant-ivyde
Updated Branches:
refs/heads/master 83a84e623 -> 73dd6cb0f
Use a newer Eclipse to build IvyDE
It was not working with Java 8 on MacOS X and with the Eclipse 3.7 because of some lookup for a 'Classes' folder in the JDK which doesn't exist
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/b0488462
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/b0488462
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/b0488462
Branch: refs/heads/master
Commit: b048846233286ed9bb1ae7fbeab9ab3f58983189
Parents: 83a84e6
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sat Jul 1 19:59:50 2017 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sat Jul 1 20:01:19 2017 +0200
----------------------------------------------------------------------
build.properties | 8 +++-----
build.xml | 17 +++++++++++------
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/b0488462/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index d176db1..086a515 100644
--- a/build.properties
+++ b/build.properties
@@ -27,11 +27,9 @@ mirror.url=http://archive.apache.org/dist/
# properties for jenkins build environment
eclipse.download.baseurl=http://www.eclipse.org/downloads/download.php
-eclipse.download.mirror.url=http://carroll.aset.psu.edu/pub/eclipse
-eclipse.download.mirror.id=546
-eclipse.download.sdk.name=eclipse-SDK-3.7.1-win32
-eclipse.download.sdk.dropdir=eclipse/downloads/drops/R-3.7.1-201109091335
-eclipse.download.sdk.md5=078df5550176e176abdbac1f444725fe
+eclipse.download.sdk.name=eclipse-SDK-4.7-win32
+eclipse.download.sdk.dropdir=eclipse/downloads/drops4/R-4.7-201706120950
+eclipse.download.sdk.md5=e789b7d23ad214edbc63f6255289d6de
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
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/b0488462/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4087f5b..a9e50bc 100644
--- a/build.xml
+++ b/build.xml
@@ -587,7 +587,7 @@ 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="${eclipse.download.baseurl}?file=/@{dropdir}/@{name}.zip&url=${eclipse.download.mirror.url}/@{dropdir}/@{name}.zip&mirror_id=${eclipse.download.mirror.id}" dest="${basedir}/dependencies/@{name}.zip" verbose="yes" />
+ <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" />
</sequential>
</macrodef>
@@ -602,11 +602,16 @@ You have to specify the Ivy to install with one of the following property:
<delete dir="${basedir}/dependencies/eclipse" failonerror="false" />
<delete dir="${basedir}/dependencies/${eclipse.download.sdk.name}" failonerror="false" />
<unzip src="${basedir}/dependencies/${eclipse.download.sdk.name}.zip" dest="${basedir}/dependencies" />
- <unzip src="${basedir}/dependencies/${eclipse.download.wtp.name}.zip" dest="${basedir}/dependencies/eclipse/dropins" />
- <unzip src="${basedir}/dependencies/${eclipse.download.emf.name}.zip" dest="${basedir}/dependencies/eclipse/dropins" />
- <unzip src="${basedir}/dependencies/${eclipse.download.xsd.name}.zip" dest="${basedir}/dependencies/eclipse/dropins" />
- <unzip src="${basedir}/dependencies/${eclipse.download.gef.name}.zip" dest="${basedir}/dependencies/eclipse/dropins" />
- <unzip src="${basedir}/dependencies/${eclipse.download.zest.name}.zip" dest="${basedir}/dependencies/eclipse/dropins" />
+ <mkdir dir="${basedir}/dependencies/eclipse/dropins/${eclipse.download.wtp.name}" />
+ <unzip src="${basedir}/dependencies/${eclipse.download.wtp.name}.zip" dest="${basedir}/dependencies/eclipse/dropins/${eclipse.download.wtp.name}" />
+ <mkdir dir="${basedir}/dependencies/eclipse/dropins/${eclipse.download.emf.name}" />
+ <unzip src="${basedir}/dependencies/${eclipse.download.emf.name}.zip" dest="${basedir}/dependencies/eclipse/dropins/${eclipse.download.emf.name}" />
+ <mkdir dir="${basedir}/dependencies/eclipse/dropins/${eclipse.download.xsd.name}" />
+ <unzip src="${basedir}/dependencies/${eclipse.download.xsd.name}.zip" dest="${basedir}/dependencies/eclipse/dropins/${eclipse.download.xsd.name}" />
+ <mkdir dir="${basedir}/dependencies/eclipse/dropins/${eclipse.download.gef.name}" />
+ <unzip src="${basedir}/dependencies/${eclipse.download.gef.name}.zip" dest="${basedir}/dependencies/eclipse/dropins/${eclipse.download.gef.name}" />
+ <mkdir dir="${basedir}/dependencies/eclipse/dropins/${eclipse.download.zest.name}" />
+ <unzip src="${basedir}/dependencies/${eclipse.download.zest.name}.zip" dest="${basedir}/dependencies/eclipse/dropins/${eclipse.download.zest.name}" />
<move file="${basedir}/dependencies/eclipse" tofile="${basedir}/dependencies/${eclipse.download.sdk.name}" />
</target>
[2/2] ant-ivyde git commit: disable the build of the resolve
vizualizer because for some reason the zest plugins are not properly found by
the build
Posted by hi...@apache.org.
disable the build of the resolve vizualizer because for some reason the zest plugins are not properly found by the build
Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/73dd6cb0
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/73dd6cb0
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/73dd6cb0
Branch: refs/heads/master
Commit: 73dd6cb0fc7b268321ede8bc66ee94deef892c47
Parents: b048846
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sat Jul 1 20:01:58 2017 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sat Jul 1 20:01:58 2017 +0200
----------------------------------------------------------------------
builder/component/allElements.xml | 4 ++--
builder/component/customTargets.xml | 16 ++++++++--------
builder/maps/ivyde.map | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/73dd6cb0/builder/component/allElements.xml
----------------------------------------------------------------------
diff --git a/builder/component/allElements.xml b/builder/component/allElements.xml
index fb193b1..bcc9a48 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/73dd6cb0/builder/component/customTargets.xml
----------------------------------------------------------------------
diff --git a/builder/component/customTargets.xml b/builder/component/customTargets.xml
index d574abd..5415608 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/73dd6cb0/builder/maps/ivyde.map
----------------------------------------------------------------------
diff --git a/builder/maps/ivyde.map b/builder/maps/ivyde.map
index 6c4e605..da1b785 100644
--- a/builder/maps/ivyde.map
+++ b/builder/maps/ivyde.map
@@ -17,6 +17,6 @@
# * under the License.
# ***************************************************************
plugin@org.apache.ivyde.eclipse=COPY,.,../org.apache.ivyde.eclipse
-plugin@org.apache.ivyde.eclipse.resolvevisualizer=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer
+#plugin@org.apache.ivyde.eclipse.resolvevisualizer=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer
feature@org.apache.ivyde.feature=COPY,.,../org.apache.ivyde.feature
-feature@org.apache.ivyde.eclipse.resolvevisualizer.feature=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer.feature
+#feature@org.apache.ivyde.eclipse.resolvevisualizer.feature=COPY,.,../org.apache.ivyde.eclipse.resolvevisualizer.feature