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.12 by root, Thu Jan 26 20:11:14 2012 UTC vs.
Revision 1.15 by root, Sat Jan 28 00:03:31 2012 UTC

… …
10SO=so 10SO=so
11SYSLIB=/usr/lib 11SYSLIB=/usr/lib
12MAKE=make 12MAKE=make
13ARCHNAME=x86 13ARCHNAME=x86
14GENPACK_ENVVARS="LD_LIBRARY_PATH=." 14GENPACK_ENVVARS="LD_LIBRARY_PATH=."
15EXTRA_EXTRACT=
15 16
16umask 022 17umask 022
17 18
18if [ "$(uname -s)" = CYGWIN_NT-5.0 ]; then 19if [ "$(uname -s)" = CYGWIN_NT-5.0 ]; then
19 . ~/.setenv 20 . ~/.setenv
… …
26 SYSLIB=/c/gtk/bin 27 SYSLIB=/c/gtk/bin
27 LIBEXT=dll 28 LIBEXT=dll
28 LIB0=dll 29 LIB0=dll
29 SO=dll 30 SO=dll
30 STRIP=":" # stripping the perl library kills it, and apparently, everythignis always stripped 31 STRIP=":" # stripping the perl library kills it, and apparently, everythignis always stripped
32 EXTRA_EXTRACT="-MWin32::GUI::SplashScreen"
31 33
32 # fontconfig apparently ignores env vars and always looks at ./etc/fonts/fonts.conf, 34 # fontconfig apparently ignores env vars and always looks at ./etc/fonts/fonts.conf,
33 # but only if . isn't actually called bin or lib. hope for the best. 35 # but only if . isn't actually called bin or lib. hope for the best.
34 GENPACK_ENVVARS="FONTCONFIG_PATH=pm/Deliantra/Client/private/resources/fonts FONTCONFIG_FILE=fonts.conf" 36 GENPACK_ENVVARS="FONTCONFIG_PATH=pm/Deliantra/Client/private/resources/fonts FONTCONFIG_FILE=fonts.conf"
35 37
… …
59 PANGO=1.5.0 61 PANGO=1.5.0
60 PERL=/usr/bin/perl 62 PERL=/usr/bin/perl
61 ARCHNAME=amd64 63 ARCHNAME=amd64
62fi 64fi
63 65
64export DIST="$(pwd)/dist/$OS-$ARCHNAME" 66DISTf="dist/$OS-$ARCHNAME"
67export DIST="$(pwd)/$DISTf"
65 68
66eval $($PERL -V:sitebinexp:) 69eval $("$PERL" -V:sitebinexp:)
67 70
68"$sitebinexp"/perl-libextractor --exedir . --dlldir . --bindir pm/bin --libdir pm \ 71"$PERL" "$sitebinexp"/perl-libextractor \
69 --perl --core-support --script deliantra \ 72 --perl --core-support --script deliantra $EXTRA_EXTRACT \
70 --runtime-only --strip \ 73 --runtime-only \
71 --copy "$DIST" 74 --copy "$DISTf" --exedir . --dlldir . --bindir pm/bin --libdir pm
72 75
73cat <<EOF >"$DIST"/pango.rc 76cat <<EOF >"$DIST"/pango.rc
74[Pango] 77[Pango]
75ModuleFiles = pango.modules 78ModuleFiles = pango.modules
76EOF 79EOF
… …
133} 136}
134 137
135( 138(
136 cd "$DIST" 139 cd "$DIST"
137 140
138 if [ "$OS" = windows ]; then 141 case "$OS" in
142 windows )
139 cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll . 143 cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll $SYSLIB/jpeg.dll .
144 cp -p $SYSLIB/jpeg.dll .
140 cp /root/src/CFPlus/util/splash.bmp . 145 cp /root/src/CFPlus/util/splash.bmp .
141 chmod -R u+rwX pm/auto 146 chmod -R u+rwX pm/auto
142 147
143 # convert perl to a non-console-app 148 # convert perl to a non-console-app
144 $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write' 149 $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write'
150 ;;
151 linux )
152 cp -p $SYSLIB/libjpeg.so.62 .
153 ;;
154 esac
145 155
146 else 156 if [ "$OS" != windows ]; then
147 for lib in mikmod vorbisfile; do 157 for lib in mikmod vorbisfile; do
148 cp -p $SYSLIB/lib$lib.$LIB0 . 158 cp -p $SYSLIB/lib$lib.$LIB0 .
149 chmod 755 lib$lib.$LIB0 159 chmod 755 lib$lib.$LIB0
150 done 160 done
151 fi 161 fi

Diff Legend

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