betetr release scripts

utils/publish_release.sh

@@ -6,20 +6,41 @@ if test $# -lt 1 ; then
 fi
 v=$1
 
-echo "*********** First MD5 for ToME: *********"
-read tomemd1
-echo "*********** Second MD5 for ToME: *********"
-read tomemd2
-echo "*********** MD5 for Items Vault: *********"
-read ivmd
-echo "*********** MD5 for Stone Wardens: *********"
-read swmd
+echo "SQL:"
+
+# New way, pass along a md5 file as generated by the game and it all computes
+if test -f $2; then
+	IFS=$'\n'
+	regex="^([^ ]*) : (.*)\[(.*)\]"
+	for line in `cat $2`; do
+		if [[ $line =~ $regex ]]; then
+			md5="${BASH_REMATCH[1]}"
+			kind="${BASH_REMATCH[2]}"
+			name="${BASH_REMATCH[3]}"
+
+			if test "$kind" = "module"; then
+				echo "replace into modules_versions set module='$name', md5='$md5', shown='false';"
+			else
+				echo "replace into modules_addons_versions set module='tome', addon='$name' , md5='$md5', md5_2 ='';"
+			fi
+		fi
+	done
+else
+	echo "*********** First MD5 for ToME: *********"
+	read tomemd1
+	echo "*********** Second MD5 for ToME: *********"
+	read tomemd2
+	echo "*********** MD5 for Items Vault: *********"
+	read ivmd
+	echo "*********** MD5 for Stone Wardens: *********"
+	read swmd
+
+	echo "replace into modules_addons_versions set module='tome', addon='tome-items-vault-$v' , md5='$ivmd', md5_2 ='';"
+	echo "replace into modules_addons_versions set module='tome', addon='tome-stone-wardens-$v' , md5='$swmd', md5_2 ='';"
+	echo "replace into modules_versions set module='tome-$v', md5='$tomemd1', md5_2='$tomemd2', shown='false';"
+fi
 
 ln -fs /foreign/eyal/var/www/te4.org/htdocs/dl/t-engine/t-engine4-windows-$v.zip /foreign/eyal/var/www/te4.org/htdocs/dl/t-engine/full/tome-full-windows-$v.zip
 fmd5=`md5sum /foreign/eyal/var/www/te4.org/htdocs/dl/t-engine/full/tome-full-windows-$v.zip | cut -d' ' -f1`
 
-echo "SQL:"
-echo "replace into modules_addons_versions set module='tome', addon='tome-items-vault-$v' , md5='$ivmd', md5_2 ='';"
-echo "replace into modules_addons_versions set module='tome', addon='tome-stone-wardens-$v' , md5='$swmd', md5_2 ='';"
-echo "replace into modules_versions set module='tome-$v', md5='$tomemd1', md5_2='$tomemd2', shown='false';"
 echo "replace into modules_fullzip set file='tome-full-windows-$v.zip', md5='$fmd5';"

utils/release.sh

@@ -5,15 +5,36 @@ if test $# -lt 3 ; then
 	exit
 fi
 
-echo "*********** Make sure bunbled addons are updated! *********"
-read
+if test -f game/modules/tome/data/gfx/ts-shockbolt-npc.lua; then
+	echo "***********************************************************"
+	echo "***********************************************************"
+	echo "**************** TILESET MODE already active! *************"
+	echo "***********************************************************"
+	echo "***********************************************************"
+	echo "Removing tilsets..."
+	rm -f game/modules/tome/data/gfx/ts-*lua game/modules/tome/data/gfx/ts-*png
+	echo "...done"
+	echo
+fi
+
+echo "*********** Compute tilesets? (Y/n)"
+read ok
+if test "$ok" '!=' 'n'; then
+	sh utils/tileset-maker.tome.sh 2>/dev/null
+fi
+
+echo "*********** Make sure bunbled addons are updated. Ok ? (Y/n)"
+read ok
+if test "$ok" '=' 'n'; then exit; fi
 
 # Check validity
+echo "Validating lua files..."
 find game/ bootstrap/ -name '*lua' | xargs -n1 luac -p
 if test $? -ne 0 ; then
 	echo "Invalid lua files!"
 	exit 1
 fi
+echo "...done"
 
 ever="$1"
 tver="$2"
@@ -55,23 +76,23 @@ rm -rf tome
 cd ../../
 
 cd ..
-tar cvjf t-engine4-src-"$ver".tar.bz2 t-engine4-src-"$ver"
+# tar cvjf t-engine4-src-"$ver".tar.bz2 t-engine4-src-"$ver"
 
 # windows
-echo "******************** Windows"
-cd t-engine4-windows-"$ver"
-cp -a ../../bootstrap/  ../t-engine4-src-"$ver"/game/ ../../C* ../../dlls/* .
-find . -name '*~' -or -name '.svn' | xargs rm -rf
-cd ..
-zip -r -9 t-engine4-windows-"$ver".zip t-engine4-windows-"$ver"
+# echo "******************** Windows"
+# cd t-engine4-windows-"$ver"
+# cp -a ../../bootstrap/  ../t-engine4-src-"$ver"/game/ ../../C* ../../dlls/* .
+# find . -name '*~' -or -name '.svn' | xargs rm -rf
+# cd ..
+# zip -r -9 t-engine4-windows-"$ver".zip t-engine4-windows-"$ver"
 
 # linux 32
-echo "******************** linux32"
-cd t-engine4-linux32-"$ver"
-cp -a ../../bootstrap/  ../t-engine4-src-"$ver"/game/ ../../C* ../../linux-bin/* .
-find . -name '*~' -or -name '.svn' | xargs rm -rf
-cd ..
-tar -cvjf t-engine4-linux32-"$ver".tar.bz2 t-engine4-linux32-"$ver"
+# echo "******************** linux32"
+# cd t-engine4-linux32-"$ver"
+# cp -a ../../bootstrap/  ../t-engine4-src-"$ver"/game/ ../../C* ../../linux-bin/* .
+# find . -name '*~' -or -name '.svn' | xargs rm -rf
+# cd ..
+# tar -cvjf t-engine4-linux32-"$ver".tar.bz2 t-engine4-linux32-"$ver"
 
 # linux 64
 echo "******************** linux64"
@@ -82,87 +103,77 @@ cd ..
 tar -cvjf t-engine4-linux64-"$ver".tar.bz2 t-engine4-linux64-"$ver"
 
 # OSX
-echo "******************** OSX"
-cd t-engine4-osx-"$ver"
-mkdir T-Engine.app/
-cp -a ../../mac/base_app/* T-Engine.app/
-cp -a ../../bootstrap/ T-Engine.app/Contents/MacOS/
-cp -a ../t-engine4-src-"$ver"/game/ .
-cp -a ../../C* .
-find . -name '*~' -or -name '.svn' | xargs rm -rf
-#cd ..
-#size=`du -hsc t-engine4-osx-"$ver"|grep total|cut -dM -f1`
-#sudo makedmg t-engine4-osx-"$ver".dmg "Tales of Maj'Eyal" `expr $size + 10` t-engine4-osx-"$ver"
-#gzip t-engine4-osx-"$ver".dmg
-zip -r -9 ../t-engine4-osx-"$ver".zip *
-cd ..
+# echo "******************** OSX"
+# cd t-engine4-osx-"$ver"
+# mkdir T-Engine.app/
+# cp -a ../../mac/base_app/* T-Engine.app/
+# cp -a ../../bootstrap/ T-Engine.app/Contents/MacOS/
+# cp -a ../t-engine4-src-"$ver"/game/ .
+# cp -a ../../C* .
+# find . -name '*~' -or -name '.svn' | xargs rm -rf
+# zip -r -9 ../t-engine4-osx-"$ver".zip *
+# cd ..
 
 #### Music less
 
 # src
-echo "******************** Src n/m"
-cd t-engine4-src-"$ver"
-IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
-	echo "$i"|grep '/music/' -q
-	if test $? -eq 0; then rm "$i"; fi
-done
-rm game/modules/tome*-music.team
-#rm game/modules/tome*team
-rm game/modules/boot*team
-#cp /foreign/eyal/var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
-cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
-cd ..
-tar cvjf t-engine4-src-"$ver"-nomusic.tar.bz2 t-engine4-src-"$ver"
+# echo "******************** Src n/m"
+# cd t-engine4-src-"$ver"
+# IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
+# 	echo "$i"|grep '/music/' -q
+# 	if test $? -eq 0; then rm "$i"; fi
+# done
+# rm game/modules/tome*-music.team
+# rm game/modules/boot*team
+# cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
+# cd ..
+# tar cvjf t-engine4-src-"$ver"-nomusic.tar.bz2 t-engine4-src-"$ver"
 
 # windows
-echo "******************** Windows n/m"
-cd t-engine4-windows-"$ver"
-IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
-	echo "$i"|grep '/music/' -q
-	if test $? -eq 0; then rm "$i"; fi
-done
-rm game/modules/tome*-music.team
-#rm game/modules/tome*team
-rm game/modules/boot*team
-#cp /foreign/eyal/var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
-cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
-cd ..
-zip -r -9 t-engine4-windows-"$ver"-nomusic.zip t-engine4-windows-"$ver"
+# echo "******************** Windows n/m"
+# cd t-engine4-windows-"$ver"
+# IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
+# 	echo "$i"|grep '/music/' -q
+# 	if test $? -eq 0; then rm "$i"; fi
+# done
+# rm game/modules/tome*-music.team
+# rm game/modules/boot*team
+# cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
+# cd ..
+# zip -r -9 t-engine4-windows-"$ver"-nomusic.zip t-engine4-windows-"$ver"
 
 # linux 32
-echo "******************** linux32 n/m"
-cd t-engine4-linux32-"$ver"
-IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
-	echo "$i"|grep '/music/' -q
-	if test $? -eq 0; then rm "$i"; fi
-done
-rm game/modules/tome*-music.team
-#rm game/modules/tome*team
-rm game/modules/boot*team
-#cp /foreign/eyal/var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
-cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
-cd ..
-tar -cvjf t-engine4-linux32-"$ver"-nomusic.tar.bz2 t-engine4-linux32-"$ver"
+# echo "******************** linux32 n/m"
+# cd t-engine4-linux32-"$ver"
+# IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
+# 	echo "$i"|grep '/music/' -q
+# 	if test $? -eq 0; then rm "$i"; fi
+# done
+# rm game/modules/tome*-music.team
+# rm game/modules/boot*team
+# cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
+# cd ..
+# tar -cvjf t-engine4-linux32-"$ver"-nomusic.tar.bz2 t-engine4-linux32-"$ver"
 
 # linux 64
-echo "******************** linux64 n/m"
-cd t-engine4-linux64-"$ver"
-IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
-	echo "$i"|grep '/music/' -q
-	if test $? -eq 0; then rm "$i"; fi
-done
-rm game/modules/tome*-music.team
-#rm game/modules/tome*team
-rm game/modules/boot*team
-#cp /foreign/eyal/var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
-cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
-cd ..
-tar -cvjf t-engine4-linux64-"$ver"-nomusic.tar.bz2 t-engine4-linux64-"$ver"
+# echo "******************** linux64 n/m"
+# cd t-engine4-linux64-"$ver"
+# IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
+# 	echo "$i"|grep '/music/' -q
+# 	if test $? -eq 0; then rm "$i"; fi
+# done
+# rm game/modules/tome*-music.team
+# rm game/modules/boot*team
+# cp /foreign/eyal/var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
+# cd ..
+# tar -cvjf t-engine4-linux64-"$ver"-nomusic.tar.bz2 t-engine4-linux64-"$ver"
 
 cp *zip *bz2 *dmg.gz /foreign/eyal/var/www/te4.org/htdocs/dl/t-engine
 
 ########## Announce
 
+echo
+echo "Download links:"
 echo "http://te4.org/dl/t-engine/t-engine4-windows-$ver.zip"
 echo "http://te4.org/dl/t-engine/t-engine4-src-$ver.tar.bz2"
 echo "http://te4.org/dl/t-engine/t-engine4-linux32-$ver.tar.bz2"
@@ -172,3 +183,21 @@ echo "http://te4.org/dl/t-engine/t-engine4-src-$ver-nomusic.tar.bz2"
 echo "http://te4.org/dl/t-engine/t-engine4-linux32-$ver-nomusic.tar.bz2"
 echo "http://te4.org/dl/t-engine/t-engine4-linux64-$ver-nomusic.tar.bz2"
 echo "http://te4.org/dl/t-engine/t-engine4-osx-$ver.zip"
+
+########## MD5
+echo "Computing MD5s..."
+cd t-engine4-linux64-"$ver"
+rm lib64/libopenal.so.1
+rm -f all.md5
+DISPLAY=:1 ./t-engine -Mtome -n -E'compute_md5_only="all.md5" sleep_on_auth=2' > /dev/null 2>&1
+cd ..
+echo "..done"
+echo
+
+######### SQL
+echo "*********** Publish release? (Y/n)"
+cd ..
+read ok
+if test "$ok" '!=' 'n'; then
+	sh utils/publish_release.sh "$ver" tmp/t-engine4-linux64-"$ver"/all.md5
+fi