From c972116972656d34f3247d01b8f836230f948758 Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Wed, 25 Dec 2019 22:43:27 -0800
Subject: [PATCH] Include pssh-box.py in release

Also updated API keys for both Travis and Appveyor as the previous ones
have expired. And removed shared_library release to avoid confusions.

Fixes #550.

Change-Id: I81b1531a9abb9669be54a2e302346e194d7c363e
---
 .travis.yml  | 18 ++++++------------
 appveyor.yml | 17 ++++++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ed4b5b0f3..480762ef78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,27 +39,21 @@ before_deploy:
   - rm -rf deploy
   - mkdir deploy
   - |
-    if [ ${LIBPACKAGER_TYPE} == "shared_library" ]; then
-      if [ ${TRAVIS_OS_NAME} == "linux" ]; then
-        mv out/${BUILD_TYPE}/lib/libpackager.so deploy/libpackager-${TRAVIS_OS_NAME}.so
-      else
-        mv out/${BUILD_TYPE}/libpackager.dylib deploy/libpackager-${TRAVIS_OS_NAME}.dylib
-      fi
-    else
-      mv out/${BUILD_TYPE}/packager deploy/packager-${TRAVIS_OS_NAME}
-      mv out/${BUILD_TYPE}/mpd_generator deploy/mpd_generator-${TRAVIS_OS_NAME}
-    fi
+    mv out/${BUILD_TYPE}/packager deploy/packager-${TRAVIS_OS_NAME}
+    mv out/${BUILD_TYPE}/mpd_generator deploy/mpd_generator-${TRAVIS_OS_NAME}
+    tar -zcf pssh-box.py.tar.gz -C out/${BUILD_TYPE} pyproto pssh-box.py
+    mv pssh-box.py.tar.gz deploy/pssh-box-${TRAVIS_OS_NAME}.py.tar.gz
 
 deploy:
   provider: releases
   api_key:
-    secure: PbhquzRnY1BkGkM/6LmVSZjhUd8jWnj77QjxAKA8REnFhbAuzqwDYuytRmUsBFMtgatUEgTuh/1duZaIl0yXGvRZdNeGk7BgtguUy6vraWObjjNUSlQ6Njm4y/hMgaUIOhA9I2b8gokWU1PA0sDJOF/FoZaAxFpKXcW4d8Z2C0s=
+    secure: Ya5ptzB+UXESFhM8YKVRGwtfksPqCEe3XxHLLCwSDRscvs9Cck6M7Y4IGbEVfvfM8Wpb7Eyt2UoYgAsrugj9K6Y103NZ/Vv2ZJrdWYIi52QTye7GFtSEgImHdlM8LOjXbbh/KroWZFCi+ZxRcFDROaXaTM+P/xvYHeopLwEWs7g=
   file_glob: true
   file: deploy/*
   skip_cleanup: true
   on:
     tags: true
-    condition: ${BUILD_TYPE} = Release
+    condition: ${BUILD_TYPE} = Release && ${LIBPACKAGER_TYPE} == static_library
 
 branches:
   only:
diff --git a/appveyor.yml b/appveyor.yml
index cfdf1e5826..7dfc117a08 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,14 +41,12 @@ test_script:
 after_build:
   - if exist deploy rmdir /s /q deploy
   - mkdir deploy
-  - if [%LIBPACKAGER_TYPE%] == ["shared_library"] (
-      copy "out\%OUTPUT_DIRECTORY%\packager.dll" deploy\packager-win.dll
-    ) else (
-      copy "out\%OUTPUT_DIRECTORY%\packager.exe" deploy\packager-win.exe
-    )
-  - if NOT [%LIBPACKAGER_TYPE%] == ["shared_library"] (
-      copy "out\%OUTPUT_DIRECTORY%\mpd_generator.exe" deploy\mpd_generator-win.exe
-    )
+  - ps: >-
+      copy "out\$env:OUTPUT_DIRECTORY\packager.exe" deploy\packager-win.exe
+      copy "out\$env:OUTPUT_DIRECTORY\mpd_generator.exe" deploy\mpd_generator-win.exe
+      7z a pssh-box.py.zip "$env:APPVEYOR_BUILD_FOLDER\out\$env:OUTPUT_DIRECTORY\pyproto"
+      7z a pssh-box.py.zip "$env:APPVEYOR_BUILD_FOLDER\out\$env:OUTPUT_DIRECTORY\pssh-box.py"
+      copy pssh-box.py.zip deploy\pssh-box-win.py.zip
 
 artifacts:
   - path: 'deploy\*'
@@ -56,11 +54,12 @@ artifacts:
 deploy:
   provider: GitHub
   auth_token:
-    secure: 0XTjRSDCHGH24WSnQRRizvhnaxK8gbq1cfivyuKQRrfwGPm7wpgiPL9SlyQ0aNdY
+    secure: tKyFNS3wiKnZ5+P71RPzsAzySnZLQWUWXKR3XAeco4bOTEXcTRwuQZSgggfSj19O
   on:
     appveyor_repo_tag: true
     platform: x64
     configuration: Release
+    libpackager_type: static_library
 
 branches:
   only: