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.5 by root, Fri Dec 30 10:59:00 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=.exe 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
… …
37 /c/gtk/bin/pango-querymodules # empty output usually 37 /c/gtk/bin/pango-querymodules # empty output usually
38 } 38 }
39 39
40elif [ "$(uname -s)" = Darwin ]; then 40elif [ "$(uname -s)" = Darwin ]; then
41 OS=darwin 41 OS=darwin
42 URLADER=-osx105 42 URLADER=darwin-x86
43 PANGO=1.6.0 43 PANGO=1.6.0
44 PERL=/opt/local/bin/perl 44 PERL=/opt/local/bin/perl
45 GENPACK_ENVVARS="DYLD_LIBRARY_PATH=." 45 GENPACK_ENVVARS="DYLD_LIBRARY_PATH=."
46 46
47 SYSLIB=/opt/local/lib 47 SYSLIB=/opt/local/lib
48 LIB0=dylib 48 LIB0=dylib
49 SO=bundle 49 SO=bundle
50 STRIP="strip -x" 50 STRIP="strip -x"
51elif [ $(arch) = i686 ]; then 51elif [ $(arch) = i686 ]; then
52 OS=linux 52 OS=linux
53 URLADER=-x86 53 URLADER=linux-x86
54 PANGO=1.5.0 54 PANGO=1.5.0
55 PERL=/usr/bin/perl 55 PERL=/usr/bin/perl
56else 56else
57 OS=linux 57 OS=linux
58 URLADER=-amd64 58 URLADER=linux-amd64
59 PANGO=1.5.0 59 PANGO=1.5.0
60 PERL=/usr/bin/perl 60 PERL=/usr/bin/perl
61 ARCHNAME=amd64 61 ARCHNAME=amd64
62fi 62fi
63 63
… …
79# for mod in CFPlus; do 79# for mod in CFPlus; do
80 ( 80 (
81 cd /root/src/$mod || exit 81 cd /root/src/$mod || exit
82 cvs update -AdP 82 cvs update -AdP
83 rm -rf blib 83 rm -rf blib
84 set -x
85 $PERL Makefile.PL </dev/null >/dev/null 84 $PERL Makefile.PL </dev/null >/dev/null
86 $MAKE clean >/dev/null 85 $MAKE clean >/dev/null
87 $PERL Makefile.PL </dev/null >/dev/null 86 $PERL Makefile.PL </dev/null >/dev/null
88 if ! $MAKE install >log 2>&1; then 87 if ! $MAKE install >log 2>&1; then
89 echo 88 echo
… …
106 exec 5>"$DIST"/pango.modules 105 exec 5>"$DIST"/pango.modules
107 pango-querymodules | grep ^/ | while read lib rest; do 106 pango-querymodules | grep ^/ | while read lib rest; do
108 base=$(basename "$lib") 107 base=$(basename "$lib")
109 [ "$base" = pango-basic-x.$LIBEXT ] && continue 108 [ "$base" = pango-basic-x.$LIBEXT ] && continue
110 cp -p "$lib" "$DIST"/. 109 cp -p "$lib" "$DIST"/.
111 echo "$base $rest" >&5 110 echo "./$base $rest" >&5 # using ./ seems to help pango not to rummage around in /usr/lib etc.
112 done 111 done
113) 112)
114 113
115############################################################################# 114#############################################################################
116 115
… …
283 done 282 done
284 283
285 if [ "$OS" != windows ]; then 284 if [ "$OS" != windows ]; then
286 # patch braindamaged pango 285 # patch braindamaged pango
287 set libpango-1.0.$LIB0 286 set libpango-1.0.$LIB0
288 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"
289 chmod 755 "$1" 288 chmod 755 "$1"
290 fi 289 fi
291 290
292 if [ "$OS" = darwin ]; then 291 if [ "$OS" = darwin ]; then
293 # "dll hell" is most severe on os x, because apple 292 # "dll hell" is most severe on os x, because apple
… …
327 patchlibs "$lib" 326 patchlibs "$lib"
328 mv "$lib" "libdeliantra-$stem.dylib" 327 mv "$lib" "libdeliantra-$stem.dylib"
329 done 328 done
330 fi 329 fi
331 330
332 [ "$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
333 $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
334) 335)
335 336
336printf -- urlader$URLADER >"$DIST".urlader 337cat >"$DIST".vars <<EOF
338G_URLADER="$URLADER"
339G_OS="$OS"
340G_ARCHNAME="$ARCHNAME"
341G_ENVVARS="$GENPACK_ENVVARS"
342G_COMMAND="./perl run"
343EOF
337 344
338echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS ./perl run
339
340exit
341
342
343tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME
344gzip -9vf deliantra-gnu-linux-$ARCHNAME.tar
345todata deliantra-gnu-linux-$ARCHNAME.tar.gz
346

Diff Legend

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