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.2 by root, Fri Dec 30 05:44:23 2011 UTC

… …
167 167
168 for (@glob) { 168 for (@glob) {
169 if (-d $_) { 169 if (-d $_) {
170 system "rsync", "-aR", $_, "$ENV{DIST}/pm/."; 170 system "rsync", "-aR", $_, "$ENV{DIST}/pm/.";
171 } else { 171 } else {
172 File::Path::make_path "$ENV{OSDIST}/pm/" . dirname $_; 172 File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_;
173 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_" 173 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_"
174 or die "$ENV{OSDIST}/pm/$_: $!"; 174 or die "$ENV{OSDIST}/pm/$_: $!";
175 175
176 if (s/\.pm$//) { 176 if (s/\.pm$//) {
177 $auto = "auto/$_"; 177 $auto = "auto/$_";
178 178
179 for my $glob ("*.'$SO'", "autosplit.ix", "*.al") { 179 for my $glob ("*.'$SO'", "autosplit.ix", "*.al") {
180 for (bsd_glob "$auto/$glob", 0) { 180 for (bsd_glob "$auto/$glob", 0) {
181 File::Path::make_path "$ENV{OSDIST}/pm/" . dirname $_; 181 File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_;
182 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_"; 182 File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_";
183 } 183 }
184 } 184 }
185 } 185 }
186 } 186 }
… …
234} 234}
235 235
236( 236(
237 cd "$DIST" 237 cd "$DIST"
238 238
239 # # patch braindamaged pango 239 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 240
245 if [ "$OS" = windows ]; then 241 if [ "$OS" = windows ]; then
246 cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll . 242 cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll .
247 cp /root/src/CFPlus/util/splash.bmp . 243 cp /root/src/CFPlus/util/splash.bmp .
248 chmod -R u+rwX pm/auto 244 chmod -R u+rwX pm/auto
245
246 # convert perl to a non-console-app
247 $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write'
248
249 else 249 else
250 # patch braindamaged pango
251 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
252 chmod 755 libpango-1.0.$LIB0
253
250 for lib in mikmod vorbisfile; do 254 for lib in mikmod vorbisfile; do
251 cp -p $SYSLIB/lib$lib.$LIB0 . 255 cp -p $SYSLIB/lib$lib.$LIB0 .
252 chmod 755 lib$lib.$LIB0 256 chmod 755 lib$lib.$LIB0
253 done 257 done
254 fi 258 fi
255
256 cp -p "$PERL" .
257 259
258 for so in $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl; do 260 for so in $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl; do
259 add_deps "$so" 261 add_deps "$so"
260 done 262 done
261 263
… …
313 $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl 315 $STRIP $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl
314) 316)
315 317
316printf -- urlader$URLADER >"$DIST".urlader 318printf -- urlader$URLADER >"$DIST".urlader
317 319
318echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS./perl run 320echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS ./perl run
319 321
320exit 322exit
321 323
322 324
323tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME 325tar cf deliantra-gnu-linux-$ARCHNAME.tar deliantra-gnu-linux-$ARCHNAME

Diff Legend

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