Commit c3c40fd1 authored by Soomin Lee's avatar Soomin Lee Committed by Carola Nitz

DeployVLCKit: Remove unstable option

Signed-off-by: default avatarCarola Nitz <nitz.carola@googlemail.com>
(cherry picked from commit bb9953bf)
parent cbb64af8
...@@ -5,14 +5,12 @@ set -e ...@@ -5,14 +5,12 @@ set -e
ARCH="all" ARCH="all"
CLEAN=yes CLEAN=yes
VERBOSE=no VERBOSE=no
UNSTABLE=no
DEPLOY_MOBILEVLCKIT=no DEPLOY_MOBILEVLCKIT=no
DEPLOY_TVVLCKIT=no DEPLOY_TVVLCKIT=no
BUILD_MOBILEVLCKIT="./buildMobileVLCKit.sh -vf" BUILD_MOBILEVLCKIT="./buildMobileVLCKit.sh -vf"
CREATE_DISTRIBUTION_PACKAGE="./create-distributable-package.sh -z" CREATE_DISTRIBUTION_PACKAGE="./create-distributable-package.sh -z"
STABLE_UPLOAD_URL="https://download.videolan.org/cocoapods/prod/" STABLE_UPLOAD_URL="https://download.videolan.org/cocoapods/prod/"
UNSTABLE_UPLOAD_URL="https://download.videolan.org/pub/cocoapods/unstable/"
usage() usage()
{ {
...@@ -21,7 +19,6 @@ usage: $0 [options] version ...@@ -21,7 +19,6 @@ usage: $0 [options] version
OPTIONS OPTIONS
-d Disable cleaning of build directory -d Disable cleaning of build directory
-u Set to unstable release
-m Deploy MobileVLCKit -m Deploy MobileVLCKit
-t Deploy TVVLCKit -t Deploy TVVLCKit
-a Build *VLCKit* for specific arch (all|i386|x86_64|armv7|armv7s|aarch64) -a Build *VLCKit* for specific arch (all|i386|x86_64|armv7|armv7s|aarch64)
...@@ -29,7 +26,7 @@ EOF ...@@ -29,7 +26,7 @@ EOF
} }
# Note: Need argument error handling on: version option, the options are ignored # Note: Need argument error handling on: version option, the options are ignored
while getopts "hdumta:" OPTION while getopts "hdmta:" OPTION
do do
case $OPTION in case $OPTION in
h) h)
...@@ -39,9 +36,6 @@ do ...@@ -39,9 +36,6 @@ do
d) d)
CLEAN=no CLEAN=no
;; ;;
u)
UNSTABLE=yes
;;
m) m)
DEPLOY_MOBILEVLCKIT=yes DEPLOY_MOBILEVLCKIT=yes
;; ;;
...@@ -161,11 +155,7 @@ renamePackage() ...@@ -161,11 +155,7 @@ renamePackage()
local packageName="${target}-REPLACEWITHVERSION.zip" local packageName="${target}-REPLACEWITHVERSION.zip"
# git rev-parse --short HEAD in vlckit et vlc # git rev-parse --short HEAD in vlckit et vlc
if [ -f $packageName ]; then if [ -f $packageName ]; then
if [ "$UNSTABLE" = yes ]; then DISTRIBUTION_PACKAGE="${target}-${VERSION}-${VLCKIT_HASH}-${VLC_HASH}.zip"
DISTRIBUTION_PACKAGE="${target}-unstable-${VERSION}-${VLCKIT_HASH}-${VLC_HASH}.zip"
else
DISTRIBUTION_PACKAGE="${target}-${VERSION}-${VLCKIT_HASH}-${VLC_HASH}.zip"
fi
mv $packageName $DISTRIBUTION_PACKAGE mv $packageName $DISTRIBUTION_PACKAGE
log "Info" "Finished renaming package!" log "Info" "Finished renaming package!"
fi fi
...@@ -204,11 +194,7 @@ podDeploy() ...@@ -204,11 +194,7 @@ podDeploy()
local podspec="" local podspec=""
if [ "$DEPLOY_MOBILEVLCKIT" = "yes" ]; then if [ "$DEPLOY_MOBILEVLCKIT" = "yes" ]; then
if [ "$UNSTABLE" = "yes" ]; then podspec="MobileVLCKit.podspec"
podspec="MobileVLCKit-unstable.podspec"
else
podspec="MobileVLCKit.podspec"
fi
else else
#replace by the real TVVLCKit podspec #replace by the real TVVLCKit podspec
podspec="TVVLCKit.podspec" podspec="TVVLCKit.podspec"
...@@ -279,11 +265,7 @@ elif [ "$DEPLOY_TVVLCKIT" = "yes" ]; then ...@@ -279,11 +265,7 @@ elif [ "$DEPLOY_TVVLCKIT" = "yes" ]; then
options="-t" options="-t"
fi fi
if [ "$UNSTABLE" = "yes" ]; then UPLOAD_URL=${STABLE_UPLOAD_URL}
UPLOAD_URL=${UNSTABLE_UPLOAD_URL}
else
UPLOAD_URL=${STABLE_UPLOAD_URL}
fi
spushd $ROOT_DIR spushd $ROOT_DIR
...@@ -295,4 +277,4 @@ spushd $ROOT_DIR ...@@ -295,4 +277,4 @@ spushd $ROOT_DIR
uploadPackage uploadPackage
podDeploy podDeploy
spopd #ROOT_DIR spopd #ROOT_DIR
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment