From 06baa6bf9cf7bb8b787f10705a3109ab00866d79 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 18 Jan 2013 21:22:18 +0000
Subject: Moving appearance utility deb to private repo

---
 autobuild.xml |  4 ++--
 build.sh      | 54 ++++++++++++++++--------------------------------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 3c503997cc..eaafc45427 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1290,9 +1290,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>17bcc2481fe362e297376d9c46888de8</string>
+              <string>376738111ec9ba6f1b0d0dee0a3c784d</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/268501/arch/Linux/installer/llappearanceutility_source-0.1-linux-20121220.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/269218/arch/Linux/installer/llappearanceutility_source-0.1-linux-20130118.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/build.sh b/build.sh
index 307dda85eb..d779a1a34b 100755
--- a/build.sh
+++ b/build.sh
@@ -334,51 +334,29 @@ then
           done
       fi
       # Move any .deb results.
-      mv ${build_dir}/packages/*.deb ../ 2>/dev/null || true
+      mkdir -p ../packages_public
+      mkdir -p ../packages_private
+      mv ${build_dir}/packages/*.deb ../packages_public 2>/dev/null || true
+      mv ${build_dir}/packages/packages_private/*.deb ../packages_private 2>/dev/null || true
 
       # upload debian package and create repository
       begin_section "Upload Debian Repository"
-      for deb_file in ../*.deb; do
+      for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
         upload_item debian $deb_file binary/octet-stream
       done
-      if [ -d "$build_log_dir/debian_repo" ]
-      then
-        pushd "$build_log_dir/debian_repo"
-        cat > Release <<EOF
-Archive: stable
-Component: main
-Origin: Teamcity
-Label: Teamcity built .debs
-Architecture: i386 amd64 any
-EOF
-        if dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz \
-        && dpkg-scansources . /dev/null | gzip -9c > Sources.gz
-        then
-          begin_section Packages.gz
-          gunzip --stdout Packages.gz
-          for file in *.deb
-          do  
-            stat "$file" | sed 2q
-            md5sum "$file"
-          done
-          end_section Packages.gz
-
-          for file in *
-          do
-            upload_item debian_repo "$file" binary/octet-stream
-          done
-        else
-          record_failure 'Unable to generate Packages.gz or Sources.gz'
-        fi
-        popd
-
-        process_pending_uploads
+      for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
+        upload_item debian_private $deb_file binary/octet-stream
+      done
 
-        # Rename the local debian_repo directory so that the master buildscript
-        # doesn't make a remote repo again.
+      create_deb_repo
 
-        mv $build_log_dir/debian_repo $build_log_dir/debian_repo_pushed
-      fi
+      # Rename the local debian_repo* directories so that the master buildscript
+      # doesn't make a remote repo again.
+      for debian_repo_type in debian_repo debian_repo_private; do
+        if [ -d "$build_log_dir/$debian_repo_type" ]; then
+          mv $build_log_dir/$debian_repo_type $build_log_dir/${debian_repo_type}_pushed
+        fi
+      done
       end_section "Upload Debian Repository"
       
     else
-- 
cgit v1.2.3