Browse Source

Disabled build of bundled eclipse with SCT

benjamin.schwertfeger@googlemail.com 11 years ago
parent
commit
1f90b2aad4

+ 4 - 4
releng/org.yakindu.sct.releng/StateChartTools.setup

@@ -1801,7 +1801,7 @@
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/newline.after.constructor.annotations"
-          value="false"/>
+          value="true"/>
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/blank.lines.after.last.member"
@@ -1817,7 +1817,7 @@
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/newline.after.method.annotations"
-          value="false"/>
+          value="true"/>
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/blank.lines.before.first.member"
@@ -1825,7 +1825,7 @@
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/newline.after.class.annotations"
-          value="false"/>
+          value="true"/>
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/indentation.length"
@@ -1833,7 +1833,7 @@
       <setupTask
           xsi:type="setup:PreferenceTask"
           key="/instance/org.eclipse.xtend.core.Xtend/newline.after.field.annotations"
-          value="false"/>
+          value="true"/>
     </setupTask>
     <setupTask
         xsi:type="setup:CompoundTask"

+ 346 - 347
releng/org.yakindu.sct.releng/promote-pom.xml

@@ -13,8 +13,8 @@
 		for distros is set -->
 
 	<properties>
-		<tycho.extras.version>0.18.0</tycho.extras.version>
-		<tycho-version>0.18.0</tycho-version>
+		<tycho.extras.version>0.20.0</tycho.extras.version>
+		<tycho-version>0.20.0</tycho-version>
 
 		<!-- scp settings for publishing udpdate site -->
 		<promotionTarget>luna/integration</promotionTarget>
@@ -73,353 +73,353 @@
 				</executions>
 			</plugin>
 
-			<!-- for package of eclipse product creation -->
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.1</version>
-				<executions>
-					<execution>
-						<!-- http://wiki.eclipse.org/Tycho/Additional_Tools#tycho-eclipserun-plugin_behind_a_proxy -->
-						<id>configure-proxies-for-eclipserun</id>
-						<phase>generate-resources</phase>
-						<configuration>
-							<target>
-								<touch
-									file="${project.build.directory}/work/configuration/.settings/org.eclipse.core.net.prefs"
-									mkdirs="true" />
+ 			<!-- for package of eclipse product creation -->
+<!-- 			<plugin> -->
+<!-- 				<artifactId>maven-antrun-plugin</artifactId> -->
+<!-- 				<version>1.1</version> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 						http://wiki.eclipse.org/Tycho/Additional_Tools#tycho-eclipserun-plugin_behind_a_proxy -->
+<!-- 						<id>configure-proxies-for-eclipserun</id> -->
+<!-- 						<phase>generate-resources</phase> -->
+<!-- 						<configuration> -->
+<!-- 							<target> -->
+<!-- 								<touch -->
+<!-- 									file="${project.build.directory}/work/configuration/.settings/org.eclipse.core.net.prefs" -->
+<!-- 									mkdirs="true" /> -->
 
-								<propertyfile
-									file="${project.build.directory}/work/configuration/.settings/org.eclipse.core.net.prefs">
-									<entry key="eclipse.preferences.version" value="1" />
-									<entry key="nonProxiedHosts" value="${http.nonProxyHosts}" />
-									<entry key="org.eclipse.core.net.hasMigrated" value="true" />
-									<entry key="proxyData/HTTP/hasAuth" value="false" />
-									<entry key="proxyData/HTTP/host" value="${http.proxyHost}" />
-									<entry key="proxyData/HTTP/port" value="${http.proxyPort}" />
-									<entry key="systemProxiesEnabled" value="false" />
-								</propertyfile>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>download.distro</id>
-						<phase>prepare-package</phase>
-						<configuration>
-							<tasks>
-								<taskdef resource="net/sf/antcontrib/antlib.xml"
-									classpathref="maven.plugin.classpath" />
-								<property name="download.distro.src"
-									value="${eclipse.mirror.url}/technology/epp/downloads/release/luna/R" />
-								<property name="download.distro.dir"
-									value="${project.build.directory}/distro/download" />
+<!-- 								<propertyfile -->
+<!-- 									file="${project.build.directory}/work/configuration/.settings/org.eclipse.core.net.prefs"> -->
+<!-- 									<entry key="eclipse.preferences.version" value="1" /> -->
+<!-- 									<entry key="nonProxiedHosts" value="${http.nonProxyHosts}" /> -->
+<!-- 									<entry key="org.eclipse.core.net.hasMigrated" value="true" /> -->
+<!-- 									<entry key="proxyData/HTTP/hasAuth" value="false" /> -->
+<!-- 									<entry key="proxyData/HTTP/host" value="${http.proxyHost}" /> -->
+<!-- 									<entry key="proxyData/HTTP/port" value="${http.proxyPort}" /> -->
+<!-- 									<entry key="systemProxiesEnabled" value="false" /> -->
+<!-- 								</propertyfile> -->
+<!-- 							</target> -->
+<!-- 						</configuration> -->
+<!-- 						<goals> -->
+<!-- 							<goal>run</goal> -->
+<!-- 						</goals> -->
+<!-- 					</execution> -->
+<!-- 					<execution> -->
+<!-- 						<id>download.distro</id> -->
+<!-- 						<phase>prepare-package</phase> -->
+<!-- 						<configuration> -->
+<!-- 							<tasks> -->
+<!-- 								<taskdef resource="net/sf/antcontrib/antlib.xml" -->
+<!-- 									classpathref="maven.plugin.classpath" /> -->
+<!-- 								<property name="download.distro.src" -->
+<!-- 									value="${eclipse.mirror.url}/technology/epp/downloads/release/luna/R" /> -->
+<!-- 								<property name="download.distro.dir" -->
+<!-- 									value="${project.build.directory}/distro/download" /> -->
 
-								<!-- 'target architecture' for distros -->
-								<for
-									list="macosx-cocoa-x86_64;win32-win32-x86;win32-win32-x86_64;linux-gtk-x86;linux-gtk-x86_64"
-									param="environment" delimiter=";" parallel="false">
-									<sequential>
-										<propertyregex property="distro.os" input="@{environment}"
-											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\1"
-											casesensitive="false" />
-										<propertyregex property="distro.ws" input="@{environment}"
-											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\2"
-											casesensitive="false" />
-										<propertyregex property="distro.arch" input="@{environment}"
-											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\3"
-											casesensitive="false" />
-										<echo>distro.os ${distro.os} </echo>
-										<echo>distro.ws ${distro.ws} </echo>
-										<echo>distro.arch ${distro.arch} </echo>
-										<!-- naming is platform specific, so we have to make a distinction 
-											here (as we only have two platforms, we do not have to make any other distinctions 
-											so far) -->
-										<if>
-											<and>
-												<equals arg1="${distro.os}" arg2="win32" />
-												<equals arg1="${distro.ws}" arg2="win32" />
-												<equals arg1="${distro.arch}" arg2="x86" />
-											</and>
-											<then>
-												<propertyregex property="distro.src.filename"
-													input="eclipse-java-luna-R-win32.zip" override="true"
-													regexp="(.*)" select="\1" casesensitive="false" />
-											</then>
-										</if>
-										<if>
-											<and>
-												<equals arg1="${distro.os}" arg2="win32" />
-												<equals arg1="${distro.ws}" arg2="win32" />
-												<equals arg1="${distro.arch}" arg2="x86_64" />
-											</and>
-											<then>
-												<propertyregex property="distro.src.filename"
-													input="eclipse-java-luna-R-win32-x86_64.zip" override="true"
-													regexp="(.*)" select="\1" casesensitive="false" />
-											</then>
-										</if>
-										<if>
-											<and>
-												<equals arg1="${distro.os}" arg2="linux" />
-												<equals arg1="${distro.ws}" arg2="gtk" />
-												<equals arg1="${distro.arch}" arg2="x86_64" />
-											</and>
-											<then>
-												<propertyregex property="distro.src.filename"
-													input="eclipse-java-luna-R-linux-gtk-x86_64.tar.gz"
-													override="true" regexp="(.*)" select="\1" casesensitive="false" />
-											</then>
-										</if>
-										<if>
-											<and>
-												<equals arg1="${distro.os}" arg2="linux" />
-												<equals arg1="${distro.ws}" arg2="gtk" />
-												<equals arg1="${distro.arch}" arg2="x86" />
-											</and>
-											<then>
-												<propertyregex property="distro.src.filename"
-													input="eclipse-java-luna-R-linux-gtk.tar.gz" override="true"
-													regexp="(.*)" select="\1" casesensitive="false" />
-											</then>
-										</if>
-										<if>
-											<and>
-												<equals arg1="${distro.os}" arg2="macosx" />
-												<equals arg1="${distro.ws}" arg2="cocoa" />
-												<equals arg1="${distro.arch}" arg2="x86_64" />
-											</and>
-											<then>
-												<propertyregex property="distro.src.filename"
-													input="eclipse-java-luna-R-macosx-cocoa-x86_64.tar.gz"
-													override="true" regexp="(.*)" select="\1" casesensitive="false" />
-											</then>
-										</if>
+<!-- 								'target architecture' for distros -->
+<!-- 								<for -->
+<!-- 									list="macosx-cocoa-x86_64;win32-win32-x86;win32-win32-x86_64;linux-gtk-x86;linux-gtk-x86_64" -->
+<!-- 									param="environment" delimiter=";" parallel="false"> -->
+<!-- 									<sequential> -->
+<!-- 										<propertyregex property="distro.os" input="@{environment}" -->
+<!-- 											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\1" -->
+<!-- 											casesensitive="false" /> -->
+<!-- 										<propertyregex property="distro.ws" input="@{environment}" -->
+<!-- 											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\2" -->
+<!-- 											casesensitive="false" /> -->
+<!-- 										<propertyregex property="distro.arch" input="@{environment}" -->
+<!-- 											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\3" -->
+<!-- 											casesensitive="false" /> -->
+<!-- 										<echo>distro.os ${distro.os} </echo> -->
+<!-- 										<echo>distro.ws ${distro.ws} </echo> -->
+<!-- 										<echo>distro.arch ${distro.arch} </echo> -->
+<!-- 										naming is platform specific, so we have to make a distinction -->
+<!-- 											here (as we only have two platforms, we do not have to make any other distinctions  -->
+<!-- 											so far) -->
+<!-- 										<if> -->
+<!-- 											<and> -->
+<!-- 												<equals arg1="${distro.os}" arg2="win32" /> -->
+<!-- 												<equals arg1="${distro.ws}" arg2="win32" /> -->
+<!-- 												<equals arg1="${distro.arch}" arg2="x86" /> -->
+<!-- 											</and> -->
+<!-- 											<then> -->
+<!-- 												<propertyregex property="distro.src.filename" -->
+<!-- 													input="eclipse-java-luna-R-win32.zip" override="true" -->
+<!-- 													regexp="(.*)" select="\1" casesensitive="false" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<if> -->
+<!-- 											<and> -->
+<!-- 												<equals arg1="${distro.os}" arg2="win32" /> -->
+<!-- 												<equals arg1="${distro.ws}" arg2="win32" /> -->
+<!-- 												<equals arg1="${distro.arch}" arg2="x86_64" /> -->
+<!-- 											</and> -->
+<!-- 											<then> -->
+<!-- 												<propertyregex property="distro.src.filename" -->
+<!-- 													input="eclipse-java-luna-R-win32-x86_64.zip" override="true" -->
+<!-- 													regexp="(.*)" select="\1" casesensitive="false" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<if> -->
+<!-- 											<and> -->
+<!-- 												<equals arg1="${distro.os}" arg2="linux" /> -->
+<!-- 												<equals arg1="${distro.ws}" arg2="gtk" /> -->
+<!-- 												<equals arg1="${distro.arch}" arg2="x86_64" /> -->
+<!-- 											</and> -->
+<!-- 											<then> -->
+<!-- 												<propertyregex property="distro.src.filename" -->
+<!-- 													input="eclipse-java-luna-R-linux-gtk-x86_64.tar.gz" -->
+<!-- 													override="true" regexp="(.*)" select="\1" casesensitive="false" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<if> -->
+<!-- 											<and> -->
+<!-- 												<equals arg1="${distro.os}" arg2="linux" /> -->
+<!-- 												<equals arg1="${distro.ws}" arg2="gtk" /> -->
+<!-- 												<equals arg1="${distro.arch}" arg2="x86" /> -->
+<!-- 											</and> -->
+<!-- 											<then> -->
+<!-- 												<propertyregex property="distro.src.filename" -->
+<!-- 													input="eclipse-java-luna-R-linux-gtk.tar.gz" override="true" -->
+<!-- 													regexp="(.*)" select="\1" casesensitive="false" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<if> -->
+<!-- 											<and> -->
+<!-- 												<equals arg1="${distro.os}" arg2="macosx" /> -->
+<!-- 												<equals arg1="${distro.ws}" arg2="cocoa" /> -->
+<!-- 												<equals arg1="${distro.arch}" arg2="x86_64" /> -->
+<!-- 											</and> -->
+<!-- 											<then> -->
+<!-- 												<propertyregex property="distro.src.filename" -->
+<!-- 													input="eclipse-java-luna-R-macosx-cocoa-x86_64.tar.gz" -->
+<!-- 													override="true" regexp="(.*)" select="\1" casesensitive="false" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
 
-										<if>
-											<not>
-												<available file="${download.distro.dir}" type="dir" />
-											</not>
-											<then>
-												<echo>mkdir ${download.distro.dir}</echo>
-												<mkdir dir="${download.distro.dir}" />
-											</then>
-										</if>
-										<if>
-											<not>
-												<available file="${download.distro.dir}/${distro.src.filename}" />
-											</not>
-											<then>
-												<trycatch>
-													<try>
-														<get src="${download.distro.src}/${distro.src.filename}"
-															dest="${download.distro.dir}/${distro.src.filename}" />
-													</try>
-													<catch>
-														<echo>delete ${download.distro.dir}</echo>
-														<delete file="${download.distro.dir}/${distro.src.filename}" />
-													</catch>
-												</trycatch>
-											</then>
-										</if>
-										<if>
-											<available file="${distro.work.dir}/@{environment}"
-												type="dir" />
-											<then>
-												<delete dir="${distro.work.dir}/@{environment}" />
-											</then>
-										</if>
-										<mkdir dir="${distro.work.dir}/@{environment}" />
-										<if>
-											<or>
-												<equals arg1="${distro.os}" arg2="win32" />
-											</or>
-											<then>
-												<unzip src="${download.distro.dir}/${distro.src.filename}"
-													dest="${distro.work.dir}/@{environment}/" />
-											</then>
-											<else>
-												<exec dir="${distro.work.dir}/@{environment}"
-													executable="tar">
-													<arg line="-xzf ${download.distro.dir}/${distro.src.filename}" />
-												</exec>
-											</else>
-										</if>
-									</sequential>
-								</for>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>repackage.distro</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<taskdef resource="net/sf/antcontrib/antlib.xml"
-									classpathref="maven.plugin.classpath" />
-								<!-- 'target architecture' for distros -->
-								<for
-									list="macosx-cocoa-x86_64;win32-win32-x86;win32-win32-x86_64;linux-gtk-x86;linux-gtk-x86_64"
-									param="environment" delimiter=";" parallel="false">
-									<sequential>
-										<propertyregex property="distro.os" input="@{environment}"
-											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\1"
-											casesensitive="false" />
-										<propertyregex property="distro.ws" input="@{environment}"
-											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\2"
-											casesensitive="false" />
-										<propertyregex property="distro.arch" input="@{environment}"
-											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\3"
-											casesensitive="false" />
-										<echo>mkdir ${distro.dir} for
-											yakindu-sct-luna-R-${distro.os}-${distro.ws}-${distro.arch}.zip</echo>
-										<mkdir dir="${distro.dir}" />
+<!-- 										<if> -->
+<!-- 											<not> -->
+<!-- 												<available file="${download.distro.dir}" type="dir" /> -->
+<!-- 											</not> -->
+<!-- 											<then> -->
+<!-- 												<echo>mkdir ${download.distro.dir}</echo> -->
+<!-- 												<mkdir dir="${download.distro.dir}" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<if> -->
+<!-- 											<not> -->
+<!-- 												<available file="${download.distro.dir}/${distro.src.filename}" /> -->
+<!-- 											</not> -->
+<!-- 											<then> -->
+<!-- 												<trycatch> -->
+<!-- 													<try> -->
+<!-- 														<get src="${download.distro.src}/${distro.src.filename}" -->
+<!-- 															dest="${download.distro.dir}/${distro.src.filename}" /> -->
+<!-- 													</try> -->
+<!-- 													<catch> -->
+<!-- 														<echo>delete ${download.distro.dir}</echo> -->
+<!-- 														<delete file="${download.distro.dir}/${distro.src.filename}" /> -->
+<!-- 													</catch> -->
+<!-- 												</trycatch> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<if> -->
+<!-- 											<available file="${distro.work.dir}/@{environment}" -->
+<!-- 												type="dir" /> -->
+<!-- 											<then> -->
+<!-- 												<delete dir="${distro.work.dir}/@{environment}" /> -->
+<!-- 											</then> -->
+<!-- 										</if> -->
+<!-- 										<mkdir dir="${distro.work.dir}/@{environment}" /> -->
+<!-- 										<if> -->
+<!-- 											<or> -->
+<!-- 												<equals arg1="${distro.os}" arg2="win32" /> -->
+<!-- 											</or> -->
+<!-- 											<then> -->
+<!-- 												<unzip src="${download.distro.dir}/${distro.src.filename}" -->
+<!-- 													dest="${distro.work.dir}/@{environment}/" /> -->
+<!-- 											</then> -->
+<!-- 											<else> -->
+<!-- 												<exec dir="${distro.work.dir}/@{environment}" -->
+<!-- 													executable="tar"> -->
+<!-- 													<arg line="-xzf ${download.distro.dir}/${distro.src.filename}" /> -->
+<!-- 												</exec> -->
+<!-- 											</else> -->
+<!-- 										</if> -->
+<!-- 									</sequential> -->
+<!-- 								</for> -->
+<!-- 							</tasks> -->
+<!-- 						</configuration> -->
+<!-- 						<goals> -->
+<!-- 							<goal>run</goal> -->
+<!-- 						</goals> -->
+<!-- 					</execution> -->
+<!-- 					<execution> -->
+<!-- 						<id>repackage.distro</id> -->
+<!-- 						<phase>verify</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>run</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<tasks> -->
+<!-- 								<taskdef resource="net/sf/antcontrib/antlib.xml" -->
+<!-- 									classpathref="maven.plugin.classpath" /> -->
+<!-- 								'target architecture' for distros -->
+<!-- 								<for -->
+<!-- 									list="macosx-cocoa-x86_64;win32-win32-x86;win32-win32-x86_64;linux-gtk-x86;linux-gtk-x86_64" -->
+<!-- 									param="environment" delimiter=";" parallel="false"> -->
+<!-- 									<sequential> -->
+<!-- 										<propertyregex property="distro.os" input="@{environment}" -->
+<!-- 											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\1" -->
+<!-- 											casesensitive="false" /> -->
+<!-- 										<propertyregex property="distro.ws" input="@{environment}" -->
+<!-- 											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\2" -->
+<!-- 											casesensitive="false" /> -->
+<!-- 										<propertyregex property="distro.arch" input="@{environment}" -->
+<!-- 											override="true" regexp="([^,]*)-([^\,]*)-([^\,]*)" select="\3" -->
+<!-- 											casesensitive="false" /> -->
+<!-- 										<echo>mkdir ${distro.dir} for -->
+<!-- 											yakindu-sct-luna-R-${distro.os}-${distro.ws}-${distro.arch}.zip</echo> -->
+<!-- 										<mkdir dir="${distro.dir}" /> -->
 
-										<if>
-											<or>
-												<equals arg1="${distro.os}" arg2="win32" />
-											</or>
-											<then>
-												<exec dir="${distro.work.dir}/@{environment}"
-													executable="zip">
-													<arg
-														line="-q -r ${distro.dir}/yakindu-sct-luna-R-${distro.os}-${distro.ws}-${distro.arch}.zip eclipse" />
-												</exec>
-											</then>
-											<else>
-												<exec dir="${distro.work.dir}/@{environment}"
-													executable="tar">
-													<arg
-														line="-czf ${distro.dir}/yakindu-sct-luna-R-${distro.os}-${distro.ws}-${distro.arch}.tar.gz eclipse" />
-												</exec>
-											</else>
-										</if>
-									</sequential>
-								</for>
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>1.0b3</version>
-						<exclusions>
-							<exclusion>
-								<groupId>ant</groupId>
-								<artifactId>ant</artifactId>
-							</exclusion>
-						</exclusions>
-					</dependency>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-nodeps</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-eclipserun-plugin</artifactId>
-				<version>${tycho.extras.version}</version>
-				<executions>
-					<!-- Add execution per 'target architecture' 
-					<execution>
-						<id>install-features-into-distro-macosx-cocoa-x86_64</id>
-						<phase>package</phase>
-						<goals>
-							<goal>eclipse-run</goal>
-						</goals>
-						<configuration>
-							<appArgLine>-consoleLog -clean -nosplash -debug \
-								-application\
-								org.eclipse.equinox.p2.director -destination \
-								${distro.work.dir}/macosx-cocoa-x86_64/eclipse/ -profile \
-								${profile} -p2.os macosx -p2.ws cocoa -p2.arch x86_64 \
-								-repository ${update.sites} -installIUs ${features}
-							</appArgLine>
-						</configuration>
-					</execution>-->
-					<execution>
-						<id>install-features-into-distro-win32-win-32-x86</id>
-						<phase>package</phase>
-						<goals>
-							<goal>eclipse-run</goal>
-						</goals>
-						<configuration>
-							<appArgLine>-consoleLog -clean -nosplash -debug \
-								-application\
-								org.eclipse.equinox.p2.director -destination \
-								${distro.work.dir}/win32-win32-x86/eclipse/\
-								-profile\
-								${profile}\
-								-p2.os win32 -p2.ws win32 -p2.arch x86 -repository \
-								${update.sites} -installIUs ${features}
-							</appArgLine>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-features-into-distro-win32-win-32-x86_64</id>
-						<phase>package</phase>
-						<goals>
-							<goal>eclipse-run</goal>
-						</goals>
-						<configuration>
-							<appArgLine>-consoleLog -clean -nosplash -debug \
-								-application\
-								org.eclipse.equinox.p2.director -destination \
-								${distro.work.dir}/win32-win32-x86_64/eclipse/ -profile \
-								${profile} -p2.os win32 -p2.ws win32 -p2.arch x86_64 \
-								-repository\
-								${update.sites} -installIUs ${features}
-							</appArgLine>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-features-into-distro-linux-gtk-x86</id>
-						<phase>package</phase>
-						<goals>
-							<goal>eclipse-run</goal>
-						</goals>
-						<configuration>
-							<appArgLine>-consoleLog -clean -nosplash -debug \
-								-application\
-								org.eclipse.equinox.p2.director -destination \
-								${distro.work.dir}/linux-gtk-x86/eclipse/ -profile \
-								${profile}\
-								-p2.os linux -p2.ws gtk -p2.arch x86 \
-								-repository\
-								${update.sites} -installIUs ${features}
-							</appArgLine>
-						</configuration>
-					</execution>
-					<execution>
-						<id>install-features-into-distro-linux-gtk-x86_64</id>
-						<phase>package</phase>
-						<goals>
-							<goal>eclipse-run</goal>
-						</goals>
-						<configuration>
-							<appArgLine>-consoleLog -clean -nosplash -debug \
-								-application\
-								org.eclipse.equinox.p2.director -destination \
-								${distro.work.dir}/linux-gtk-x86_64/eclipse/ -profile \
-								${profile} -p2.os linux -p2.ws gtk -p2.arch x86_64 \
-								-repository\
-								${update.sites} -installIUs ${features}
-							</appArgLine>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+<!-- 										<if> -->
+<!-- 											<or> -->
+<!-- 												<equals arg1="${distro.os}" arg2="win32" /> -->
+<!-- 											</or> -->
+<!-- 											<then> -->
+<!-- 												<exec dir="${distro.work.dir}/@{environment}" -->
+<!-- 													executable="zip"> -->
+<!-- 													<arg -->
+<!-- 														line="-q -r ${distro.dir}/yakindu-sct-luna-R-${distro.os}-${distro.ws}-${distro.arch}.zip eclipse" /> -->
+<!-- 												</exec> -->
+<!-- 											</then> -->
+<!-- 											<else> -->
+<!-- 												<exec dir="${distro.work.dir}/@{environment}" -->
+<!-- 													executable="tar"> -->
+<!-- 													<arg -->
+<!-- 														line="-czf ${distro.dir}/yakindu-sct-luna-R-${distro.os}-${distro.ws}-${distro.arch}.tar.gz eclipse" /> -->
+<!-- 												</exec> -->
+<!-- 											</else> -->
+<!-- 										</if> -->
+<!-- 									</sequential> -->
+<!-- 								</for> -->
+<!-- 							</tasks> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 				<dependencies> -->
+<!-- 					<dependency> -->
+<!-- 						<groupId>ant-contrib</groupId> -->
+<!-- 						<artifactId>ant-contrib</artifactId> -->
+<!-- 						<version>1.0b3</version> -->
+<!-- 						<exclusions> -->
+<!-- 							<exclusion> -->
+<!-- 								<groupId>ant</groupId> -->
+<!-- 								<artifactId>ant</artifactId> -->
+<!-- 							</exclusion> -->
+<!-- 						</exclusions> -->
+<!-- 					</dependency> -->
+<!-- 					<dependency> -->
+<!-- 						<groupId>ant</groupId> -->
+<!-- 						<artifactId>ant-nodeps</artifactId> -->
+<!-- 						<version>1.6.5</version> -->
+<!-- 					</dependency> -->
+<!-- 				</dependencies> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.eclipse.tycho.extras</groupId> -->
+<!-- 				<artifactId>tycho-eclipserun-plugin</artifactId> -->
+<!-- 				<version>${tycho.extras.version}</version> -->
+<!-- 				<executions> -->
+<!-- 					Add execution per 'target architecture'  -->
+<!-- 					<execution> -->
+<!-- 						<id>install-features-into-distro-macosx-cocoa-x86_64</id> -->
+<!-- 						<phase>package</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>eclipse-run</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<appArgLine>-consoleLog -clean -nosplash -debug \ -->
+<!-- 								-application\ -->
+<!-- 								org.eclipse.equinox.p2.director -destination \ -->
+<!-- 								${distro.work.dir}/macosx-cocoa-x86_64/eclipse/ -profile \ -->
+<!-- 								${profile} -p2.os macosx -p2.ws cocoa -p2.arch x86_64 \ -->
+<!-- 								-repository ${update.sites} -installIUs ${features} -->
+<!-- 							</appArgLine> -->
+<!-- 						</configuration> -->
+<!-- 					</execution>-->
+<!-- 					<execution> -->
+<!-- 						<id>install-features-into-distro-win32-win32-x86</id> -->
+<!-- 						<phase>package</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>eclipse-run</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<appArgLine>-consoleLog -nosplash \ -->
+<!-- 								-application \ -->
+<!-- 								org.eclipse.equinox.p2.director -destination \ -->
+<!-- 								${distro.work.dir}/win32-win32-x86/eclipse/ \ -->
+<!-- 								-profile \ -->
+<!-- 								${profile} \ -->
+<!-- 								-p2.os win32 -p2.ws win32 -p2.arch x86 -repository \ -->
+<!-- 								${update.sites} -installIUs ${features} -->
+<!-- 							</appArgLine> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 					<execution> -->
+<!-- 						<id>install-features-into-distro-win32-win-32-x86_64</id> -->
+<!-- 						<phase>package</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>eclipse-run</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<appArgLine>-consoleLog -clean -nosplash -debug \ -->
+<!-- 								-application\ -->
+<!-- 								org.eclipse.equinox.p2.director -destination \ -->
+<!-- 								${distro.work.dir}/win32-win32-x86_64/eclipse/ -profile \ -->
+<!-- 								${profile} -p2.os win32 -p2.ws win32 -p2.arch x86_64 \ -->
+<!-- 								-repository\ -->
+<!-- 								${update.sites} -installIUs ${features} -->
+<!-- 							</appArgLine> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 					<execution> -->
+<!-- 						<id>install-features-into-distro-linux-gtk-x86</id> -->
+<!-- 						<phase>package</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>eclipse-run</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<appArgLine>-consoleLog -clean -nosplash -debug \ -->
+<!-- 								-application\ -->
+<!-- 								org.eclipse.equinox.p2.director -destination \ -->
+<!-- 								${distro.work.dir}/linux-gtk-x86/eclipse/ -profile \ -->
+<!-- 								${profile}\ -->
+<!-- 								-p2.os linux -p2.ws gtk -p2.arch x86 \ -->
+<!-- 								-repository\ -->
+<!-- 								${update.sites} -installIUs ${features} -->
+<!-- 							</appArgLine> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 					<execution> -->
+<!-- 						<id>install-features-into-distro-linux-gtk-x86_64</id> -->
+<!-- 						<phase>package</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>eclipse-run</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<appArgLine>-consoleLog -clean -nosplash -debug \ -->
+<!-- 								-application\ -->
+<!-- 								org.eclipse.equinox.p2.director -destination \ -->
+<!-- 								${distro.work.dir}/linux-gtk-x86_64/eclipse/ -profile \ -->
+<!-- 								${profile} -p2.os linux -p2.ws gtk -p2.arch x86_64 \ -->
+<!-- 								-repository\ -->
+<!-- 								${update.sites} -installIUs ${features} -->
+<!-- 							</appArgLine> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -458,8 +458,7 @@
 								<type>eclipse-plugin</type>
 							</dependency>
 							<dependency>
-								<artifactId>org.eclipse.equinox.p2.artifact.repository
-								</artifactId>
+								<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
 								<type>eclipse-plugin</type>
 							</dependency>
 							<dependency>