# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430124 -7200
# Node ID 7e5f84aa1196bdc9688686cb55b4d11acbdfac7f
# Parent  30285b0ed28e1affe2706c0b7d9327be420ff5bf
Merge: Geertjan's changes

diff -r 30285b0ed28e -r 7e5f84aa1196 samples/build.xml
--- a/samples/build.xml	Sat Jun 14 09:55:24 2008 +0200
+++ b/samples/build.xml	Sat Jun 14 09:55:24 2008 +0200
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="apidesign.org" default="test" basedir=".">
-    <dirset id="examples" dir=".">
+<project name="samples" default="test" basedir=".">
+    <property name="samples.dir" location="${ant.file.samples}/.."/>
+    <dirset id="examples" dir="${samples.dir}">
         <include name="**/nbproject"/>
         <exclude name="apifest1/day3-intermezzo/**"/>
         <exclude name="apifest1/infrastructure/testing-template/**"/>
@@ -8,15 +9,15 @@
     
     
     <target name="clean">
-        <delete dir="build"/>
-        <delete dir="libs/dist"/>
+        <delete dir="${samples.dir}/build"/>
+        <delete dir="${samples.dir}/libs/dist"/>
         <subant target="clean" antfile="../build.xml">
             <dirset refid="examples"/>
         </subant>
     </target>
 
     <target name="build">
-        <ant dir="libs"/>
+        <ant dir="${samples.dir}/libs"/>
         <subant target="compile" antfile="../build.xml">
             <dirset refid="examples"/>
         </subant>
@@ -29,17 +30,17 @@
     </target>
     
     <target name="-version" unless="version">
-        <exec dir="${ant.file.apidesign.org}/.." outputproperty="version" executable="/bin/sh">
-            <arg file="version.sh"/>
+        <exec dir="${samples.dir}" outputproperty="version" executable="/bin/sh">
+            <arg file="${samples.dir}/version.sh"/>
         </exec>
     </target>
 
     <target name="sources" depends="-version,clean">
         <fail unless="version"/>
         
-        <loadfile srcfile="${ant.file.apidesign.org}/../../../.hgignore" property="hgignore"/>
-        <mkdir dir="build"/>
-        <zip basedir="${ant.file.apidesign.org}/.." destfile="build/apidesign-${version}.zip">
+        <loadfile srcfile="${samples.dir}/../../.hgignore" property="hgignore"/>
+        <mkdir dir="${samples.dir}/build"/>
+        <zip basedir="${samples.dir}/.." destfile="${samples.dir}/build/apidesign-${version}.zip">
             <not>
                 <containsregexp expression="${hgignore}"/>
             </not>