Skip to content
Snippets Groups Projects
Commit 68fbea6c authored by david_williams's avatar david_williams
Browse files

cleanup and simplify

parent f807aa00
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 319 deletions
releng.wtpbuilder/components/jsdt_sdk/build.properties
+ 0
− 12
View file @ 68fbea6c
......@@ -49,15 +49,3 @@ compilelogsDir=compilelogs
topLevelElementType=feature
topLevelElementId=org.eclipse.wst.jsdt_sdk.feature
getprereq.eclipse=true
#getprereq.eclipseplatform=false
#getprereq.eclipsetestframework=false
#getprereq.emf=false
#getprereq.emfxsd=false
#getprereq.emfvalidation=false
#getprereq.gef=false
#getprereq.dtp=false
#getprereq.wst=false
#getprereq.jst=false
#getprereq.wtp=false
#getprereq.dltk=false
releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
+ 5
− 1
View file @ 68fbea6c
......@@ -172,11 +172,15 @@
<target
name="getDependencies">
<ant
antfile="${component.dir}/dependency.xml"
antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
<property
name="tobeinstalled.properties"
value="${component.dir}/tobeInstalled.properties"/>
</ant>
</target>
......
releng.wtpbuilder/components/jsdt_sdk/dependency.xml deleted 100644 → 0
+ 0
− 276
View file @ f807aa00
<?xml version="1.0"?>
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
======================================================================
-->
<project
name="test"
default="get"
basedir=".">
<property
environment="env"/>
<!-- required to get proper value of branch specific values -->
<property
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
<property
file="${wtp.builder.home}/components/${component}/build.properties"/>
<target
name="get">
<!--
read in this properties, just so we can make sure our
requested pre-reqs are defined via {groupId}.url
-->
<property
file="${dependency.properties}"/>
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
<property
name="pde.builder.path"
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
<echo
level="debug"
message="pde.builder.path: ${pde.builder.path}"/>
<echo
level="debug"
message="eclipse.builder.version: ${eclipse.builder.version}"/>
<echo
level="debug"
message="eclipse.builder: ${eclipse.builder}"/>
<echo message="dependency.xml basedir: ${basedir}" />
<echo message="dependency properties file: ${dependency.properties}"/>
<echoproperties />
<antcall
target="prereq.eclipse"/>
<antcall
target="prereq.eclipseplatform"/>
<antcall
target="prereq.eclipsetestframework"/>
<antcall
target="prereq.emf"/>
<antcall
target="prereq.emfxsd"/>
<antcall
target="prereq.emfvalidation"/>
<antcall
target="prereq.gef"/>
<antcall
target="prereq.dtp"/>
<antcall
target="prereq.wst"/>
<antcall
target="prereq.jst"/>
<antcall
target="prereq.wtp"/>
<antcall
target="prereq.dltk"/>
</target>
<target
name="prereq.eclipse"
if="getprereq.eclipse">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipse"/>
</antcall>
</target>
<target
name="prereq.eclipseplatform"
if="getprereq.eclipseplatform">
<antcall
target="getAndInstall">
<param
name="groupId"
value="eclipseplatform"/>
</antcall>
</target>
<target
name="prereq.eclipsetestframework"
if="getprereq.eclipsetestframework">
<antcall
target="getAndInstallFramework">
<param
name="groupId"
value="eclipseTestFramework"/>
</antcall>
</target>
<target
name="prereq.emf"
if="getprereq.emf">
<antcall
target="getAndInstall">
<param
name="groupId"
value="emf"/>
</antcall>
</target>
<target
name="prereq.emfxsd"
if="getprereq.emfxsd">
<antcall
target="getAndInstall">
<param
name="groupId"
value="emfxsd"/>
</antcall>
</target>
<target
name="prereq.emfvalidation"
if="getprereq.emfvalidation">
<antcall
target="getAndInstall">
<param
name="groupId"
value="emfvalidation"/>
</antcall>
</target>
<target
name="prereq.gef"
if="getprereq.gef">
<antcall
target="getAndInstall">
<param
name="groupId"
value="gef"/>
</antcall>
</target>
<target
name="prereq.dtp"
if="getprereq.dtp">
<antcall
target="getAndInstall">
<param
name="groupId"
value="dtp"/>
</antcall>
</target>
<target
name="prereq.wst"
if="getprereq.wst">
<antcall
target="getAndInstall">
<param
name="groupId"
value="wst"/>
</antcall>
</target>
<target
name="prereq.jst"
if="getprereq.jst">
<antcall
target="getAndInstall">
<param
name="groupId"
value="jst"/>
</antcall>
</target>
<target
name="prereq.wtp"
if="getprereq.wtp">
<antcall
target="getAndInstall">
<param
name="groupId"
value="wtp"/>
</antcall>
</target>
<target
name="prereq.dltk"
if="getprereq.dltk">
<antcall
target="getAndInstall">
<param
name="groupId"
value="dltk"/>
</antcall>
</target>
<target
name="getAndInstall"
if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
<property
name="groupId"
value="${groupId}"/>
</ant>
<ant
antfile="${dependencyTargets}"
target="installDependency">
<property
name="groupId"
value="${groupId}"/>
<property
name="install.destination"
value="${base.install.dir}"/>
</ant>
</target>
<target
name="getAndInstallRepo"
if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
<property
name="groupId"
value="${groupId}"/>
</ant>
<ant
antfile="${dependencyTargets}"
target="installRepo">
<property
name="groupId"
value="${groupId}"/>
<property
name="install.destination"
value="${base.install.dir}"/>
</ant>
</target>
<!-- use getAndInstallFramework to decide based on whether or not 'tobeinstalledfeaturegroups' exists -->
<target
name="getAndInstallFramework"
depends="tryRepo"
unless="isRepo">
<antcall
target="getAndInstall">
<param
name="groupId"
value="${groupId}"/>
</antcall>
</target>
<target
name="tryRepo"
depends="checkIfRepo"
if="isRepo">
<antcall
target="getAndInstallRepo">
<param
name="groupId"
value="${groupId}"/>
</antcall>
</target>
<target
name="checkIfRepo">
<condition
property="isRepo">
<isset
property="${groupId}.tobeinstalledfeaturegroups"/>
</condition>
</target>
</project>
\ No newline at end of file
releng.wtpbuilder/components/jsdt_sdk/tobeInstalled.properties 0 → 100644
+ 12
− 0
View file @ 68fbea6c
getprereq.eclipse=true
#getprereq.eclipseplatform=false
#getprereq.eclipsetestframework=false
#getprereq.emf=false
#getprereq.emfxsd=false
#getprereq.emfvalidation=false
#getprereq.gef=false
#getprereq.dtp=false
#getprereq.wst=false
#getprereq.jst=false
#getprereq.wtp=false
#getprereq.dltk=false
\ No newline at end of file
releng.wtpbuilder/components/jsdt_tests/build.properties
+ 0
− 12
View file @ 68fbea6c
......@@ -49,15 +49,3 @@ topLevelElementId=org.eclipse.wst.jsdt_tests.feature
generateSourceReferences=true
getprereq.eclipse=true
#getprereq.eclipseplatform=false
getprereq.eclipsetestframework=true
#getprereq.emf=false
#getprereq.emfxsd=false
#getprereq.emfvalidation=false
#getprereq.gef=false
#getprereq.dtp=false
#getprereq.wst=false
#etprereq.jst=false
#getprereq.wtp=false
#etprereq.dltk=false
releng.wtpbuilder/components/jsdt_tests/customTargets.xml
+ 5
− 1
View file @ 68fbea6c
......@@ -171,11 +171,15 @@
<target
name="getDependencies">
<ant
antfile="${component.dir}/dependency.xml"
antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
target="get">
<property
name="base.install.dir"
value="${buildRoot}"/>
<property
name="tobeinstalled.properties"
value="${component.dir}/tobeInstalled.properties"/>
</ant>
</target>
......
releng.wtpbuilder/components/jsdt_tests/tobeInstalled.properties 0 → 100644
+ 12
− 0
View file @ 68fbea6c
getprereq.eclipse=true
#getprereq.eclipseplatform=false
getprereq.eclipsetestframework=true
#getprereq.emf=false
#getprereq.emfxsd=false
#getprereq.emfvalidation=false
#getprereq.gef=false
#getprereq.dtp=false
#getprereq.wst=false
#getprereq.jst=false
#getprereq.wtp=false
#getprereq.dltk=false
\ No newline at end of file
releng.wtpbuilder/components/jsdt_tests/dependency.xml → releng.wtpbuilder/scripts/dependency/dependency.xml
+ 19
− 17
View file @ 68fbea6c
<?xml version="1.0"?>
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
======================================================================
-->
<!--
======================================================================
Properties that must be passed to this script: base.install.dir
dependencyTargets local.cache.dir dependency.properties
======================================================================
-->
<project
name="test"
default="get"
basedir=".">
default="get">
<property
environment="env"/>
<!-- required to get proper value of branch specific values -->
......@@ -20,18 +20,21 @@
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
<property
file="${wtp.builder.home}/components/${component}/build.properties"/>
file="build.properties"/>
<target
name="get">
<!--
<!--
read in this properties, just so we can make sure our
requested pre-reqs are defined via {groupId}.url
-->
<property
file="${dependency.properties}"/>
<property
file="${tobeinstalled.properties}"/>
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
<property
......@@ -46,11 +49,7 @@
<echo
level="debug"
message="eclipse.builder: ${eclipse.builder}"/>
<echo message="dependency.xml basedir: ${basedir}" />
<echo message="dependency properties file: ${dependency.properties}"/>
<echoproperties />
<antcall
target="prereq.eclipse"/>
<antcall
......@@ -76,6 +75,7 @@
<antcall
target="prereq.dltk"/>
</target>
<target
name="prereq.eclipse"
if="getprereq.eclipse">
......@@ -196,6 +196,7 @@
value="dltk"/>
</antcall>
</target>
<target
name="getAndInstall"
if="${groupId}.url">
......@@ -270,4 +271,5 @@
</condition>
</target>
</project>
\ No newline at end of file
</project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent