oops, forgot a bunch of things, like reenabling rsyncing..

svn path=/trunk/; revision=5469

2 files changed, 19 insertions, 22 deletions

diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh
index 61ae6183..a4771fa7 100755
--- a/scripts/auto-build/pd-extended-auto-builder.sh
+++ b/scripts/auto-build/pd-extended-auto-builder.sh
@@ -8,26 +8,14 @@ TIME=`date +%H.%M.%S`
 SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
 LOGFILE=/home/pd/logs/${DATE}_-_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt
 
-function upload_build ()
-{
-	 platform_folder=$1
-	 archive_format=$2
-
-# upload files to webpage
-test -e /home/pd/auto-build/packages/${platform_folder}/build/Pd*.${archive_format} && \
-	 rsync -a /home/pd/auto-build/packages/${platform_folder}/build/Pd*.${archive_format} \
-	 rsync://128.238.56.50/upload/${DATE}/`ls -1 /home/pd/auto-build/packages/*/build/Pd*.${archive_format} | sed "s|.*/\(.*\)${archive_format}|\1${HOSTNAME}.${archive_format}|"` 
-}
-
-
 # convert into absolute path
 cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
 auto_build_root_dir=`pwd`
-
 echo "root: $auto_build_root_dir" 
 
 # let rsync handle the cleanup with --delete
-rsync -av --delete rsync://128.238.56.50/pure-data/ ${auto_build_root_dir}/
+rsync -av --delete rsync://128.238.56.50/distros/pd-extended/ \
+	 ${auto_build_root_dir}/
 
 BUILD_DIR=.
 if [ "$SYSTEM" == "Linux" ]; then
@@ -47,6 +35,19 @@ make install && make package
 make test_package
 make test_locations
 
+
+
+function upload_build ()
+{
+	 platform_folder=$1
+	 archive_format=$2
+
+# upload files to webpage
+test -e ${auto_build_root_dir}/packages/${platform_folder}/build/Pd*.${archive_format} && \
+	 rsync -a ${auto_build_root_dir}/packages/${platform_folder}/build/Pd*.${archive_format} \
+	 rsync://128.238.56.50/upload/${DATE}/`ls -1 ${auto_build_root_dir}/packages/*/build/Pd*.${archive_format} | sed "s|.*/\(.*\)${archive_format}|\1${HOSTNAME}.${archive_format}|"` 
+}
+
 case $SYSTEM in 
 	 Linux)
 		  upload_build linux_make tar.bz2                         >> $LOGFILE 2>&1
diff --git a/scripts/auto-build/pd-main-auto-builder.sh b/scripts/auto-build/pd-main-auto-builder.sh
index f88a55a7..97df01ff 100755
--- a/scripts/auto-build/pd-main-auto-builder.sh
+++ b/scripts/auto-build/pd-main-auto-builder.sh
@@ -6,8 +6,6 @@ DATE=`date +%Y-%m-%d`
 TIME=`date +%H.%M.%S`
 SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
 
-ROOT_DIR=/home/pd/auto-build/pd-main/pure-data
-
 case $SYSTEM in 
 	 Linux)
 		  configure_options="--enable-alsa --enable-jack"
@@ -29,19 +27,17 @@ esac
 
 package_name="${ROOT_DIR}/pd-${DATE}-${SYSTEM}-${HOSTNAME}-${platform_name}.tar.bz2"
 
-
-auto_build_root_dir=`echo $0 | sed 's|\(.*\)/.*$|\1|'`/..
 # convert into absolute path
-cd ${auto_build_root_dir}
+cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
 auto_build_root_dir=`pwd`
-
 echo "root: $auto_build_root_dir" 
 
 # let rsync handle the cleanup with --delete
-#rsync -av --delete rsync://128.238.56.50/pure-data/pd-main/ ${auto_build_root_dir}/
+rsync -av --delete rsync://128.238.56.50/distros/pd-main/ \
+	 ${auto_build_root_dir}/
 
 
-cd ${ROOT_DIR}/pd/src && \
+cd ${auto_build_root_dir}/pd/src && \
 	 autoconf && \
 	 ./configure $configure_options && \
 	 make  && \