fix build upload

releng.wtpbuilder/build.properties

@@ -8,33 +8,6 @@ relengroot=
 releng=releng
 releng.builder=releng.wtpbuilder
 
-# Set this to the relative path for the 
-# directory to be use for the current build.
-# It must be relative to the buildHome
-# Final name will include the component and build type
-
-build.current=build
-
-# Set this to the relative path for the 
-# directory that keeps the downloaded drivers (local repository)
-# It must be relative to the buildHome
-build.local.repository=downloads
-
-
-# Set this to the relative path for the 
-# directory to be use for the current test pass.
-# It must be relative to the buildHome
-# Final name will include the component and build type
-
-build.tests=test
-
-# Set this to the relative path for the 
-# directory to be use for the current peformance test pass.
-# It must be relative to the buildHome
-build.perf.tests=perf-current
-
-
-
 # 	javacFailOnError must be false otherwise the 
 # 	build will terminated at the first compile error
 javacFailOnError=false
@@ -109,6 +82,10 @@ base.location=eclipse
 # 	It is relative to the build.current
 build.directory=workdir
 
+# Set this to the relative path for the 
+# directory that keeps the downloaded drivers (local repository)
+# It must be relative to the buildHome
+build.local.repository=downloads
 
 # This is the CVS Repository
 # that is used during the build process

releng.wtpbuilder/build.xml

@@ -19,6 +19,8 @@
     <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
     <!-- = = = end standard properties pattern = = = -->
 
+    <echoproperties/>
+
     <target
         name="build"
         depends="init"

releng.wtpbuilder/scripts/upload/upload.xml

@@ -26,6 +26,7 @@
     <!-- if not otherwise set, these are standard properties -->
     <property name="build.upload" value="true" />
 
+    <echoproperties />
      
     <property name="uploadUser" value="david_williams" />
     <property name="uploadPassword" value="This is not really used since ssh login is assumed (required)" />
@@ -59,7 +60,7 @@
         <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
 
         <exec executable="rsync">
-            <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
+            <arg line="-e ssh -Cavz ${rsyncRootPrefix}/${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
         </exec>
     </target>