ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/util/gatherer
(Generate patch)

Comparing deliantra/Deliantra-Client/util/gatherer (file contents):
Revision 1.1 by root, Fri Dec 30 04:17:19 2011 UTC vs.
Revision 1.3 by root, Fri Dec 30 06:31:41 2011 UTC

… …
66 66
67export EV_EVENTFD=0 67export EV_EVENTFD=0
68export EV_INOTIFY=0 68export EV_INOTIFY=0
69export EV_SIGNALFD=0 69export EV_SIGNALFD=0
70 70
71if false; then 71if true; then
72 for mod in Deliantra CFPlus; do
72# for mod in common-sense AnyEvent EV JSON-XS Deliantra Compress-LZF BDB Guard CFPlus; do 73# for mod in common-sense AnyEvent EV JSON-XS Deliantra Compress-LZF BDB Guard CFPlus; do
73 for mod in CFPlus; do 74# for mod in CFPlus; do
74 ( 75 (
75 cd /root/src/$mod 76 cd /root/src/$mod
77 cvs update -qAdP
76 $PERL Makefile.PL </dev/null 78 $PERL Makefile.PL </dev/null >/dev/null
77 $MAKE clean 79 $MAKE clean >/dev/null
78 $PERL Makefile.PL </dev/null 80 $PERL Makefile.PL </dev/null >/dev/null
79 $MAKE install || exit 81 if ! $MAKE install >log 2>&1; then
82 cat log
83 exit
84 fi
85 rm -f log
80 $MAKE clean 86 $MAKE clean >/dev/null
81 ) 87 )
82 done 88 done
83fi 89fi
84 90
85cat <<EOF >"$DIST"/pango.rc 91cat <<EOF >"$DIST"/pango.rc
… …
167 173
168 for (@glob) { 174 for (@glob) {
169 if (-d $_) { 175 if (-d $_) {
170 system "rsync", "-aR", $_, "$ENV{DIST}/pm/."; 176 system "rsync", "-aR", $_, "$ENV{DIST}/pm/.";
171 } else { 177 } else {
172 File::Path::make_path "$ENV{OSDIST}/pm/" . dirname $_; 178 File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_;
173 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_" 179 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_"
174 or die "$ENV{OSDIST}/pm/$_: $!"; 180 or die "$ENV{OSDIST}/pm/$_: $!";
175 181
176 if (s/\.pm$//) { 182 if (s/\.pm$//) {
177 $auto = "auto/$_"; 183 $auto = "auto/$_";
178 184
179 for my $glob ("*.'$SO'", "autosplit.ix", "*.al") { 185 for my $glob ("*.'$SO'", "autosplit.ix", "*.al") {
180 for (bsd_glob "$auto/$glob", 0) { 186 for (bsd_glob "$auto/$glob", 0) {
181 File::Path::make_path "$ENV{OSDIST}/pm/" . dirname $_; 187 File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_;
182 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_"; 188 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_";
183 } 189 }
184 } 190 }
185 } 191 }
186 } 192 }
… …
234} 240}
235 241
236( 242(
237 cd "$DIST" 243 cd "$DIST"
238 244
239 # # patch braindamaged pango 245 cp -p "$PERL" .
240 if [ "$OS" != windows ]; then
241 perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <$SYSLIB/libpango-1.0.$LIB0 >libpango-1.0.$LIB0
242 chmod 755 libpango-1.0.$LIB0
243 fi
244 246
245 if [ "$OS" = windows ]; then 247 if [ "$OS" = windows ]; then
246 cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll . 248 cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll .
247 cp /root/src/CFPlus/util/splash.bmp . 249 cp /root/src/CFPlus/util/splash.bmp .
248 chmod -R u+rwX pm/auto 250 chmod -R u+rwX pm/auto
251
252 # convert perl to a non-console-app
253 $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write'
254
249 else 255 else
256 # patch braindamaged pango
257 perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <$SYSLIB/libpango-1.0.$LIB0 >libpango-1.0.$LIB0
258 chmod 755 libpango-1.0.$LIB0
259
250 for lib in mikmod vorbisfile; do 260 for lib in mikmod vorbisfile; do
251 cp -p $SYSLIB/lib$lib.$LIB0 . 261 cp -p $SYSLIB/lib$lib.$LIB0 .
252 chmod 755 lib$lib.$LIB0 262 chmod 755 lib$lib.$LIB0
253 done 263 done
254 fi 264 fi
255
256 cp -p "$PERL" .
257 265
258 for so in $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl; do 266 for so in $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl; do
259 add_deps "$so" 267 add_deps "$so"
260 done 268 done
261 269
… …
313 $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl 321 $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl
314) 322)
315 323
316printf -- urlader$URLADER >"$DIST".urlader 324printf -- urlader$URLADER >"$DIST".urlader
317 325
318echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS./perl run 326echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS ./perl run
319 327
320exit 328exit
321 329
322 330
323tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME 331tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines