Commit 99b5c2c9d3e06d87e946b6869e227bf651344999

Authored by DarkGod
1 parent 279ef507

update release scripts

... ... @@ -36,7 +36,7 @@ rm -rf mac/base_app/
36 36 rm -rf game/modules/angband
37 37 rm -rf game/modules/rogue
38 38 rm -rf game/modules/gruesome
39   -find . -name '*~' -or -name '.svn' | xargs rm -rf
  39 +find . -name '*~' -or -name '.svn' -or -name '.keep' | xargs rm -rf
40 40
41 41 # create teae/teams
42 42 cd game/engines
... ... @@ -46,8 +46,8 @@ te4_pack_engine.sh default/ te4-"$ever" 1
46 46 mv boot*team ../modules
47 47 rm -rf default
48 48 cd ../modules
49   -te4_pack_module.sh tome "$tver"
50   -te4_pack_module.sh tome "$tver" 1
  49 +te4_pack_module_tome.sh tome "$tver"
  50 +#te4_pack_module.sh tome "$tver" 1
51 51 \cp -f tome*.team /var/www/te4.org/htdocs/dl/modules/tome/
52 52 rm -f tome*nomusic.team
53 53 rm -f boot*nomusic.team
... ... @@ -106,9 +106,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
106 106 echo "$i"|grep '/music/' -q
107 107 if test $? -eq 0; then rm "$i"; fi
108 108 done
109   -rm game/modules/tome*team
  109 +rm game/modules/tome*-music.team
  110 +#rm game/modules/tome*team
110 111 rm game/modules/boot*team
111   -cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
  112 +#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
112 113 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
113 114 cd ..
114 115 tar cvjf t-engine4-src-"$ver"-nomusic.tar.bz2 t-engine4-src-"$ver"
... ... @@ -120,9 +121,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
120 121 echo "$i"|grep '/music/' -q
121 122 if test $? -eq 0; then rm "$i"; fi
122 123 done
123   -rm game/modules/tome*team
  124 +rm game/modules/tome*-music.team
  125 +#rm game/modules/tome*team
124 126 rm game/modules/boot*team
125   -cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
  127 +#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
126 128 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
127 129 cd ..
128 130 zip -r -9 t-engine4-windows-"$ver"-nomusic.zip t-engine4-windows-"$ver"
... ... @@ -134,9 +136,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
134 136 echo "$i"|grep '/music/' -q
135 137 if test $? -eq 0; then rm "$i"; fi
136 138 done
137   -rm game/modules/tome*team
  139 +rm game/modules/tome*-music.team
  140 +#rm game/modules/tome*team
138 141 rm game/modules/boot*team
139   -cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
  142 +#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
140 143 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
141 144 cd ..
142 145 tar -cvjf t-engine4-linux32-"$ver"-nomusic.tar.bz2 t-engine4-linux32-"$ver"
... ... @@ -148,9 +151,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
148 151 echo "$i"|grep '/music/' -q
149 152 if test $? -eq 0; then rm "$i"; fi
150 153 done
151   -rm game/modules/tome*team
  154 +rm game/modules/tome*-music.team
  155 +#rm game/modules/tome*team
152 156 rm game/modules/boot*team
153   -cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
  157 +#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
154 158 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
155 159 cd ..
156 160 tar -cvjf t-engine4-linux64-"$ver"-nomusic.tar.bz2 t-engine4-linux64-"$ver"
... ...
... ... @@ -20,8 +20,8 @@ fi
20 20 $unpack /var/www/te4.org/htdocs/dl/t-engine/t-engine4-$os-$old$ext
21 21 $unpack /var/www/te4.org/htdocs/dl/t-engine/t-engine4-$os-$new$ext
22 22
23   -oldv=`ls t-engine4-$os-$old/game/modules/tome-*.team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
24   -newv=`ls t-engine4-$os-$new/game/modules/tome-*.team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
  23 +oldv=`ls t-engine4-$os-$old/game/modules/tome-*[0-9].team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
  24 +newv=`ls t-engine4-$os-$new/game/modules/tome-*[0-9].team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
25 25
26 26 cd "t-engine4-$os-$new"
27 27 sh ../../utils/te4_patch.sh $oldv $newv ../t-engine4-$os-$old ../patch $os
... ... @@ -29,4 +29,4 @@ pmd5=`md5sum ../$os-patch-$oldv-to-$newv.zip | cut -d' ' -f1`
29 29 cp "../$os-patch-$oldv-to-$newv.zip" /var/www/te4.org/htdocs/dl/t-engine/patch/
30 30
31 31 echo "SQL:"
32   -echo "REPLACE INTO patch_chain SET os='$os', vfrom='$oldv', vto='$newv', file='$os-patch-$oldv-to-$newv.zip', md5='$pmd5';"
\ No newline at end of file
  32 +echo "REPLACE INTO patch_chain SET os='$os', vfrom='$oldv', vto='$newv', file='$os-patch-$oldv-to-$newv.zip', md5='$pmd5', shown='false';"
... ...
... ... @@ -26,6 +26,12 @@ for file in `find . -type f`; do
26 26 continue
27 27 fi
28 28
  29 + ignorable='false'
  30 + echo "$file" | grep -q "\-music\.team$"
  31 + if test $? -eq 0; then ignorable='true'; fi
  32 + echo "$file" | grep -q "\.teaa$"
  33 + if test $? -eq 0; then ignorable='true'; fi
  34 +
29 35 if test -f "$oldd/$file"; then
30 36 cmp -s "$oldd/$file" "$file"
31 37 if test $? -ne 0; then
... ... @@ -42,7 +48,7 @@ for file in `find . -type f`; do
42 48 p=`dirname $file`/`basename $file`.patch
43 49 mkdir -p "$patch"/`dirname $file`
44 50 bsdiff "$oldd/$file" "$file" "$patch"/$p
45   - echo "change('$file', '$p')" >> $pl
  51 + echo "change('$file', '$p', $ignorable)" >> $pl
46 52 echo -n "$file:" >> $fm
47 53 md5sum "$file" | cut -d' ' -f1 >> $fm
48 54 fi
... ... @@ -54,7 +60,7 @@ for file in `find . -type f`; do
54 60 mkdir -p "$patch"/`dirname $file`
55 61 p=`dirname $file`/`basename $rfile`-to-`basename $file`.patch
56 62 bsdiff "$oldd/$rfile" "$file" "$patch"/$p
57   - echo "update('$rfile', '$file', '$p')" >> $pl
  63 + echo "update('$rfile', '$file', '$p', $ignorable)" >> $pl
58 64 echo -n "$file:" >> $fm
59 65 md5sum "$file" | cut -d' ' -f1 >> $fm
60 66 else
... ...