seoz pushed a commit to branch master.

http://git.enlightenment.org/admin/release-management.git/commit/?id=38c5585e209f210dfa073aa85f2720ced9cb2ab7

commit 38c5585e209f210dfa073aa85f2720ced9cb2ab7
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Tue Jul 14 00:04:08 2015 +0900

    release.sh: Support beta releases.
---
 release.sh | 59 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/release.sh b/release.sh
index 06543a7..c948700 100755
--- a/release.sh
+++ b/release.sh
@@ -4,16 +4,17 @@
 #libs="efl evas_generic_loaders emotion_generic_players elementary"
 libs="efl"
 VERSION_MAJ=1
-VERSION_MIN=14
-OLD_VERSION_MIN=13
+VERSION_MIN=15
+OLD_VERSION_MIN=15
 VERSION_MIC=0
 OLD_VERSION_MIC=0
-PRE_RELEASE_STRING="-alpha1"
-###
+PRE_RELEASE_STRING="-beta1" # "", "-alpha1", "-beta1", ...
+OLD_PRE_RELEASE_STRING="-alpha1"
 
 #OLD_VERSION_MIC=$(let $VERSION_MIC-1)
-VERSION="$VERSION_MAJ.$VERSION_MIN.$VERSION_MIC"
-OLD_VERSION="$VERSION_MAJ.$OLD_VERSION_MIN.$OLD_VERSION_MIC"
+VERSION_SIMPLE="$VERSION_MAJ.$VERSION_MIN.$VERSION_MIC"
+VERSION="$VERSION_SIMPLE$PRE_RELEASE_STRING"
+OLD_VERSION="$VERSION_MAJ.$OLD_VERSION_MIN.$OLD_VERSION_MIC$OLD_PRE_RELEASE_STRING"
 EDITOR="vim"
 MAJOR=0
 FINALISE=0
@@ -41,7 +42,7 @@ do_package_and_upload()
        git diff || exit 1
        $EDITOR NEWS || exit 1
        git diff || exit 1
-       git commit -v configure.ac NEWS -m "release: Update NEWS and bump 
version for $VERSION$PRE_RELEASE_STRING release" || exit 1
+       git commit -v configure.ac NEWS -m "release: Update NEWS and bump 
version for $VERSION release" || exit 1
        git show || exit 1
        ./autogen.sh || exit 1
        make "$MAKEFLAGS" || exit 1
@@ -62,23 +63,23 @@ do_package_and_upload()
        fi
 
        #git co po/
-       sha256sum $lib-$VERSION$PRE_RELEASE_STRING.tar.gz > 
$lib-$VERSION$PRE_RELEASE_STRING.tar.gz.sha256
-       sha256sum $lib-$VERSION$PRE_RELEASE_STRING.tar.xz > 
$lib-$VERSION$PRE_RELEASE_STRING.tar.xz.sha256
+       sha256sum $lib-$VERSION.tar.gz > $lib-$VERSION.tar.gz.sha256
+       sha256sum $lib-$VERSION.tar.xz > $lib-$VERSION.tar.xz.sha256
 
        if [ $MAJOR = 0 ]
        then
-               mv $lib-$VERSION$PRE_RELEASE_STRING.tar.gz 
$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.gz
-               mv $lib-$VERSION$PRE_RELEASE_STRING.tar.xz 
$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.xz
-               mv $lib-$VERSION$PRE_RELEASE_STRING.tar.gz.sha256 
$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.gz.sha256
-               mv $lib-$VERSION$PRE_RELEASE_STRING.tar.xz.sha256 
$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.xz.sha256
+               mv $lib-$VERSION.tar.gz $lib-$VERSION-pre.tar.gz
+               mv $lib-$VERSION.tar.xz $lib-$VERSION-pre.tar.xz
+               mv $lib-$VERSION.tar.gz.sha256 $lib-$VERSION-pre.tar.gz.sha256
+               mv $lib-$VERSION.tar.xz.sha256 $lib-$VERSION-pre.tar.xz.sha256
        fi
 
        if [ $MAJOR = 0 ]
        then
-               scp $lib-$VERSION$PRE_RELEASE_STRING-pre.tar.* 
download.enlightenment.org:/srv/web/download.enlightenment.org/public_html/pre-releases/
+               scp $lib-$VERSION-pre.tar.* 
download.enlightenment.org:/srv/web/download.enlightenment.org/public_html/pre-releases/
        fi
 
-       scp $lib-$VERSION$PRE_RELEASE_STRING.tar.* 
download.enlightenment.org:/srv/web/download.enlightenment.org/public_html/pre-releases/
+       scp $lib-$VERSION.tar.* 
download.enlightenment.org:/srv/web/download.enlightenment.org/public_html/pre-releases/
 
        # git push
        cd ..
@@ -97,7 +98,7 @@ do_finalize_release()
        echo
 
        cd "$lib"
-       git tag -a v$VERSION$PRE_RELEASE_STRING -m 
"v$VERSION$PRE_RELEASE_STRING" || exit 1
+       git tag -a v$VERSION -m "v$VERSION" || exit 1
        #git push --tags || exit 1
 
 #      if [ $MAJOR = 1 ]
@@ -109,12 +110,12 @@ do_finalize_release()
        echo "Move tarballs to final destination"
        if [ $MAJOR = 0 ]
        then
-               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.gz
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION$PRE_RELEASE_STRING.tar.gz
-               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.xz
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION$PRE_RELEASE_STRING.tar.xz
-               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.gz.sha256
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION$PRE_RELEASE_STRING.tar.gz.sha256
-               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION$PRE_RELEASE_STRING-pre.tar.xz.sha256
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION$PRE_RELEASE_STRING.tar.xz.sha256
+               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION-pre.tar.gz
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION.tar.gz
+               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION-pre.tar.xz
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION.tar.xz
+               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION-pre.tar.gz.sha256
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION.tar.gz.sha256
+               ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION-pre.tar.xz.sha256
 
/srv/web/download.enlightenment.org/public_html/rel/libs/$lib/$lib-$VERSION.tar.xz.sha256
        fi
-       ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION$PRE_RELEASE_STRING.tar.*
 /srv/web/download.enlightenment.org/public_html/rel/libs/$lib/
+       ssh download.enlightenment.org mv 
/srv/web/download.enlightenment.org/public_html/pre-releases/$lib-$VERSION.tar.*
 /srv/web/download.enlightenment.org/public_html/rel/libs/$lib/
 #      if [ $MAJOR = 1 ]
 #      then
 #              Sed version to .99 and dev mode
@@ -123,14 +124,16 @@ do_finalize_release()
 
        if [ $MAJOR = 1 ]
        then
-               scp $lib-$VERSION$PRE_RELEASE_STRING-doc.tar.bz2 
download.enlightenment.org:/srv/web/docs.enlightenment.org/public_html/$lib/
-               ssh download.enlightenment.org tar xf 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION$PRE_RELEASE_STRING-doc.tar.bz2
 -C  /srv/web/docs.enlightenment.org/public_html/$lib/
-               ssh download.enlightenment.org mv 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION$PRE_RELEASE_STRING-doc/doc/html
 /srv/web/docs.enlightenment.org/public_html/$lib/$VERSION
-               ssh download.enlightenment.org rm -r 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION$PRE_RELEASE_STRING-doc
-               ssh download.enlightenment.org rm 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION$PRE_RELEASE_STRING-doc.tar.bz2
+
+               # only efl and elementary
+               scp $lib-$VERSION-doc.tar.bz2 
download.enlightenment.org:/srv/web/docs.enlightenment.org/public_html/$lib/
+               ssh download.enlightenment.org tar xf 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION-doc.tar.bz2 -C  
/srv/web/docs.enlightenment.org/public_html/$lib/
+               ssh download.enlightenment.org mv 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION-doc/doc/html 
/srv/web/docs.enlightenment.org/public_html/$lib/$VERSION_SIMPLE
+               ssh download.enlightenment.org rm -r 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION-doc
+               ssh download.enlightenment.org rm 
/srv/web/docs.enlightenment.org/public_html/$lib/$lib-$VERSION-doc.tar.bz2
 
                ssh download.enlightenment.org rm 
/srv/web/docs.enlightenment.org/public_html/$lib/current
-               ssh download.enlightenment.org ln -s 
/srv/web/docs.enlightenment.org/public_html/$lib/$VERSION 
/srv/web/docs.enlightenment.org/public_html/$lib/current
+               ssh download.enlightenment.org ln -s 
/srv/web/docs.enlightenment.org/public_html/$lib/$VERSION_SIMPLE 
/srv/web/docs.enlightenment.org/public_html/$lib/current
        fi
 
        cd ..
@@ -220,7 +223,7 @@ then
        $EDITOR pages/download-latest.txt       # sed version number in website 
source
        $EDITOR pages/start-release.txt # sed version number in website source
        git diff
-       git commit -v public_html/p/download/en-body -m "release: Update links 
for version $VERSION$PRE_RELEASE_STRING" || exit 1
+       git commit -v public_html/p/download/en-body -m "release: Update links 
for version $VERSION" || exit 1
        #git push
 
        # Generate announcement template with urls, sha256 checksums in a table

-- 


Reply via email to