Mercurial > public > develkit

changeset 33:f8b0dde24622

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace groovy script with custom task to correct memory leak
author smith@nwoca.org
date Sat, 16 Apr 2011 16:27:53 -0400
parents 9480be99ec76
children 2704c479a05f
files bootstrap.xml sonar-ant.xml
diffstat 2 files changed, 13 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap.xml	Tue Apr 12 17:24:22 2011 -0400
+++ b/bootstrap.xml	Sat Apr 16 16:27:53 2011 -0400
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ssdt.bootstrap"  basedir="." default="" xmlns:ssdt="http://www.ssdt-ohio.org/ant/common">
+<project name="ssdt.bootstrap"  basedir="." default="" 
+    xmlns:ssdt="http://www.ssdt-ohio.org/ant/common"
+    xmlns:ssdtant="antlib:org.ssdt_ohio.tools.ant">
+
     <echo message="invoking ssdt bootstrap" level="info"/>
 
     <property   file="${ssdt.devel.kit}/private.properties"/>
@@ -63,20 +66,14 @@
         </sequential>
     </macrodef>
 
+     <property           name="ssdt.ant.jar.src"
+                        value="http://ivy.ssdt.nwoca.org/repository/ssdt/ssdt-ant.jar"/>
+
+    <ssdt:fetch         dest="${user.home.ant.lib}/ssdt-ant.jar"
+                        src="${ssdt.ant.jar.src}"/>
+
     <ssdt:import-ant file="antcontrib-ant.xml"/>
     <ssdt:import-ant file="ssdt-common-build.xml"/>
     <ssdt:import-ant file="netbeans-ant.xml"/>
 
-    <macrodef name="add-dependency"
-              description="Dynamically adds a new dependencty into an existing target."
-              uri="http://www.ssdt-ohio.org/ant/common">
-        <attribute name="target" description="Target to add dendency for"/>
-        <attribute name="depends" description="new dependancy for target"/>
-        <sequential>
-            <groovy>
-                project.targets['@{target}'].addDependency('@{depends}')
-            </groovy>
-        </sequential>
-    </macrodef>
-
 </project>
--- a/sonar-ant.xml	Tue Apr 12 17:24:22 2011 -0400
+++ b/sonar-ant.xml	Sat Apr 16 16:27:53 2011 -0400
@@ -2,7 +2,8 @@
 <project name="sonar-project-tasks" default="" basedir="."
          xmlns:ivy="antlib:fr.jayasoft.ivy.ant"
          xmlns:sonar="antlib:org.sonar.ant"
-         xmlns:ssdt="http://www.ssdt-ohio.org/ant/common">
+         xmlns:ssdt="http://www.ssdt-ohio.org/ant/common"
+         xmlns:ssdtant="antlib:org.ssdt_ohio.tools.ant">
 
     <description>Sonar Ant tasks</description>
 
@@ -12,7 +13,7 @@
                         src="${ssdt.sonar.jar.src}"/>
     <ssdt:import-ant    file="jacoco-ant.xml"/>
 
-    <ssdt:add-dependency target="init" depends="-sonar-init"/>
+    <ssdtant:add-dependency target="init" depends="-sonar-init"/>
 
     <target name="-sonar-init">
         <echo message="Sonar: Active"/>