--- a/buildframework/helium/tools/preparation/preparation.ant.xml	Thu Mar 04 15:10:37 2010 +0200
+++ b/buildframework/helium/tools/preparation/preparation.ant.xml	Tue Apr 27 08:33:08 2010 +0300
@@ -37,6 +37,7 @@
     -->
     <property name="ccmgetinput" value="ccmgetinput" />
 
+    <typedef file="${ant.file.preparation}/../preparation.antlib.xml" uri="http://www.nokia.com/helium"/>
     <import file="bom/bom.ant.xml" />
     <import file="password.ant.xml" />
     <import file="ido-prep.ant.xml" />
@@ -70,7 +71,6 @@
                         <exec executable="perl" dir="${build.drive}/" failonerror="true">
                             <arg value="${getenv.tool.location}"/>
                             <arg value="-start"/>
-                            <arg value="-nosoap"/>            
                             <arg value="-path"/>
                             <arg value="${base_release.path}"/>
                             <arg line="${base_release.getenv_options}"/>
@@ -308,7 +308,7 @@
         <propertyref name="release.notes.password" />
         <propertyref name="nwiki.password" />
         <propertyref name="noe.password" />
-        <propertyref name="ats3.password" />
+        <propertyref name="ats.password" />
         <propertyref name="hydra.password" />
     </propertyset>
     
@@ -359,9 +359,12 @@
             </then>
             <else>
                 <if>
-                    <not>
-                        <isset property="build.drive.notdefined"/>
-                    </not>
+                    <and>
+                        <not>
+                            <isset property="build.drive.notdefined"/>
+                        </not>
+                        <os family="windows"/>
+                    </and>
                     <then>
                         <echo>Unsubsting any existing path substed to ${build.drive}.
 If this fails, it is because there was no substed drive.</echo>
@@ -396,8 +399,11 @@
                         </script>
                     </then>
                 </if>
-                <!-- Create a new directory for the build and subst it to a drive. -->
+                <!-- Create a new directory for the build and subst it to a drive. 
+                fail build if prep.root.dir property is not set.-->
+                <fail unless="prep.root.dir" message="prep.root.dir value should be specified." />
                 <mkdir dir="${prep.build.dir}" />
+                
                 <exec osfamily="windows" executable="subst.exe" failonerror="false">
                     <arg value="${build.drive}" />
                     <arg value="${prep.build.dir}" />
@@ -468,6 +474,12 @@
     <!-- Used to prep the build area, now only a placeholder target for the customer -->
     <target name="prep-copy" />
 
+    <!--* @property ccm.enabled
+    Defines that property if you want the ccm-get-input step to be run during the build area preparation.
+    @type boolean
+    @editable required
+    @scope public
+    -->
     
     <condition property="run.ccm">
         <and>
@@ -574,5 +586,24 @@
         </if>
     </target>
     
+    <!--
+      Simple target to create a set of directory based on a path reference.
+     -->
+    <target name="create-directory-structure">
+        <if>
+            <isreference refid="directory.structure.config" />
+            <then>
+                <for param="dir">
+                    <path refid="directory.structure.config" />
+                    <sequential>
+                        <mkdir dir="@{dir}" />
+                    </sequential>
+                </for>
+            </then>
+            <else>
+                <echo>'directory.structure.config' reference not found, so not any directory structure will be created.</echo>
+            </else>
+        </if>
+    </target>
     
 </project>