From ce6b41bc08b87ef063b4cb24a9cd147dbfc300a6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 14 Jul 2012 14:11:56 +0200 Subject: [PATCH] Remove openmamba-newrelease and makedist cron moved into makedist project --- bin/openmamba-newrelease | 74 ---- .../20-openmamba-autobuild-makedist | 342 ------------------ 2 files changed, 416 deletions(-) delete mode 100755 bin/openmamba-newrelease delete mode 100755 etc/cron.daily/20-openmamba-autobuild-makedist diff --git a/bin/openmamba-newrelease b/bin/openmamba-newrelease deleted file mode 100755 index 4a96558..0000000 --- a/bin/openmamba-newrelease +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -echo "openmamba media release script" -echo "Copyright (c) 2008-2011 by Silvan Calarco " -echo - -function usage() -{ - echo "Usage:" - echo "openmamba-newrelease release [distversion][-f][--from platform]" - echo - echo "-f: force full rebuild" - echo "--from: continue from specified platform" - echo "-h: show this help and exit" - echo - echo "Example:" - echo "openmamba-newrelease 1.0pre5" - echo -} - -[ "$1" ] || { - echo "Error: release must be specified; aborting" - usage - exit 1 -} - -while [ "$1" ]; do - case $1 in - -f) FORCE_ADD="FORCE=1" ;; - --from) FROM_PLATFORM=$2; shift ;; - -h) usage; exit 0 ;; - -*) echo "Error: uknown option $1; aborting." - exit 1 - ;; - *) if [ ! "$RELEASE" ]; then - RELEASE=$1 - elif [ ! "$DISTVERSION" ]; then - DISTVERSION=$2 - else - echo "Error: exceeding option $1; aborting." - exit 1 - fi - ;; - esac - shift -done - -[ "$RELEASE" ] || { usage; exit 1; } -[ "$2" ] || DISTVERSION="milestone2" - -. /etc/sysconfig/makedist - -echo "Releasing media for openmamba $DISTVERSION $RELEASE" - -ALLMEDIALAST=`expr ${#MEDIA_NAME[*]} - 1` -for i in `seq 0 $ALLMEDIALAST`; do - PLATFORM=${MEDIA_PLATFORM[i]/\/*/} - [ ! "$FROM_PLATFORM" -o "$FROM_PLATFORM" = "$PLATFORM" ] || continue - FROM_PLATFORM= - SUBPLATFORM=${MEDIA_SUBPLATFORM[i]/*\//} - [ "$SUBPLATFORM" = "$PLATFORM" ] && SUBPLATFORM= - for lang in ${MEDIA_LANGUAGES[i]}; do - for arch in ${MEDIA_ARCHS[i]}; do - sudo makedist openmamba-$DISTVERSION PLATFORM=$PLATFORM SUBPLATFORM=$SUBPLATFORM LANGUAGE=$lang RELEASE=$DISTVERSION ARCH=$arch $FORCE_ADD || { - echo "Error: fatal error creating medit openmamba-$DISTVERSION PLATFORM=$PLATFORM SUBPLATFORM=$SUBPLATFORM LANGUAGE=$lang RELEASE=$DISTVERSION $FORCE_ADD" - exit 1 - } - done - done -done - -FORCE_OVERWRITE=1 RELEASE=$RELEASE DISTVERSION=$DISTVERSION /etc/cron.daily/20-openmamba-autobuild-makedist -# Workaround: updates home page HTML which always show previous version after first run -RELEASE=$RELEASE DISTVERSION=$DISTVERSION /etc/cron.daily/20-openmamba-autobuild-makedist -exit 0 diff --git a/etc/cron.daily/20-openmamba-autobuild-makedist b/etc/cron.daily/20-openmamba-autobuild-makedist deleted file mode 100755 index 6512cec..0000000 --- a/etc/cron.daily/20-openmamba-autobuild-makedist +++ /dev/null @@ -1,342 +0,0 @@ -#!/bin/bash -# -# Makedist automatic build script -# Copyright (c) 2007-2012 by Silvan Calarco -# -# Usage: -# -# To overwrite already existing images -# FORCE_OVERWRITE=1 ./20-openmamba-makedist -# -# To commit a new release (relies on snapshot images): -# RELEASE=1.0pre3 ./20-openmamba-makedist -# -. /etc/sysconfig/makedist -. /usr/share/makedist/functions.inc.sh - -ME=`basename $0` -[ "$$" == "`pidof -x $ME`" ] || { - echo "Warning: script already running; exiting." - exit 0 -} - -TORRENTURL=http://torrent.mambasoft.it:8080/announce -DISTRONAME=openmamba -MAKEDIST_TARGET=openmamba -arch=i586 -SOURCEDIR=/var/makedist - -[ "$TODAYDATE" ] || TODAYDATE=`date +%Y%m%d` -[ "$WEEKDAY" ] || WEEKDAY=`date +%u` - -[ "$DISTVERSION" ] || { - echo "Error: DISTVERSION is not set, check configuration file; aborting." - exit 1 -} - -if [ "$RELEASE" ]; then - DESTLATESTFILENAME=latest-$RELEASE.inc.js - SOURCEIMGFILEPREFIX="openmamba-$DISTVERSION" -else - DESTLATESTFILENAME=latest.inc.js - SOURCEIMGFILEPREFIX="openmamba" -fi - -DESTBASEDIR=/var/ftp/pub/openmamba/$DISTVERSION/media -DESTIMGFILEPREFIX="openmamba" -ALLMEDIASLAST=`expr ${#MEDIA_NAME[*]} - 1` -DESTBASEURL=/pub/openmamba/$DISTVERSION/media - -# do_makedist() -# -# Parameters; -# -# $1: dist filename -# $2: dest filename -# $3: language -# $4: platform -# $5: subplatform -# $6: product_name -# $7: architecture -function do_makedist() { - local DIST_CREATED=0 SOURCEIMG DESTFILENAME DESTNAME DESTLANGUAGE DESTPLATFORM DESTSUBPLATFORM DESTARCH \ - DESTPRODUCTNAME DESTDIR DESTIMG DESTMD5 DESTTORRENT - DESTFILENAME=$1 - DESTNAME=$2 - DESTLANGUAGE=$3 - DESTPLATFORM=$4 - DESTSUBPLATFORM=$5 - DESTPRODUCTNAME=$6 - DESTARCH=$7 - SOURCEIMG=$SOURCEDIR/${DESTFILENAME} - DESTDIR=$DESTBASEDIR/${DESTPRODUCTNAME}/${DESTLANGUAGE} - DESTIMG=$DESTDIR/$DESTNAME - DESTMD5=$DESTDIR/$DESTNAME.MD5.txt - DESTTORRENT=$DESTDIR/$DESTNAME.torrent - [ "$DESTARCH" ] || { - echo "Error: do_makedist: invalid number of parameters; aborting." - exit 1 - } - [ "$RELEASE" ] && \ - DESTLATEST=$DESTDIR/latest-is-$RELEASETAG.txt || \ - DESTLATEST=$DESTDIR/latest-is-$SNAPDATE.txt - - if [ ! -f $DESTIMG -o "$FORCE_OVERWRITE" = "1" ]; then - if [ ! "$SIMULATE" ]; then - [ "$CRON_DEBUG" = "1" ] && \ - echo "-> makedist openmamba PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \ -LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=1" - makedist openmamba PLATFORM=${DESTPLATFORM} SUBPLATFORM=${DESTSUBPLATFORM} \ -LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=1 || { - echo "Error building openmamba ${DESTPRODUCTNAME} medium; aborting." - exit 1 - } - DIST_CREATED=1 - fi - if [ "$RELEASE" ]; then - [ -e $DESTDIR ] || mkdir -p $DESTDIR - cp $SOURCEIMG $DESTIMG - cp $SOURCEDIR/.${DESTFILENAME}.inc.html $DESTDIR/buildinfo-$RELEASE.inc.html - [ "$RELEASE/pre" != "$RELEASE" ] && ln -sf buildinfo-$RELEASE.inc.html $DESTDIR/buildinfo-pre.inc.html - cd $DESTDIR - md5sum $DESTNAME > $DESTMD5 - if [ "${DESTIMG/.iso}" != "$DESTIMG" ]; then - # ISO image, create video preview - [ ! -e $DESTDIR/preview/$DESTNAME.ogv -o $SOURCEIMG -nt $DESTDIR/preview/$DESTNAME.ogv ] && openmamba-recordvm $DESTIMG - fi - rm -f $DESTDIR/latest-is-*.txt - > $DESTLATEST - else - [ -e $DESTDIR ] || mkdir -p $DESTDIR - cp $SOURCEIMG $DESTIMG - cp $SOURCEDIR/.${DESTFILENAME}.inc.html $DESTDIR/buildinfo.inc.html - cd $DESTDIR - md5sum $DESTNAME > $DESTMD5 - if [ "${DESTIMG/.iso}" != "$DESTIMG" ]; then - # ISO image, create video preview - [ ! -e $DESTDIR/preview/$DESTNAME.ogv -o $SOURCEIMG -nt $DESTDIR/preview/$DESTNAME.ogv ] && openmamba-recordvm $DESTIMG - fi - rm -f $DESTDIR/latest-is-*.txt - > $DESTLATEST - fi - fi - if [ "$DIST_CREATED" = "1" -o $DESTIMG -nt $DESTTORRENT -o \ - "$FORCE_OVERWRITE" = "1" -o "$FORCE_OVERWRITE_TORRENT" = "1" ]; then - # Generate TORRENT - if [ "$RELEASE" ]; then - cd $DESTDIR - maketorrent-console \ - --comment "openmamba $RELEASE ${DESTPRODUCTNAME} ${DESTLANGUAGE}-${DESTARCH} from http://www.openmamba.org" \ - --tracker_name "mambaSoft BitTorrent tracker" \ - --language ${DESTLANGUAGE} \ - $TORRENTURL \ - $DESTNAME --target $DESTTORRENT >/dev/null - else - cd $DESTDIR - maketorrent-console \ - --comment "openmamba snapshot $SNAPDATE ${DESTPRODUCTNAME} ${DESTLANGUAGE}-${DESTARCH} from http://www.openmamba.org" \ - --tracker_name "mambaSoft BitTorrent tracker" \ - --language ${DESTLANGUAGE} \ - $TORRENTURL \ - $DESTNAME --target $DESTTORRENT >/dev/null - fi - fi - DESTSIZE=`du $DESTIMG -h | gawk '{ print $1 }'` - DESTMD5=`cat $DESTMD5 | gawk '{ print $1 }'` - DESTBUILDDATE=`stat -c %y $SOURCEIMG` - - cat > $DESTDIR/$DESTLATESTFILENAME << _EOF -nameArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTNAME'; -pathArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='/download.html?file=$DESTBASEURL/$DESTPRODUCTNAME/$DESTLANGUAGE/'; -sizeArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTSIZE'; -md5Array['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTMD5'; -builddateArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTBUILDDATE'; -_EOF - - return $DIST_CREATED -} - -# do_all_langs_makedist() -# -# Parameters; -# -# $1: medium suffix -# $2: medium release tag -# $3: platform -# $4: subplatform -# $5: html language -# $6: product name -# $7: medium idx -function do_makedist_and_html() { - - local DIST_LINE DIST_CREATED DIST_DWD HTMLLANG MEDIA_ARCH PRODNAME \ - MEDIUMFILENAME MEDIUMNAME MEDIUMPLATFORM MEDIUMSUBPLATFORM m l - - local tempfile2=`tempfile 2>/dev/null` || tempfile=/tmp/makedist_tmpfile2 - - MEDIUMSUFFIX=$1 - MEDIUMTAG=$2 - MEDIUMPLATFORM=$3 - MEDIUMSUBPLATFORM=$4 - HTMLLANG=$5 - PRODNAME=$6 - m=$7 - [ "${m}" ] || { - echo "Error: do_makedist_and_html: invalid number of parameters; aborting." - exit 1 - } - - cat > $tempfile2 << _EOF -
-
-
-_EOF - - case ${HTMLLANG} in - it) echo -n "Lingua: " >> $tempfile2; selecttext="Scarica..."; fortext="per" ;; - *) echo -n "Language: " >> $tempfile2; selecttext="Download..."; fortext="for" ;; - esac - for l in ${MEDIA_LANGUAGES[$m]}; do - [ "$l" = "${HTMLLANG}" ] && { - checked="checked" - } || checked="" - case $l in - it) langname="italiano" ;; - es) langname="español" ;; - en) langname="english" ;; - *) langname="unknown" ;; - esac - echo "$langname" >> $tempfile2 - done - - case ${HTMLLANG} in - it) echo -n "
Architettura: " >> $tempfile2;; - *) echo -n "
Architecture: " >> $tempfile2;; - esac - checked="checked" - for a in ${MEDIA_ARCHS[$m]}; do - echo "$a" >> $tempfile2 - checked="" - done - - cat >> $tempfile2 << _EOF -
- -_EOF - - if [ "$RELEASE" ]; then - DESTHTML=$DESTBASEDIR/$PRODNAME/index.inc.${HTMLLANG}.$RELEASE.html - ln -sf index.inc.${HTMLLANG}.$RELEASE.html $DESTBASEDIR/$PRODNAME/index.inc.${HTMLLANG}.pre.html - else - DESTHTML=$DESTBASEDIR/$PRODNAME/index.inc.${HTMLLANG}.html - fi - mv $tempfile2 $DESTHTML - chmod +r $DESTHTML -} - -tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/makedist_tmpfile - -for l in ${HTML_LANGS}; do - echo "" > $tempfile.$l -done - -for i in `seq 0 $ALLMEDIASLAST`; do - - PLATFORM=${MEDIA_PLATFORM[i]} - SUBPLATFORM=${MEDIA_SUBPLATFORM[i]} - unset PRODUCT_NAME - unset PRODUCT_NAME_OVERRIDE - - [ $SUBPLATFORM ] && . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$SUBPLATFORM/settings.inc - . /var/makedist/targets/$MAKEDIST_TARGET/platforms/$PLATFORM/settings.inc - [ "$SUBPLATFORM" ] && \ - medium_name=`arch=_SPLIT_ PLATFORM=$SUBPLATFORM media_name` || - medium_name=`arch=_SPLIT_ media_name` - medium_suffix=${medium_name/*_SPLIT_\./} - [ $PRODUCT_NAME ] || PRODUCT_NAME=$PLATFORM - [ "$PRODUCT_NAME_OVERRIDE" ] && PRODUCT_NAME=$PRODUCT_NAME_OVERRIDE - - #echo "PLATFORM=$PLATFORM SUBPLATFORM=$SUBPLATFORM MEDIA_SUFFIX=$media_suffix" - - if [ "$RELEASE" ]; then - echo "Releasing $PRODUCT_NAME media (${PLATFORM}/${SUBPLATFORM})" - SIMULATE=1 - elif [ "$WEEKDAY" = "${MEDIA_BUILDDAY[i]}" -o \ - "$FORCEBUILD" = "$PRODUCT_NAME" ]; then - echo "Building $PRODUCT_NAME media" - unset SIMULATE - else - SIMULATE=1 - fi - - for l in ${HTML_LANGS}; do - - for ml in ${MEDIA_LANGUAGES[i]}; do - if [ ! -e $DESTBASEDIR/$PRODUCT_NAME/$ml ]; then - mkdir -p $DESTBASEDIR/$PRODUCT_NAME/$ml || { - echo "Error: cannot create directory $DESTBASEDIR/$PRODUCT_NAME/$ml; aborting" - exit 1 - } - fi - done - - unset latest - latest=`ls $DESTBASEDIR/$PRODUCT_NAME/$ml/latest-is-*.txt 2>/dev/null| sed "s/.*latest-is-\(.*\)\.txt/\1/"` - [ "$latest" -a "$SIMULATE" ] && SNAPDATE=$latest || SNAPDATE=$TODAYDATE - [ "$RELEASE" ] && RELEASETAG=$DISTVERSION-$RELEASE || RELEASETAG=snapshot-$SNAPDATE - - # build all media and create html page of language ${l} - [ "$latest" -o ! "$SIMULATE" -o "$RELEASE" ] && - do_makedist_and_html \ - $medium_suffix $RELEASETAG \ - $PLATFORM "$SUBPLATFORM" ${l} $PRODUCT_NAME ${i} - done -done - -for l in ${HTML_LANGS}; do - echo "
" >> $tempfile.$l - if [ "$RELEASE" ]; then - cat $tempfile.$l > $DESTBASEDIR/downloads-$RELEASE.inc.$l - [ "${RELEASE/pre}" != "$RELEASE" ] && ln -sf downloads-$RELEASE.inc.$l $DESTBASEDIR/downloads-pre.inc.$l - else - cat $tempfile.$l > $DESTBASEDIR/downloads.inc.$l - fi - rm -f $tempfile.$l -done - -exit 0