Fix appveyor builds

Also updated .travis.yml to be consistent and corrected v2.4 link
in CHANGELOG.

Change-Id: I993a296b546c537f67abeb6bc4f9c03799ffa7dc

.travis.yml

@@ -39,10 +39,12 @@ before_deploy:
   - rm -rf deploy
   - mkdir deploy
   - |
-    mv out/${BUILD_TYPE}/packager deploy/packager-${TRAVIS_OS_NAME}
+    if [ ${LIBPACKAGER_TYPE} == "static_library" ] ; then
-    mv out/${BUILD_TYPE}/mpd_generator deploy/mpd_generator-${TRAVIS_OS_NAME}
+      mv out/${BUILD_TYPE}/packager deploy/packager-${TRAVIS_OS_NAME}
-    tar -zcf pssh-box.py.tar.gz -C out/${BUILD_TYPE} pyproto pssh-box.py
+      mv out/${BUILD_TYPE}/mpd_generator deploy/mpd_generator-${TRAVIS_OS_NAME}
-    mv pssh-box.py.tar.gz deploy/pssh-box-${TRAVIS_OS_NAME}.py.tar.gz
+      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
+    fi
 
 deploy:
   provider: releases

CHANGELOG.md

@@ -498,6 +498,7 @@ First public release.
 - Added mpd_generator driver program to generate mpd file from packager generated
   intermediate files.
 
+[2.4.0]: https://github.com/google/shaka-packager/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/google/shaka-packager/compare/v2.2.1...v2.3.0
 [2.2.1]: https://github.com/google/shaka-packager/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/google/shaka-packager/compare/v2.1.1...v2.2.0

appveyor.yml

@@ -42,11 +42,13 @@ after_build:
   - if exist deploy rmdir /s /q deploy
   - mkdir deploy
   - ps: >-
-      copy "out\$env:OUTPUT_DIRECTORY\packager.exe" deploy\packager-win.exe
+      If ($env:LIBPACKAGER_TYPE -eq "static_library") {
-      copy "out\$env:OUTPUT_DIRECTORY\mpd_generator.exe" deploy\mpd_generator-win.exe
+        copy "out\$env:OUTPUT_DIRECTORY\packager.exe" deploy\packager-win.exe
-      7z a pssh-box.py.zip "$env:APPVEYOR_BUILD_FOLDER\out\$env:OUTPUT_DIRECTORY\pyproto"
+        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\pssh-box.py"
+        7z a pssh-box.py.zip "$env:APPVEYOR_BUILD_FOLDER\out\$env:OUTPUT_DIRECTORY\pyproto"
-      copy pssh-box.py.zip deploy\pssh-box-win.py.zip
+        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\*'