diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties index ddfd61e6ad59fc6f675daf2aec3c29cad84e286e..907cb4d3e131af62a959fb5f0b801ffa7d2d9ab0 100644 --- a/releng.wtpbuilder/build.properties +++ b/releng.wtpbuilder/build.properties @@ -36,7 +36,7 @@ eclipse.builder=org.eclipse.releng.basebuilder #eclipse.builder.version=vI20051215-1506 #eclipse.builder.version=vI20060210-1640 eclipse.builder.version=v20070215 -eclipse.builder.fetch=true +#eclipse.builder.fetch=true archivesFormat=*,*,*-antZip diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml index 3adda9ef29bc7b8dbd076577a6b75e1b147e56d5..610140a2d00c9fb66f5eaf14e413f90aef9714c2 100644 --- a/releng.wtpbuilder/components/jst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml @@ -12,9 +12,17 @@ default="get"> <target name="get"> + <antcall target="getAndInstall"> <param name="groupId" value="orbitthirdparty" /> </antcall> + + <mkdir dir="${buildDirectory}/maps/releng/maps" /> + <antcall target="getAndInstall"> + <param name="groupId" value="orbitthirdpartymap" /> + <param name="base.install.dir" + value="${buildDirectory}/maps/releng/maps/" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml index c29d01119f945708aecc3c19f1eb20bd89042e7e..9720e76ae23e0c45a6b3c1bae97fbf8d5586d66b 100644 --- a/releng.wtpbuilder/components/jst.tests/dependency.xml +++ b/releng.wtpbuilder/components/jst.tests/dependency.xml @@ -13,9 +13,17 @@ default="get"> <target name="get"> + <antcall target="getAndInstall"> <param name="groupId" value="orbitthirdparty" /> </antcall> + + <mkdir dir="${buildDirectory}/maps/releng/maps" /> + <antcall target="getAndInstall"> + <param name="groupId" value="orbitthirdpartymap" /> + <param name="base.install.dir" + value="${buildDirectory}/maps/releng/maps/" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml index cf3a6b87d495506e31d9cbb0622f2d91fdcbcda1..a6222d5d8d08e1c16aa8c650613811241a8a3b47 100644 --- a/releng.wtpbuilder/components/jst/dependency.xml +++ b/releng.wtpbuilder/components/jst/dependency.xml @@ -13,9 +13,17 @@ default="get"> <target name="get"> + <antcall target="getAndInstall"> <param name="groupId" value="orbitthirdparty" /> </antcall> + + <mkdir dir="${buildDirectory}/maps/releng/maps" /> + <antcall target="getAndInstall"> + <param name="groupId" value="orbitthirdpartymap" /> + <param name="base.install.dir" + value="${buildDirectory}/maps/releng/maps/" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml index d984c169eb5327c2d8d166465e4920fc0a8225cb..f22abbd0fc2d7b6fe765a3ce780338325b745d8d 100644 --- a/releng.wtpbuilder/components/wst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml @@ -12,9 +12,16 @@ <target name="get"> - <antcall target="getAndInstall"> + <antcall target="getAndInstall"> <param name="groupId" value="orbitthirdparty" /> </antcall> + + <mkdir dir="${buildDirectory}/maps/releng/maps" /> + <antcall target="getAndInstall"> + <param name="groupId" value="orbitthirdpartymap" /> + <param name="base.install.dir" + value="${buildDirectory}/maps/releng/maps/" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" value="thirdparty" /> </antcall> diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml index 48dc45d6f56d63c4d4d4a5dc0183a8b631bc9079..3d2a69588c24c4600b37d023ffeb838ce6b802c0 100644 --- a/releng.wtpbuilder/components/wst.tests/dependency.xml +++ b/releng.wtpbuilder/components/wst.tests/dependency.xml @@ -13,10 +13,17 @@ default="get"> <target name="get"> - + <antcall target="getAndInstall"> <param name="groupId" value="orbitthirdparty" /> </antcall> + + <mkdir dir="${buildDirectory}/maps/releng/maps" /> + <antcall target="getAndInstall"> + <param name="groupId" value="orbitthirdpartymap" /> + <param name="base.install.dir" + value="${buildDirectory}/maps/releng/maps/" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml index 10b921b77f9d2565e1232721086df3983368376a..7229174675b98b695a96be4fbb17b57148bc5cfe 100644 --- a/releng.wtpbuilder/scripts/dependency/build.xml +++ b/releng.wtpbuilder/scripts/dependency/build.xml @@ -130,7 +130,13 @@ </selector> </isfileselected> </condition> - + <condition property="file.type" value="map"> + <isfileselected file="${dependency.file}"> + <selector> + <filename name="**/*.map" /> + </selector> + </isfileselected> + </condition> <antcall target="install-${file.type}" /> </target> @@ -151,6 +157,11 @@ src="${local.cache.dir}/${dependency.file}" overwrite="true" /> </target> + <target name="install-map"> + <copy todir="${install.destination}" + file="${local.cache.dir}/${dependency.file}" + overwrite="true" /> + </target> <target name="checkDependency"> <dirname file="${ant.file}"