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

deployVLCKit: Create a global current podspec

Signed-off-by: 's avatarCarola Nitz <nitz.carola@googlemail.com>
parent 3e2f69b4
...@@ -182,25 +182,18 @@ gitCommit() ...@@ -182,25 +182,18 @@ gitCommit()
podDeploy() podDeploy()
{ {
local podspec=""
local retVal=0 local retVal=0
if [ "$DEPLOY_MOBILEVLCKIT" = "yes" ]; then
podspec=$MOBILE_PODSPEC
else
podspec=$TV_PODSPEC
fi
log "Info" "Starting podspec operations..." log "Info" "Starting podspec operations..."
spushd "Packaging/podspecs" spushd "Packaging/podspecs"
if bumpPodspec $podspec && \ if bumpPodspec $CURRENT_PODSPEC && \
pod spec lint --verbose $podspec && \ pod spec lint --verbose $CURRENT_PODSPEC && \
pod trunk push $podspec && \ pod trunk push $CURRENT_PODSPEC && \
gitCommit $podspec ; then gitCommit $CURRENT_PODSPEC ; then
log "Info" "Podpsec operations successfully finished!" log "Info" "Podpsec operations successfully finished!"
retVal=0 retVal=0
else else
git checkout $podspec git checkout $CURRENT_PODSPEC
log "Error" "Podspec operations failed." log "Error" "Podspec operations failed."
retVal=1 retVal=1
fi fi
...@@ -258,6 +251,16 @@ getVersion() ...@@ -258,6 +251,16 @@ getVersion()
spopd #Packaging/podspecs spopd #Packaging/podspecs
} }
setCurrentPodspec()
{
# Addded extra precision of target to protect against future targets
if [ "$DEPLOY_MOBILEVLCKIT" = "yes" ]; then
CURRENT_PODSPEC=$MOBILE_PODSPEC
elif [ "$DEPLOY_TVVLCKIT" = "yes" ]; then
CURRENT_PODSPEC=$TV_PODSPEC
fi
}
################## ##################
# Command Center # # Command Center #
################## ##################
...@@ -266,6 +269,7 @@ if [ "$CLEAN" = "yes" ]; then ...@@ -266,6 +269,7 @@ if [ "$CLEAN" = "yes" ]; then
clean clean
fi fi
# Used to send parameter to the other scripts.
options="" options=""
if [ "$DEPLOY_MOBILEVLCKIT" = "yes" ]; then if [ "$DEPLOY_MOBILEVLCKIT" = "yes" ]; then
options="-m" options="-m"
...@@ -275,10 +279,10 @@ fi ...@@ -275,10 +279,10 @@ fi
UPLOAD_URL=${STABLE_UPLOAD_URL} UPLOAD_URL=${STABLE_UPLOAD_URL}
spushd "$ROOT_DIR" spushd "$ROOT_DIR"
# Note: the current packaging script is building vlckit(s) if not found. # Note: the current packaging script is building vlckit(s) if not found.
buildMobileVLCKit buildMobileVLCKit
setCurrentPodspec
getVersion getVersion
packageBuild $options packageBuild $options
renamePackage $options renamePackage $options
......
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