1.1 --- a/samples/libs/build.xml Tue Mar 01 21:32:09 2011 +0100
1.2 +++ b/samples/libs/build.xml Wed Mar 02 15:33:24 2011 +0100
1.3 @@ -43,12 +43,14 @@
1.4 </antcall>
1.5 </target>
1.6
1.7 - <target name="autoupdate-task">
1.8 + <available property="autoupdate.tasks.jar" file="dist/tasks.jar"/>
1.9 + <property name="bootstrap.url" value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar"/>
1.10 + <property name="netbeans.updatecenter.url" value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz"/>
1.11 + <target name="-download-autoupdate-task" unless="autoupdate.tasks.jar">
1.12 <mkdir dir="dist"/>
1.13 - <property name="bootstrap.url" value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar"/>
1.14 - <property name="netbeans.updatecenter.url" value="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz"/>
1.15 -
1.16 <get dest="dist/tasks.jar" src="${bootstrap.url}" usetimestamp="true"/>
1.17 + </target>
1.18 + <target name="autoupdate-task" depends="-download-autoupdate-task">
1.19 <taskdef
1.20 name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate"
1.21 classpath="dist/tasks.jar"
1.22 @@ -65,7 +67,7 @@
1.23 <property name="library.zip" location="dist/${library}.zip"/>
1.24
1.25 <echo message="Checking for ${library.jar}"/>
1.26 - <available file="${library.jar}" property="library.available"/>
1.27 + <available file="${library.jar}" property="library.available"/>
1.28 </target>
1.29 <target name="-library" depends="-library-check" unless="library.available">
1.30 <mkdir dir="dist"/>
1.31 @@ -77,7 +79,14 @@
1.32 </condition>
1.33 </fail>
1.34 </target>
1.35 - <target name="-library-from-nbm">
1.36 + <target name="-library-from-nbm-check">
1.37 + <resourcecount property="library.from.nbm.available" when="greater" count="0">
1.38 + <fileset dir="dist">
1.39 + <include name="${library.include}"/>
1.40 + </fileset>
1.41 + </resourcecount>
1.42 + </target>
1.43 + <target name="-library-from-nbm" depends="-library-from-nbm-check" unless="library.from.nbm.available">
1.44 <fail message="You need to specify library name" unless="library"/>
1.45 <autoupdate todir="dist" updatecenter="${netbeans.updatecenter.url}">
1.46 <modules includes="${library}"/>