diff --git a/releng/org.eclipse.rse.build/build.xml b/releng/org.eclipse.rse.build/build.xml
index a4a50f91bf7..1616d8e1982 100644
--- a/releng/org.eclipse.rse.build/build.xml
+++ b/releng/org.eclipse.rse.build/build.xml
@@ -1,32 +1,32 @@
 <project name="Build All Elements" default="main">
-<!-- ===================================================================== -->
-<!-- Custom settings -->
-<!-- ===================================================================== -->
 
-<property name="head" value="${baseLocation}\..\..\packagehome" />
-<property name="configs" value="*,*,*"/>
-<path id="path_bootclasspath">
-	<fileset dir="${java.home}/lib">
-		<include name="*.jar" />
-	</fileset>
-</path>
-<property name="bootclasspath" refid="path_bootclasspath" />
-<tstamp>
-	<format property="today" pattern="E" locale="en"/>
-	<format property="timestamp" pattern="yyyyMMdd" locale="en"/>
-</tstamp>
+	<!-- ===================================================================== -->
+	<!-- Custom settings -->
+	<!-- ===================================================================== -->
+	<property name="head" value="${baseLocation}\..\..\packagehome" />
+	<property name="configs" value="*,*,*" />
+	<path id="path_bootclasspath">
+		<fileset dir="${java.home}/lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	<property name="bootclasspath" refid="path_bootclasspath" />
+	<tstamp>
+		<format property="today" pattern="E" locale="en" />
+		<format property="timestamp" pattern="yyyyMMdd" locale="en" />
+	</tstamp>
 
-<!-- ===================================================================== -->
-<!-- Global properties.  See the build.properties for information on -->
-<!-- the properties which callers can control. -->
-<!-- ===================================================================== -->
-<property name="builderDirectory" location="${builder}"/>
-<property name="buildProperties" location="${builder}/build.properties"/>
-<property file="${buildProperties}"/>
-<property name="customTargets" location="${builderDirectory}/customTargets.xml"/>
-<property name="genericTargets" location="genericTargets.xml"/>
-<property name="packageDirectory" location="%{packageDirectory}"/>
-<property name="publishDirectory" location="%{publishDirectory}"/>
+	<!-- ===================================================================== -->
+	<!-- Global properties.  See the build.properties for information on -->
+	<!-- the properties which callers can control. -->
+	<!-- ===================================================================== -->
+	<property name="builderDirectory" location="${builder}" />
+	<property name="buildProperties" location="${builder}/build.properties" />
+	<property file="${buildProperties}" />
+	<property name="customTargets" location="${builderDirectory}/customTargets.xml" />
+	<property name="genericTargets" location="genericTargets.xml" />
+	<property name="packageDirectory" location="%{packageDirectory}" />
+	<property name="publishDirectory" location="%{publishDirectory}" />
 
 	<condition property="doExtract" value="true">
 		<equals arg1="${bld_do_extract}" arg2="yes" />
@@ -37,117 +37,113 @@
 	<condition property="doPackage" value="true">
 		<equals arg1="${bld_do_package}" arg2="yes" />
 	</condition>
-	
+
 	<condition property="doPublish" value="true">
 		<equals arg1="${bld_do_publish}" arg2="yes" />
 	</condition>
-	
-<!-- ===================================================================== -->
-<!-- main entry point to setup, fetch, generate, build etc. Use -->
-<!-- the customTargets.xml to modify the build behaviour. -->
-<!-- ===================================================================== -->
 
-<!-- ******* add in the descriptions for each of the top level targets to teh target decl -->
+	<!-- ===================================================================== -->
+	<!-- main entry point to setup, fetch, generate, build etc. Use -->
+	<!-- the customTargets.xml to modify the build behaviour. -->
+	<!-- ===================================================================== -->
+	<!-- ******* add in the descriptions for each of the top level targets to the target decl -->
+	<target name="main" description="the main build target">
+		<antcall target="preBuild" />
+		<antcall target="fetch" />
+		<antcall target="generate" />
+		<antcall target="process" />
+		<antcall target="assemble" />
+		<antcall target="postBuild" />
+	</target>
 
-<target name="main" description="the main build target">	
-    <antcall target="preBuild"/>
- 	<antcall target="fetch"/>
-	<antcall target="generate" />
-	<antcall target="process" />
-	<antcall target="assemble" />
-	<antcall target="postBuild" />
-</target>
-	
+	<!-- ===================================================================== -->
+	<!-- Steps to do before starting the build.  Typical setup includes -->
+	<!-- fetching the map files and building the directory.  -->
+	<!-- ===================================================================== -->
+	<target name="preBuild" if="doExtract">
+		<echo message="Preparing to extract..." />
+		<mkdir dir="${buildDirectory}" />
+		<ant antfile="${customTargets}" target="preSetup" />
+		<ant antfile="${customTargets}" target="getMapFiles" />
+		<concat destfile="${buildDirectory}/directory.txt" fixlastline="yes">
+			<fileset dir="${buildDirectory}" includes="maps/**/*.map" />
+		</concat>
+		<ant antfile="${customTargets}" target="postSetup" />
+	</target>
 
-	
-<!-- ===================================================================== -->
-<!-- Steps to do before starting the build.  Typical setup includes -->
-<!-- fetching the map files and building the directory.  -->
-<!-- ===================================================================== -->
-<target name="preBuild" if="doExtract">
-	<echo message="Preparing to extract..."/>
-	<mkdir dir="${buildDirectory}" />
-	<ant antfile="${customTargets}" target="preSetup" />
-	<ant antfile="${customTargets}" target="getMapFiles" />
-	<concat destfile="${buildDirectory}/directory.txt" fixlastline="yes">
-		<fileset dir="${buildDirectory}" includes="maps/**/*.map"/>
-	</concat>
-	<ant antfile="${customTargets}" target="postSetup" />
-</target>
+	<!-- ===================================================================== -->
+	<!-- Fetch the elements identified in the customTargets -->
+	<!-- ===================================================================== -->
+	<target name="fetch" if="doExtract">
+		<echo message="Extracting..." />
+		<ant antfile="${customTargets}" target="preFetch" />
+		<!-- Generates and then execute the fetch scripts for each build element-->
+		<ant antfile="${customTargets}" target="allElements">
+			<property name="target" value="fetchElement" />
+		</ant>
 
-<!-- ===================================================================== -->
-<!-- Fetch the elements identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="fetch"  if="doExtract">
-	<echo message="Extracting..."/>
-	<ant antfile="${customTargets}" target="preFetch"/>
-	<!-- Generates and then execute the fetch scripts for each build element-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="fetchElement" />
-	</ant>
-	
-	<ant antfile="${customTargets}" target="postFetch"/>
-</target>
+		<ant antfile="${customTargets}" target="postFetch" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Generate the build scripts for each element identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="generate" if="doBuild">
-	<echo message="Generating build scripts..."/>
-	<ant antfile="${customTargets}" target="preGenerate"/>
-	<!-- Generate the build.xml for each build element-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="generateScript" />
-	</ant>
-	<ant antfile="${customTargets}" target="postGenerate"/>	
-</target>
+	<!-- ===================================================================== -->
+	<!-- Generate the build scripts for each element identified in the customTargets -->
+	<!-- ===================================================================== -->
+	<target name="generate" if="doBuild">
+		<echo message="Generating build scripts..." />
+		<ant antfile="${customTargets}" target="preGenerate" />
+		<!-- Generate the build.xml for each build element-->
+		<ant antfile="${customTargets}" target="allElements">
+			<property name="target" value="generateScript" />
+		</ant>
+		<ant antfile="${customTargets}" target="postGenerate" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Run the build scripts for each element identified in the customTargets -->
-<!-- ===================================================================== -->
-<target name="process"  if="doBuild">
-	<echo message="Building..."/>
-	<!-- Run custom tasks before processing, i.e. creating source build zip files -->
-	<ant antfile="${customTargets}" target="preProcess" />
+	<!-- ===================================================================== -->
+	<!-- Run the build scripts for each element identified in the customTargets -->
+	<!-- ===================================================================== -->
+	<target name="process" if="doBuild">
+		<echo message="Building..." />
+		<!-- Run custom tasks before processing, i.e. creating source build zip files -->
+		<ant antfile="${customTargets}" target="preProcess" />
 
-	<!-- Process all of the build elements-->
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="processElement" />
-	</ant>
+		<!-- Process all of the build elements-->
+		<ant antfile="${customTargets}" target="allElements">
+			<property name="target" value="processElement" />
+		</ant>
 
-	<!-- Run custom tasks after compiling, i.e. reporting compile errors -->
-	<ant antfile="${customTargets}" target="postProcess" />
-</target>
+		<!-- Run custom tasks after compiling, i.e. reporting compile errors -->
+		<ant antfile="${customTargets}" target="postProcess" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Assemble the build elements into final distributions -->
-<!-- ===================================================================== -->
-<target name="assemble"  if="doPackage">
-	<echo message="Assembling..."/>
-	<ant antfile="${customTargets}" target="preAssemble"/>
-	<ant antfile="${customTargets}" target="allElements">
-		<property name="target" value="assembleElement"/>
-	</ant>
-	<ant antfile="${customTargets}" target="postAssemble"/>	
-</target>
+	<!-- ===================================================================== -->
+	<!-- Assemble the build elements into final distributions -->
+	<!-- ===================================================================== -->
+	<target name="assemble" if="doPackage">
+		<echo message="Assembling..." />
+		<ant antfile="${customTargets}" target="preAssemble" />
+		<ant antfile="${customTargets}" target="allElements">
+			<property name="target" value="assembleElement" />
+		</ant>
+		<ant antfile="${customTargets}" target="postAssemble" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Do any steps required after the build (e.g., posting, testing, ...) -->
-<!-- ===================================================================== -->
-<target name="postBuild"  if="doPackage">
-	<echo message="Packaging..."/>
-	<ant antfile="${customTargets}" target="postBuild" />
-</target>
+	<!-- ===================================================================== -->
+	<!-- Do any steps required after the build (e.g., posting, testing, ...) -->
+	<!-- ===================================================================== -->
+	<target name="postBuild" if="doPackage">
+		<echo message="Packaging..." />
+		<ant antfile="${customTargets}" target="postBuild" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Clean the build elements.  This target is here as an entry -->
-<!-- point to the customTargets.  It is not called directly in the normal -->
-<!-- course of events. -->
-<!-- ===================================================================== -->
-<target name="clean">
-  <ant antfile="${customTargets}" target="allElements">
-     <property name="target" value="cleanElement"/>
-  </ant>
-</target>
+	<!-- ===================================================================== -->
+	<!-- Clean the build elements.  This target is here as an entry -->
+	<!-- point to the customTargets.  It is not called directly in the normal -->
+	<!-- course of events. -->
+	<!-- ===================================================================== -->
+	<target name="clean">
+		<ant antfile="${customTargets}" target="allElements">
+			<property name="target" value="cleanElement" />
+		</ant>
+	</target>
 
 </project>
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 2e6db063952..3995d79e76f 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -1,70 +1,69 @@
-<project name="Build specific targets and properties" default="noDefault" >
+<project name="Build specific targets and properties" default="noDefault">
 
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- Add on <ant> task for each top level element being built. -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.rse.core"/>
-	</ant>	
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.rse.local"/>
-	</ant>	
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.rse.ftp"/>
-	</ant>	
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.rse.dstore"/>
-	</ant>
-</target>
+	<!-- ===================================================================== -->
+	<!-- Run a given ${target} on all elements being built -->
+	<!-- Add on <ant> task for each top level element being built. -->
+	<!-- ===================================================================== -->
+	<target name="allElements">
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.core" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.local" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.ftp" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.dstore" />
+		</ant>
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
+	<!-- ===================================================================== -->
+	<!-- Targets to assemble the built elements for particular configurations  -->
+	<!-- These generally call the generated assemble scripts (named in -->
+	<!-- ${assembleScriptName}) but may also add pre and post processing -->
+	<!-- Add one target for each root element and each configuration -->
+	<!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.rse.core">
-	<antcall target="buildFeature">
-		<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.core"/>
-	</antcall>
-</target>
-<target name="assemble.org.eclipse.rse.local">
-	<antcall target="buildFeature">
-		<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.local"/>
-	</antcall>	
-</target>
-<target name="assemble.org.eclipse.rse.ftp">
-	<antcall target="buildFeature">
-		<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.ftp"/>
-	</antcall>
-</target>
-<target name="assemble.org.eclipse.rse.dstore">
-	<antcall target="serverruntime"/>
-	<antcall target="buildFeature">
-		<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.dstore"/>
-	</antcall>
-</target>
-	
-<target name="dstore_extra_server.jar">
-	<mkdir dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime"/>
-	<delete dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild"/>
-	<mkdir dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild"/>
-	<javac debug="${dbg}" srcdir="${buildDirectory}/plugins/org.eclipse.dstore.extra/server" destdir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild" includeAntRuntime="false"/>
-	<jar jarfile="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime/dstore_extra_server.jar" basedir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild"/>
-	<delete dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild"/>
-</target>	
-	
-<target name="serverruntime">
-	<antcall target="dstore_extra_server.jar"/>
-	<property name="universalserverfilelist"
-		value="${buildDirectory}/plugins/org.eclipse.dstore.core/dstore_core.jar,
+	<target name="assemble.org.eclipse.rse.core">
+		<antcall target="buildFeature">
+			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.core" />
+		</antcall>
+	</target>
+	<target name="assemble.org.eclipse.rse.local">
+		<antcall target="buildFeature">
+			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.local" />
+		</antcall>
+	</target>
+	<target name="assemble.org.eclipse.rse.ftp">
+		<antcall target="buildFeature">
+			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.ftp" />
+		</antcall>
+	</target>
+	<target name="assemble.org.eclipse.rse.dstore">
+		<antcall target="serverruntime" />
+		<antcall target="buildFeature">
+			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.dstore" />
+		</antcall>
+	</target>
+
+	<target name="dstore_extra_server.jar">
+		<mkdir dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime" />
+		<delete dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild" />
+		<mkdir dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild" />
+		<javac debug="${dbg}" srcdir="${buildDirectory}/plugins/org.eclipse.dstore.extra/server" destdir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild" includeAntRuntime="false" />
+		<jar jarfile="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime/dstore_extra_server.jar" basedir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild" />
+		<delete dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverbuild" />
+	</target>
+
+	<target name="serverruntime">
+		<antcall target="dstore_extra_server.jar" />
+		<property name="universalserverfilelist" value="${buildDirectory}/plugins/org.eclipse.dstore.core/dstore_core.jar,
 	    	${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime/dstore_extra_server.jar,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/patterns.dat,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services/clientserver.jar,
@@ -79,248 +78,241 @@
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/win.env.bat,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat,
-	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat"/>
-	
-	<delete dir="${packageDirectory}\rseserver"/>
-	<mkdir dir="${packageDirectory}\rseserver"/>
-	
-	<copy todir="${packageDirectory}\rseserver">
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime" includes ="dstore_extra_server.jar"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="patterns.dat"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar"/>
-		<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="auth.pl"/>
-		<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="ssl.properties"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="minerFile.dat"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="rsecomm.properties"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="server.linux"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="server.unix"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="patterns.dat"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="daemon.linux"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="win.env.bat"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="daemon.win.bat"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="run.win.bat"/>
-	</copy>
-	
-	<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="server.linux"/>
-	<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="daemon.linux"/>
-	<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="daemon.unix"/>
-	<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="server.unix"/>
-	
-	<jar jarfile="${packageDirectory}\rseserver.jar" filesonly="true">
-		<fileset dir="${packageDirectory}\rseserver"
-			includes="*"
-			excludes="">
+	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat" />
+
+		<delete dir="${packageDirectory}\rseserver" />
+		<mkdir dir="${packageDirectory}\rseserver" />
+
+		<copy todir="${packageDirectory}\rseserver">
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime" includes="dstore_extra_server.jar" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="patterns.dat" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="auth.pl" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="ssl.properties" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="minerFile.dat" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="rsecomm.properties" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="server.linux" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="server.unix" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="patterns.dat" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="daemon.linux" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="win.env.bat" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="daemon.win.bat" />
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="run.win.bat" />
+		</copy>
+
+		<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="server.linux" />
+		<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="daemon.linux" />
+		<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="daemon.unix" />
+		<fixcrlf srcdir="${packageDirectory}\rseserver" eol="crlf" eof="asis" includes="server.unix" />
+
+		<jar jarfile="${packageDirectory}\rseserver.jar" filesonly="true">
+			<fileset dir="${packageDirectory}\rseserver" includes="*" excludes="">
+			</fileset>
+		</jar>
+
+		<delete dir="${packageDirectory}\rseserver" />
+
+		<delete>
+			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="*">
+			</fileset>
+		</delete>
+
+		<copy todir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime">
+			<fileset dir="${packageDirectory}" includes="rseserver.jar">
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Check out map files from correct repository -->
+	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+	<!-- ===================================================================== -->
+	<target name="getMapFiles">
+		<!-- Notify recipients that build has started.-->
+		<!--
+		<property name="cvsRoot" value=":pserver:build@dbgaix2:/usr/vatpfcvs" />
+		<property name="mapVersionTag" value="HEAD" />
+		<cvs cvsRoot="${cvsRoot}"
+			package="MenuEditorBuilder"
+			dest="${buildDirectory}/maps"
+			tag="${mapVersionTag}"
+		/>
+		-->
+		<copy todir="${buildDirectory}/maps">
+			<fileset dir="." includes="*.map" />
+		</copy>
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do before setup -->
+	<!-- ===================================================================== -->
+	<target name="preSetup">
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do after setup but before starting the build proper -->
+	<!-- ===================================================================== -->
+	<target name="postSetup">
+	</target>
+
+	<!-- ===================================================================== -->
+	<!-- Steps to do before fetching the build elements -->
+	<!-- ===================================================================== -->
+	<target name="preFetch">
+		<!-- clean up the old driver -->
+		<!--	<delete includeEmptyDirs="true">-->
+		<fileset dir="${buildDirectory}\plugins" casesensitive="yes" defaultexcludes="no">
+			<include name="org.eclipse.*/**" />
 		</fileset>
-	</jar>
-	
-	<delete dir="${packageDirectory}\rseserver"/>
-	
-	<delete> 
-		<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="*">
+		<fileset dir="${buildDirectory}\features" casesensitive="yes" defaultexcludes="no">
+			<include name="org.eclipse.*/**" />
 		</fileset>
-	</delete>
+		<fileset dir="${builddest}" casesensitive="yes" defaultexcludes="yes">
+			<include name="full/eclipse/**" />
+			<include name="full/Config/**" />
+			<include name="lite/**" />
+		</fileset>
+		<fileset dir="${head}\eclipse\plugins" casesensitive="yes" defaultexcludes="yes">
+			<include name="org.eclipse.*/**" />
+		</fileset>
+		<fileset dir="${head}\eclipse\features" casesensitive="yes" defaultexcludes="no">
+			<include name="org.eclipse.*/**" />
+		</fileset>
+		<!--	</delete>-->
+	</target>
 
-	<copy todir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime">
-		<fileset dir="${packageDirectory}" includes="rseserver.jar">
-	  	</fileset>
-	</copy>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="getMapFiles">
-	<!-- Notify recipients that build has started.-->
-	<!--
-	<property name="cvsRoot" value=":pserver:build@dbgaix2:/usr/vatpfcvs" />
-	<property name="mapVersionTag" value="HEAD" />
-	<cvs    cvsRoot="${cvsRoot}"
-		package="MenuEditorBuilder"
-		dest="${buildDirectory}/maps"
-		tag="${mapVersionTag}"
-	/>
-	-->
-	<copy todir="${buildDirectory}/maps">
-		<fileset dir="." includes="*.map"/>
-	</copy>
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after fetching the build elements -->
+	<!-- ===================================================================== -->
+	<target name="postFetch">
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do before generating the build scripts. -->
+	<!-- ===================================================================== -->
+	<target name="preGenerate">
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after generating the build scripts. -->
+	<!-- ===================================================================== -->
+	<target name="postGenerate">
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-      	<!-- clean up the old driver -->
-	<!--	<delete includeEmptyDirs="true">-->
-			<fileset dir="${buildDirectory}\plugins" casesensitive="yes" defaultexcludes="no" >
-				<include name="org.eclipse.*/**" />
+	<!-- ===================================================================== -->
+	<!-- Steps to do before running the build.xmls for the elements being built. -->
+	<!-- ===================================================================== -->
+	<target name="preProcess">
+	</target>
 
-			</fileset>
-			<fileset dir="${buildDirectory}\features" casesensitive="yes" defaultexcludes="no" >
-				<include name="org.eclipse.*/**" />
-			</fileset>
-			<fileset dir="${builddest}" casesensitive="yes" defaultexcludes="yes" >
-				<include name="full/eclipse/**" />
-				<include name="full/Config/**" />
-				<include name="lite/**" />
-			</fileset>
-			<fileset dir="${head}\eclipse\plugins" casesensitive="yes" defaultexcludes="yes" >
-				<include name="org.eclipse.*/**" />
-			</fileset>
-			<fileset dir="${head}\eclipse\features" casesensitive="yes" defaultexcludes="no" >
-				<include name="org.eclipse.*/**" />
-			</fileset>
-	<!--	</delete>-->
+	<!-- ===================================================================== -->
+	<!-- Steps to do after running the build.xmls for the elements being built. -->
+	<!-- ===================================================================== -->
+	<target name="postProcess">
+	</target>
 
+	<!-- ===================================================================== -->
+	<!-- Steps to do before running assemble. -->
+	<!-- ===================================================================== -->
+	<target name="preAssemble">
+	</target>
 
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do after  running assemble. -->
+	<!-- ===================================================================== -->
+	<target name="postAssemble">
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do after fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="postFetch">
+	<!-- ===================================================================== -->
+	<!-- Steps to do after the build is done. -->
+	<!-- ===================================================================== -->
+	<target name="postBuild">
+		<mkdir dir="${packageDirectory}" />
 
-</target>
+		<property name="packageRuntimeDirectory" location="${packageDirectory}\runtime" />
+		<property name="packageRuntimeRootDirectory" location="${packageRuntimeDirectory}\eclipse" />
+		<mkdir dir="${packageRuntimeDirectory}" />
+		<mkdir dir="${packageRuntimeRootDirectory}" />
 
-<!-- ===================================================================== -->
-<!-- Steps to do before generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.ftp\org.eclipse.rse.ftp_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.local\org.eclipse.rse.local_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}" />
 
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-</target>
+		<zip destfile="${packageDirectory}\RSE-1.0M1.zip" basedir="${packageRuntimeDirectory}" />
 
+		<property name="packageSDKDirectory" location="${packageDirectory}\sdk" />
+		<property name="packageSDKRootDirectory" location="${packageSDKDirectory}\eclipse" />
+		<mkdir dir="${packageSDKDirectory}" />
+		<mkdir dir="${packageSDKRootDirectory}" />
 
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-</target>
+		<unzip src="${packageDirectory}\RSE-1.0M1.zip" dest="${packageSDKDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.src.zip" dest="${packageSDKRootDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.src.zip" dest="${packageSDKRootDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.ftp\org.eclipse.rse.ftp_1.0.0.src.zip" dest="${packageSDKRootDirectory}" />
+		<unzip src="${buildDirectory}\features\org.eclipse.rse.local\org.eclipse.rse.local_1.0.0.src.zip" dest="${packageSDKRootDirectory}" />
 
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-</target>
+		<zip destfile="${packageDirectory}\RSE-SDK-1.0M1.zip" basedir="${packageSDKDirectory}" />
 
+		<!--
+		<antcall target="serverruntime"/>
+		<antcall target="publish"/>
+		-->
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do before running assemble. -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do to test the build results -->
+	<!-- ===================================================================== -->
+	<target name="test">
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do after  running assemble. -->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
+	<!-- ===================================================================== -->
+	<!-- Steps to do to publish the build results -->
+	<!-- ===================================================================== -->
+	<target name="publish" if="doPublish">
+		<mkdir dir="${publishDirectory}" />
+		<copy todir="${publishDirectory}">
+			<fileset dir="${packageDirectory}" includes="*.zip" />
+		</copy>
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do after the build is done. -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-	<mkdir dir="${packageDirectory}"/>
-	
-	<property name="packageRuntimeDirectory" location="${packageDirectory}\runtime"/>
-	<property name="packageRuntimeRootDirectory" location="${packageRuntimeDirectory}\eclipse"/>
-	<mkdir dir="${packageRuntimeDirectory}"/>
-	<mkdir dir="${packageRuntimeRootDirectory}"/> 
-	
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.ftp\org.eclipse.rse.ftp_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.local\org.eclipse.rse.local_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}"/>
-	
-	<zip destfile="${packageDirectory}\rse-runtime-M1.zip" basedir="${packageRuntimeDirectory}"/>
-	
-	<property name="packageSDKDirectory" location="${packageDirectory}\sdk"/>
-	<property name="packageSDKRootDirectory" location="${packageSDKDirectory}\eclipse"/>
-	<mkdir dir="${packageSDKDirectory}"/>
-	<mkdir dir="${packageSDKRootDirectory}"/>
-	
-	<unzip src="${packageDirectory}\rse-runtime-M1.zip" dest="${packageSDKDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.ftp\org.eclipse.rse.ftp_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
-	<unzip src="${buildDirectory}\features\org.eclipse.rse.local\org.eclipse.rse.local_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
-	
-	<zip destfile="${packageDirectory}\rse-SDK-M1.zip" basedir="${packageSDKDirectory}"/>
-	
-	<!--
-	<antcall target="serverruntime"/>
-	
-	<antcall target="publish"/>
-	-->
-</target>
+	<!-- ===================================================================== -->
+	<!-- Default target                                                        -->
+	<!-- ===================================================================== -->
+	<target name="noDefault">
+		<echo message="You must specify a target when invoking this file" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do to test the build results -->
-<!-- ===================================================================== -->
-<target name="test">
-</target>
+	<!-- ===================================================================== -->
+	<!-- Build the feature in own way                                          -->
+	<!-- Somehow the default builder doesn't work                              -->
+	<!-- ===================================================================== -->
+	<target name="buildFeature">
+		<echo message="Building feature ${featureFolder}" />
+		<!--
+		<ant antfile="${featureFolder}\build.xml" dir="${featureFolder}" target="build.jars" />
+		-->
+		<ant antfile="${featureFolder}\build.xml" dir="${featureFolder}" target="zip.distribution" />
+		<ant antfile="${featureFolder}\build.xml" dir="${featureFolder}" target="zip.sources" />
+	</target>
 
-<!-- ===================================================================== -->
-<!-- Steps to do to publish the build results -->
-<!-- ===================================================================== -->
-<target name="publish" if="doPublish">
- 	<mkdir dir="${publishDirectory}"/>
-	 <copy todir="${publishDirectory}">  
-		  <fileset dir="${packageDirectory}" includes="*.zip"/>		 	
-	 </copy>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
-<!-- ===================================================================== -->
-<!-- Build the feature in own way                                          -->
-<!-- Somehow the default builder doesn't work                              -->
-<!-- ===================================================================== -->
-<target name="buildFeature">
-	<echo message="Building feature ${featureFolder}" />
-<!--
-	<ant antfile="${featureFolder}\build.xml" dir="${featureFolder}" target="build.jars" />
--->
-	<ant antfile="${featureFolder}\build.xml" dir="${featureFolder}" target="zip.distribution" />
-	<ant antfile="${featureFolder}\build.xml" dir="${featureFolder}" target="zip.sources" />
-</target>
-
-<!-- ===================================================================== -->
-<!-- Zip the docs                                                          -->
-<!-- ===================================================================== -->
-       <target name="zipDoc">
+	<!-- ===================================================================== -->
+	<!-- Zip the docs                                                          -->
+	<!-- ===================================================================== -->
+	<target name="zipDoc">
 		<zip destfile="${buildDirectory}\plugins\${docPluginID}\doc.zip" filesonly="false" defaultexcludes="true">
 			<fileset dir="${buildDirectory}\plugins\${docPluginID}" defaultexcludes="true">
-				<include name= "**/*.gif" />
+				<include name="**/*.gif" />
 				<include name="**/*.html" />
 				<include name="**/*.htm" />
-				<include name= "**/*.GIF" />
+				<include name="**/*.GIF" />
 				<include name="**/*.HTML" />
 				<include name="**/*.HTM" />
 				<include name="**/*.css" />
 			</fileset>
 		</zip>
-       </target>
+	</target>
+
 </project>