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.6 by root, Fri Dec 30 23:43:25 2011 UTC vs.
Revision 1.7 by root, Sat Dec 31 04:23:43 2011 UTC

… …
17 17
18if [ "$(uname -s)" = CYGWIN_NT-5.0 ]; then 18if [ "$(uname -s)" = CYGWIN_NT-5.0 ]; then
19 . ~/.setenv 19 . ~/.setenv
20 20
21 OS=windows 21 OS=windows
22 URLADER=windowx-x86 22 URLADER=windows-x86
23 unset PANGO 23 unset PANGO
24 PERL=/c/perl/bin/perl 24 PERL=/c/perl/bin/perl
25 MAKE=nmake 25 MAKE=nmake
26 SYSLIB=/c/gtk/bin 26 SYSLIB=/c/gtk/bin
27 LIBEXT=dll 27 LIBEXT=dll
… …
105 exec 5>"$DIST"/pango.modules 105 exec 5>"$DIST"/pango.modules
106 pango-querymodules | grep ^/ | while read lib rest; do 106 pango-querymodules | grep ^/ | while read lib rest; do
107 base=$(basename "$lib") 107 base=$(basename "$lib")
108 [ "$base" = pango-basic-x.$LIBEXT ] && continue 108 [ "$base" = pango-basic-x.$LIBEXT ] && continue
109 cp -p "$lib" "$DIST"/. 109 cp -p "$lib" "$DIST"/.
110 echo "$base $rest" >&5 110 echo "./$base $rest" >&5 # using ./ seems to help pango not to rummage around in /usr/lib etc.
111 done 111 done
112) 112)
113 113
114############################################################################# 114#############################################################################
115 115
… …
282 done 282 done
283 283
284 if [ "$OS" != windows ]; then 284 if [ "$OS" != windows ]; then
285 # patch braindamaged pango 285 # patch braindamaged pango
286 set libpango-1.0.$LIB0 286 set libpango-1.0.$LIB0
287 perl -pe 's{/u(?=sr/lib(32)?/pango)}{/\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <"$1" >"$1~" && mv "$1~" "$1" 287 perl -pe 's{/u(?=sr/lib(32)?/pango)}{.\x00}g; s{\Q'$PANGO'\E\x00}{y.t.u\x00}g' <"$1" >"$1~" && mv "$1~" "$1"
288 chmod 755 "$1" 288 chmod 755 "$1"
289 fi 289 fi
290 290
291 if [ "$OS" = darwin ]; then 291 if [ "$OS" = darwin ]; then
292 # "dll hell" is most severe on os x, because apple 292 # "dll hell" is most severe on os x, because apple
… …
326 patchlibs "$lib" 326 patchlibs "$lib"
327 mv "$lib" "libdeliantra-$stem.dylib" 327 mv "$lib" "libdeliantra-$stem.dylib"
328 done 328 done
329 fi 329 fi
330 330
331 [ "$OS" = linux ] && chrpath -d perl # debian perls have an rpath. really. 331 [ "$OS" = linux ] && chrpath -d perl $(find pm -name "*.so") # debian perls have an rpath, many modules too
332 $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl 332 $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl
333
334 : >timidity.cfg
333) 335)
334 336
335cat >"$DIST".vars <<EOF 337cat >"$DIST".vars <<EOF
336G_URLADER="$URLADER" 338G_URLADER="$URLADER"
337G_OS="$OS" 339G_OS="$OS"
338G_ARCHNAME="$ARCHNAME" 340G_ARCHNAME="$ARCHNAME"
339G_ENVVARS="$GENPACK_ENVVARS" 341G_ENVVARS="$GENPACK_ENVVARS"
340G_ARGS="./perl run" 342G_COMMAND="./perl run"
341EOF 343EOF
342 344

Diff Legend

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