Commit fe6c71f9 authored by Konstantin Pavlov's avatar Konstantin Pavlov Committed by Carola Nitz

buildanddeploy: Simplify version retrieval.

Signed-off-by: 's avatarCarola Nitz <nitz.carola@googlemail.com>
parent fb15c0e6
...@@ -124,6 +124,7 @@ buildMobileVLCKit() ...@@ -124,6 +124,7 @@ buildMobileVLCKit()
getVLCHashes() getVLCHashes()
{ {
VLCKIT_HASH=$(git rev-parse --short HEAD) VLCKIT_HASH=$(git rev-parse --short HEAD)
VERSION=$(git describe --tags HEAD)
spushd "libvlc/vlc" spushd "libvlc/vlc"
VLC_HASH=$(git rev-parse --short HEAD) VLC_HASH=$(git rev-parse --short HEAD)
spopd #libvlc/vlc spopd #libvlc/vlc
...@@ -256,16 +257,6 @@ uploadPackage() ...@@ -256,16 +257,6 @@ uploadPackage()
done done
} }
getVersion()
{
spushd "Packaging/podspecs"
# Basing on the version of the MobileVLCKit podspec to retreive old version
local oldVersion=$(grep s.version $MOBILE_PODSPEC | cut -d "'" -f 2)
VERSION=$(echo $oldVersion | awk -F$VERSION_DELIMITER -v OFS=$VERSION_DELIMITER 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')
spopd #Packaging/podspecs
}
setCurrentPodspec() setCurrentPodspec()
{ {
# Addded extra precision of target to protect against future targets # Addded extra precision of target to protect against future targets
...@@ -314,7 +305,6 @@ UPLOAD_URL=${STABLE_UPLOAD_URL} ...@@ -314,7 +305,6 @@ UPLOAD_URL=${STABLE_UPLOAD_URL}
spushd "$ROOT_DIR" spushd "$ROOT_DIR"
buildMobileVLCKit buildMobileVLCKit
setCurrentPodspec setCurrentPodspec
getVersion
packageBuild $options packageBuild $options
renamePackage $options renamePackage $options
getSHA getSHA
......
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