From d2606a731ba38d74c7fad9e45365ff40417d1f1a Mon Sep 17 00:00:00 2001 From: david_williams <david_williams> Date: Sun, 6 Mar 2011 01:58:09 +0000 Subject: [PATCH] 325066 - reconsider customizeAccessRules --- .../components/template/customTargets.xml | 2 +- .../components/template_sdk/customTargets.xml | 2 +- .../components/template_tests/customTargets.xml | 2 +- .../components/dali-sdk/customTargets.xml | 4 +++- .../components/dali.tests/customTargets.xml | 2 +- .../components/dali4x-sdk/customTargets.xml | 2 +- .../components/dali4x.tests/customTargets.xml | 2 +- .../components/jsdt_sdk/customTargets.xml | 2 +- .../components/jsdt_tests/customTargets.xml | 2 +- .../components/jst-sdk/customTargets.xml | 2 +- .../components/jst.tests/customTargets.xml | 2 +- .../components/jst4x-sdk/customTargets.xml | 2 +- .../components/jst4x.tests/customTargets.xml | 2 +- .../components/wst-sdk/customTargets.xml | 2 +- .../components/wst.tests/customTargets.xml | 2 +- .../components/wst4x-sdk/customTargets.xml | 2 +- .../components/wst4x.tests/customTargets.xml | 2 +- .../components/wtp-buildTools/customTargets.xml | 2 +- .../scripts/build/customizeAccessRules.xml | 17 +++++++++++++++++ 19 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 releng.wtpbuilder/scripts/build/customizeAccessRules.xml diff --git a/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml index 725163945..b6ebcaa25 100644 --- a/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml +++ b/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml @@ -183,7 +183,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml index f6a73d464..d0310e2da 100644 --- a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml +++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml @@ -183,7 +183,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml index e21fd233b..ab6008119 100644 --- a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml +++ b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml @@ -183,7 +183,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml index 18b049425..48478fc55 100644 --- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml @@ -183,7 +183,9 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> + + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml index 8694d21d5..3a551fafe 100644 --- a/releng.wtpbuilder/components/dali.tests/customTargets.xml +++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml @@ -183,7 +183,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml b/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml index 4a15bfbab..977e9fb59 100644 --- a/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml @@ -183,7 +183,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/dali4x.tests/customTargets.xml b/releng.wtpbuilder/components/dali4x.tests/customTargets.xml index 37b20e180..fefbfcd98 100644 --- a/releng.wtpbuilder/components/dali4x.tests/customTargets.xml +++ b/releng.wtpbuilder/components/dali4x.tests/customTargets.xml @@ -182,7 +182,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml index b7ee15a8d..08a0126c1 100644 --- a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml +++ b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml @@ -200,7 +200,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml index 4f1d9010f..0dadc3fac 100644 --- a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml +++ b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml @@ -199,7 +199,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml index aad1cff8a..085169d60 100644 --- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml @@ -182,7 +182,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml index 37b20e180..fefbfcd98 100644 --- a/releng.wtpbuilder/components/jst.tests/customTargets.xml +++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml @@ -182,7 +182,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml b/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml index aad1cff8a..085169d60 100644 --- a/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml @@ -182,7 +182,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/jst4x.tests/customTargets.xml b/releng.wtpbuilder/components/jst4x.tests/customTargets.xml index 37b20e180..fefbfcd98 100644 --- a/releng.wtpbuilder/components/jst4x.tests/customTargets.xml +++ b/releng.wtpbuilder/components/jst4x.tests/customTargets.xml @@ -182,7 +182,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml index 42e085fbf..638c238ae 100644 --- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml @@ -183,7 +183,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml index e8a833249..511333932 100644 --- a/releng.wtpbuilder/components/wst.tests/customTargets.xml +++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml @@ -184,7 +184,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml b/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml index 52fe637b7..1343e7041 100644 --- a/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml @@ -184,7 +184,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/wst4x.tests/customTargets.xml b/releng.wtpbuilder/components/wst4x.tests/customTargets.xml index e8a833249..511333932 100644 --- a/releng.wtpbuilder/components/wst4x.tests/customTargets.xml +++ b/releng.wtpbuilder/components/wst4x.tests/customTargets.xml @@ -184,7 +184,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml index 689f315ca..68fe121ff 100644 --- a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml +++ b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml @@ -181,7 +181,7 @@ --> <target name="postGenerate"> - <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/> </target> <!-- Steps to do before running the build.xmls for the elements being diff --git a/releng.wtpbuilder/scripts/build/customizeAccessRules.xml b/releng.wtpbuilder/scripts/build/customizeAccessRules.xml new file mode 100644 index 000000000..1ca3ee3ea --- /dev/null +++ b/releng.wtpbuilder/scripts/build/customizeAccessRules.xml @@ -0,0 +1,17 @@ +<project + default="customizeAccessRules" + basedir="."> + <property + name="keyCfgFile" + value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> + <echo + level="info" + message="keyCfgFile: ${keyCfgFile}"/> + <property file="${keyCfgFile}"/> + + <target + name="customizeAccessRules" + if="customizeAccessRules"> + <customizeAccessRules bundleDirectory="${buildDirectory}/plugins"/> + </target> +</project> \ No newline at end of file -- GitLab