From aee13892c870473a3d38d2b7524871e0024a92f2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 6 Jul 2012 01:12:54 +0000
Subject: Adding debian package build to teamcity build script.

---
 build.sh | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 4 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index a95ca91d82..ac7fdc4f75 100755
--- a/build.sh
+++ b/build.sh
@@ -271,12 +271,89 @@ then
   end_section WaitParallel
 fi
 
+# build debian package
+if [ "$arch" == "Linux" ]
+then
+  if $succeeded
+  then
+    if $build_viewer_deb && [ "$last_built_variant" == "Release" ]
+    then
+      begin_section "Build Debian Package"
+      # mangle the changelog
+      dch --force-bad-version \
+          --distribution unstable \
+          --newversion "${VIEWER_VERSION}" \
+          "Automated build #$build_id, repository $branch revision $revision." \
+          >> "$build_log" 2>&1
+
+      # build the debian package
+      $pkg_default_debuild_command  >>"$build_log" 2>&1 || record_failure "\"$pkg_default_debuild_command\" failed."
+
+      # Unmangle the changelog file
+      hg revert debian/changelog
+
+      end_section "Build Debian Package"
+
+      # upload debian package and create repository
+      begin_section "Upload Debian Repository"
+      for deb_file in ./*.deb; 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
+
+        # Rename the local debian_repo directory so that the master buildscript
+        # doesn't make a remote repo again.
+
+        mv $build_log_dir/debian_repo $build_log_dir/debian_repo_pushed
+      fi
+      end_section "Upload Debian Repository"
+      
+    else
+      echo skipping debian build
+    fi
+  else
+    echo skipping debian build due to failed build.
+  fi
+fi
+
+
 # check status and upload results to S3
 if $succeeded
 then
   if $build_viewer
   then
-    begin_section Upload
+    begin_section Upload Installer
     # Upload installer - note that ONLY THE FIRST ITEM uploaded as "installer"
     # will appear in the version manager.
     package=$(installer_$arch)
@@ -302,12 +379,12 @@ then
       # Upload stub installers
       upload_stub_installers "$build_dir_stubs"
     fi
-    end_section Upload
+    end_section Upload Installer
   else
-    echo skipping viewer
+    echo skipping upload of installer
   fi
 else
-  echo skipping upload of build results due to failed build.
+  echo skipping upload of installer due to failed build.
 fi
 
 # The branch independent build.sh script invoking this script will finish processing
-- 
cgit v1.2.3


From a6ecafceff18497deba2e0d308f97b044027f7f0 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 6 Jul 2012 01:53:34 +0000
Subject: Change install directory to include viewer version

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index ac7fdc4f75..47b3ff545e 100755
--- a/build.sh
+++ b/build.sh
@@ -296,7 +296,7 @@ then
 
       # upload debian package and create repository
       begin_section "Upload Debian Repository"
-      for deb_file in ./*.deb; do
+      for deb_file in ../*.deb; do
         upload_item debian $deb_file binary/octet-stream
       done
       if [ -d "$build_log_dir/debian_repo" ]
-- 
cgit v1.2.3


From 8808325ced4d380d937c9be1cc81e20a5ebb5f62 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 14 Sep 2012 11:27:04 +0000
Subject: Removed appearance utility from viewer source.  Added appearance
 utility autobuild package.

---
 build.sh | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 2f4f440a92..a85d4af6fc 100755
--- a/build.sh
+++ b/build.sh
@@ -113,11 +113,23 @@ build()
     check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries
 
     "$AUTOBUILD" build --no-configure -c $variant
-    viewer_build_ok=$?
+    build_ok=$?
     end_section "Viewer$variant"
+
+    # Run build extensions
+    if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]; then
+        for extension in ${build_dir}/packages/build-extensions/*.sh; do
+            . $extension
+            if [ $build_ok -ne 0 ]; then
+                break
+            fi
+        done
+    fi
+
+    # *TODO: Make this a build extension.
     package_llphysicsextensions_tpv
     tpvlib_build_ok=$?
-    if [ $viewer_build_ok -eq 0 -a $tpvlib_build_ok -eq 0 ]
+    if [ $build_ok -eq 0 -a $tpvlib_build_ok -eq 0 ]
     then
       echo true >"$build_dir"/build_ok
     else
@@ -299,7 +311,7 @@ then
   then
     if $build_viewer_deb && [ "$last_built_variant" == "Release" ]
     then
-      begin_section "Build Debian Package"
+      begin_section "Build Viewer Debian Package"
       # mangle the changelog
       dch --force-bad-version \
           --distribution unstable \
@@ -313,7 +325,16 @@ then
       # Unmangle the changelog file
       hg revert debian/changelog
 
-      end_section "Build Debian Package"
+      end_section "Build Viewer Debian Package"
+
+      # Run debian extensions
+      if [ -d ${build_dir}/packages/debian-extensions ]; then
+          for extension in ${build_dir}/packages/debian-extensions/*.sh; do
+              . $extension
+          done
+      fi
+      # Move any .deb results.
+      mv ${build_dir}/packages/*.deb ../ 2>/dev/null || true
 
       # upload debian package and create repository
       begin_section "Upload Debian Repository"
@@ -394,8 +415,9 @@ then
         do
           upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
         done
-        
+
         # Upload the llphysicsextensions_tpv package, if one was produced
+        # *TODO: Make this an upload-extension
         if [ -r "$build_dir/llphysicsextensions_package" ]
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
@@ -409,6 +431,13 @@ then
         ;;
       esac
 
+      # Run upload extensions
+      if [ -d ${build_dir}/packages/upload-extensions ]; then
+          for extension in ${build_dir}/packages/upload-extensions/*.sh; do
+              . $extension
+          done
+      fi
+
       # Upload stub installers
       upload_stub_installers "$build_dir_stubs"
     fi
-- 
cgit v1.2.3


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

---
 build.sh | 54 ++++++++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 38 deletions(-)

(limited to 'build.sh')

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


From b13d0b7a658784f015256576b71643827c572bb5 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Sat, 19 Jan 2013 02:00:39 +0000
Subject: Adding stub for private artifacts

---
 build.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index d779a1a34b..964f9ef0a6 100755
--- a/build.sh
+++ b/build.sh
@@ -312,6 +312,7 @@ then
     if $build_viewer_deb && [ "$last_built_variant" == "Release" ]
     then
       begin_section "Build Viewer Debian Package"
+      local have_private_repo=false
       # mangle the changelog
       dch --force-bad-version \
           --distribution unstable \
@@ -346,6 +347,7 @@ then
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
         upload_item debian_private $deb_file binary/octet-stream
+        have_private_repo=true
       done
 
       create_deb_repo
@@ -357,6 +359,14 @@ then
           mv $build_log_dir/$debian_repo_type $build_log_dir/${debian_repo_type}_pushed
         fi
       done
+
+      if [ $have_private_repo = true ]; then
+        eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\
+            >"$build_log_dir/private.html" || fatal generating redirect
+        upload_item global_redirect "$build_log_dir/private.html" text/html
+        
+      fi
+
       end_section "Upload Debian Repository"
       
     else
-- 
cgit v1.2.3