X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=tools%2Fmake-functions;h=147cd4956e06b16d21512a984d44aff490527225;hb=8f55c54e7453e29a41d59916dc049b67ca966637;hp=0ef97e5e6c6cc49d6ac7b53c231f9eb6d6736d8d;hpb=15854f82e9c1bb1abff1c3d1c9c49aa087057cbc;p=ipfire-2.x.git

diff --git a/tools/make-functions b/tools/make-functions
index 0ef97e5e6c..147cd4956e 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -106,22 +106,24 @@ beautify()
 					;;
 			esac
 			;;
-		build_stage_start)
+		build_stage)
 			MESSAGE=$2
+			if [ "$STAGE_TIME_START" ]; then
+				LAST_STAGE_TIME=$[ `date +%s` - $STAGE_TIME_START ]
+			fi
 			STAGE_TIME_START=`date +%s`
-			echo -ne "${BOLD}*** ${MESSAGE}${SET_VER_COL}      version${SET_OPT_COL} options"
-			echo -ne "${SET_TIME_COL} time (sec)${SET_RESULT_COL} status${NORMAL}\n"
-			;;
-		build_stage_end)
-			STAGE_TIME_END=`date +%s`
-			echo -ne "${BOLD}***This stage took:\t\t $[ $STAGE_TIME_END - $STAGE_TIME_START ] (secs)${NORMAL}\n"
+			echo -ne "${BOLD}*** ${MESSAGE}${NORMAL}"
+			if [ "$LAST_STAGE_TIME" ]; then
+				echo -ne "${DONE} (Last stage took $LAST_STAGE_TIME secs)${NORMAL}"
+			fi
+			echo -ne "${BOLD}${SET_VER_COL}      version${SET_OPT_COL} options${SET_TIME_COL} time (sec)${SET_RESULT_COL} status${NORMAL}\n"
 			;;
 		build_start)
 			BUILD_TIME_START=`date +%s`
 			;;
 		build_end)
 			BUILD_TIME_END=`date +%s`
-			echo -ne "${BOLD}***Build is finished now!\nThis took:\t\t\t $[ $BUILD_TIME_END - $BUILD_TIME_START ] (secs)${NORMAL}\n"
+			echo -ne "${DONE}***Build is finished now and took $[ $BUILD_TIME_END - $BUILD_TIME_START ] secs!${NORMAL}\n"
 			;;
 		make_pkg)
 			echo "$2" | while read PKG_VER PROGRAM OPTIONS
@@ -461,33 +463,29 @@ batch_script() {
 		export IPFIRE_START_TIME=`date`
 		evaluate 1
 
-		echo -ne "### RUNNING SVN-UPDATE"
+		echo "### RUNNING SVN-UPDATE"
 		$0 svn update
 		evaluate 1 mail_me SVNUPDATE
 
 		echo "### EXPORT SOURCES"
 		$0 svn dist
 		evaluate 1 mail_me SVNDIST
-
-		echo "### RUNNING PREFETCH"
-		$0 downloadsrc | grep -q "md5 difference"
-		evaluate 1 mail_me PREFETCH
 	fi
 
 	echo "### RUNNING BUILD"
-	$0 build
+	$0 build --devel
 	evaluate 1 mail_me ERROR
 
 	echo "### UPLOADING ISO"
 	$0 upload iso
 	evaluate 1 mail_me ISO
 	
-	echo -ne "### UPLOADING PAKS"
-	$0 upload paks
-	evaluate 1 mail_me PAKS
+#	echo -ne "### UPLOADING PAKS"
+#	$0 upload paks
+#	evaluate 1 mail_me PAKS
 
-	echo -n "${BOLD}***SUCCESS!${NORMAL}"
-	evaluate 0 mail_me SUCCESS
+	echo -ne "${BOLD}***SUCCESS!${NORMAL}"
+	mail_me success
 	exit 0
 }
 
@@ -505,7 +503,7 @@ mail_me() {
 			SUBJECT="SUCCESS: IPFIRE-BUILD R$SVN_REVISION on `hostname`"
 			cat <<END > /tmp/ipfire_mail_body
 Building IPFire on `hostname` in Revision $SVN_REVISION was successfull!
-You can find the ISO on your ftp server.
+You can find the ISO on your ftp server if you told the script where it is.
 
 Statistics:
 -----------
@@ -538,12 +536,12 @@ END
 	esac
 	tar cfz $ATTACHMENT log/_build*
 	cat /tmp/ipfire_mail_body | tools/sendEmail -q \
-		-f $IPFIRE_MAIL_FROM \
-		-t $IPFIRE_MAIL_REPORT \
+		-f $MAIL_USER \
+		-t $MAIL_TO \
 		-u $SUBJECT \
-		-s $IPFIRE_MAIL_SERVER:25 \
-		-xu $IPFIRE_MAIL_USER \
-		-xp $IPFIRE_MAIL_PASS \
+		-s $MAIL_SERVER:25 \
+		-xu $MAIL_USER \
+		-xp $MAIL_PASS \
 		-l log/_build.mail.log \
 		-a $ATTACHMENT # -v
 	if [ "$?" -eq "0" ]; then
@@ -628,7 +626,7 @@ make_config() {
 		read -s MAIL_PASS
 		
 	fi
-	echo -ne "${BOLD}***Saving...${NORMAL}"
+	echo -ne "\n${BOLD}***Saving...${NORMAL}"
 	cat <<END > $BASEDIR/.config
 ### iso server
 FTP_ISO_URL=$FTP_ISO_URL
@@ -694,3 +692,14 @@ reload_tftpd() {
 	fi
 	return 1
 }
+
+update_langs() {
+		echo -ne "Checking the translations for missing or obsolete strings..."
+		chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.sh}
+		$BASEDIR/tools/sort_strings.pl en
+		$BASEDIR/tools/sort_strings.pl de
+		$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
+		$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
+		$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
+		beautify message DONE
+}