Merge branch 'master' of git.eter:/projects/uniset

conf/libuniset.spec

@@ -178,6 +178,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Tue Sep 29 2009 Vitaly Lipatov <lav@altlinux.ru> 0.97-eter21
+- new build
+
 * Tue Sep 29 2009 Pavel Vainerman <pv@etersoft.ru> 0.97-eter20
 - new vtypes for Modbus
 

conf/release_helper.sh

 #!/bin/sh
 #       rpm-  
-. /etc/rpm/etersoft-build-functions
-
-cd ..
-SPECNAME=conf/libuniset.spec
-RPMDIR=~/RPM/RPMS/$DEFAULTARCH
-RPMSOURCEDIR=~/RPM/SOURCES
-FTPDIR=/var/ftp/pub/Ourside/i586/RPMS.uniset
-PROJECT=uniset
-GEN=/var/ftp/pub/Ourside/i586/genb.sh
+
+ETERBUILDVERSION=163
+. /usr/share/eterbuild/eterbuild
+load_mod spec
+
+REL=eter
+MAILDOMAIN=server
+RPMBINDIR=$RPMDIR/RPMS
+
+# builder50 path
+TOPDIR=/var/ftp/pvt/Etersoft/Ourside/
+
+PROJECT=$1
+test -n "$PROJECT" || PROJECT=uniset
+
+PKGNAME=uniset
+SPECNAME=libuniset.spec
+
+if [ -d "$TOPDIR" ] ; then
+	GEN="genbasedir --create --progress --topdir=$TOPDIR i586 $PROJECT"
+else
+	# For NoteBook build
+	TOPDIR=/var/ftp/pub/Ourside/
+	GEN=/var/ftp/pub/Ourside/i586/genb.sh
+fi
+FTPDIR=$TOPDIR/i586/RPMS.$PROJECT
 BACKUPDIR=$FTPDIR/backup
 
+fatal()
+{
+	echo "Error: $@"
+	exit 1
+}
+
 function send_notify()
 {
-	export EMAIL="$USER@server"
+	export EMAIL="$USER@$MAILDOMAIN"
 	CURDATE=`date`
-	MAILTO="devel@server"
+	MAILTO="devel@$MAILDOMAIN"
 # FIXME:  
-mutt $MAILTO -s "[uniset] New build: $BUILDNAME" <<EOF
+mutt $MAILTO -s "[$PROJECT] New build: $BUILDNAME" <<EOF
   : $BUILDNAME
 -- 
 your $0
@@ -26,52 +49,20 @@ EOF
 echo "inform mail sent to $MAILTO"
 }
 
-prepare_tarball()
-{
-	build_rpms_name $SPECNAME
-
-	NAMEVER=$BASENAME-$VERSION
-	WDPROJECT=$(pwd)
-	TARNAME=$NAMEVER.tar
-	DESTDIR=$TMPDIR/$NAMEVER
-	RET=0
-
-	mkdir -p $DESTDIR
-	rm -rf $DESTDIR/*
-	cp -r $WDPROJECT/* $DESTDIR/
-	cd 	$DESTDIR/
-		make distclean
-		[ -a ./autogen.sh ] && ./autogen.sh
-		rm -rf autom4te.cache/
-		rm -rf .git
-		rm -rf .gear
-	
-		echo "Make tarball $TARNAME ... from $DESTDIR"
-		mkdir -p $RPMSOURCEDIR/
-		$NICE tar cf $RPMSOURCEDIR/$TARNAME ../$NAMEVER $ETERTARPARAM || RET=1
-		rm -rf $DESTDIR
-	cd -
-
-	[ $RET ] && echo "build ok" || fatal "Can't create tarball"
-}
-
 function cp2ftp()
 {
 	mkdir -p $BACKUPDIR
-	mv -f $FTPDIR/*$PROJECT* $BACKUPDIR/
-	mv -f $RPMDIR/*$PROJECT* $FTPDIR/
-	chmod 'a+rw' $FTPDIR/*$PROJECT*
+	mv -f $FTPDIR/*$PKGNAME* $BACKUPDIR/
+	mv -f $RPMBINDIR/*$PKGNAME* $FTPDIR/
+	chmod 'a+rw' $FTPDIR/*$PKGNAME*
 	$GEN
 }
 
+
 # ------------------------------------------------------------------------
-build_rpms_name $SPECNAME
-export BUILDNAME=$BASENAME-$VERSION-$RELEASE
 
 add_changelog_helper "- new build" $SPECNAME
 
-prepare_tarball || fatal "Can't prepare tarball"
-
 rpmbb $SPECNAME || fatal "Can't build"
 
 cp2ftp
@@ -79,7 +70,7 @@ cp2ftp
 #rpmbs $SPECNAME
 #send_notify
 
-#  
+#        
 inc_release $SPECNAME
 #      
 #cvs commit -m "Auto updated by $0 for $BUILDNAME" $SPECNAME || fatal "Can't commit spec"