ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.33 by root, Thu Apr 26 00:50:03 2007 UTC vs.
Revision 1.49 by root, Thu Aug 9 22:46:08 2007 UTC

… …
6my $exec_prefix = "@exec_prefix@"; 6my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11#my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
… …
21use Crossfire; 21use Crossfire;
22use Coro; 22use Coro;
23use Coro::AIO; 23use Coro::AIO;
24use POSIX (); 24use POSIX ();
25use Digest::MD5; 25use Digest::MD5;
26use Carp;
26use Coro::Storable; $Storable::canonical = 1; 27use Coro::Storable; $Storable::canonical = 1;
28
29$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 30
28sub usage { 31sub usage {
29 warn <<EOF; 32 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 33Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 34 [--install-arch path]
… …
43my $CACHE = 0; 46my $CACHE = 0;
44my $FORCE; 47my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 48my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 49my $TMPFILE = "aaaa0";
47 50
51our %COLOR = (
52 black => 0,
53 white => 1,
54 navy => 2,
55 red => 3,
56 orange => 4,
57 blue => 5,
58 darkorange => 6,
59 green => 7,
60 lightgreen => 8,
61 grey => 9,
62 brown => 10,
63 gold => 11,
64 tan => 12,
65);
66
48END { system "rm", "-rf", $TMPDIR } 67END { system "rm", "-rf", $TMPDIR }
49 68
50Event->signal (signal => "INT", cb => sub { exit 1 }); 69Event->signal (signal => "INT", cb => sub { exit 1 });
51Event->signal (signal => "TERM", cb => sub { exit 1 }); 70Event->signal (signal => "TERM", cb => sub { exit 1 });
52 71
… …
76 if (!-f "$path/regions") { 95 if (!-f "$path/regions") {
77 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
78 exit 1 unless $FORCE; 97 exit 1 unless $FORCE;
79 } 98 }
80 99
81 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
82 and die "map installation failed.\n"; 101 and die "map installation failed.\n";
83 102
84 print "maps installed successfully.\n"; 103 print "maps installed successfully.\n";
85} 104}
86 105
87{ 106{
88 our %ANIMINFO; 107 our %ANIMINFO;
89 our %FACEINFO; 108 our %FACEINFO;
109 our %RESOURCE;
90 our @ARC; 110 our @ARC;
91 our %ARC; 111 our %ARC;
92 our $TRS; 112 our $TRS;
93 our $NFILE; 113 our $NFILE;
114 our $PATH;
94 115
95 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 116 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
96 117
97 our (@png, @trs, @arc); # files we are interested in 118 our (@png, @trs, @arc, @res); # files we are interested in
98 119
99 sub commit_png($$$) { 120 sub commit_png($$$) {
100 my ($name, $data, $T) = @_; 121 my ($name, $data, $T) = @_;
101 122
102 $FACEINFO{$name}{"data$T"} = $data; 123 $FACEINFO{$name}{"data$T"} = $data;
… …
301 322
302 my $ext = $x|$y ? "+$x+$y" : ""; 323 my $ext = $x|$y ? "+$x+$y" : "";
303 324
304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 325 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
305 326
306 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 327 $visibility = delete $o->{visibility} if exists $o->{visibility};
307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 328 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
308 329
309 my $anim = delete $o->{anim}; 330 my $anim = delete $o->{anim};
310 331
311 if ($anim) { 332 if ($anim) {
312 # possibly add $ext to the animation name to avoid 333 # possibly add $ext to the animation name to avoid
… …
367 388
368 $TRS .= $trs; 389 $TRS .= $trs;
369 } 390 }
370 } 391 }
371 392
393 my %FILECACHE;
394
395 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) {
397 my $data;
398 if (0 < aio_load $_[0], $data) {
399 if ($_[1]) {
400 $data = eval { $_[1]->($data) };
401 warn "$_[0]: $@" if $@;
402 }
403 }
404
405 $FILECACHE{$_[0]} = $data;
406 }
407
408 $FILECACHE{$_[0]}
409 }
410
411 sub process_res {
412 while (@res) {
413 my ($dir, $file, $type) = @{pop @res};
414
415 my $data;
416 aio_load "$dir/$file", $data;
417
418 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
419
420 return if $meta && !exists $meta->{$file};
421
422 $meta = {
423 %{ $meta->{"" } || {} },
424 %{ $meta->{$file} || {} },
425 };
426
427 if ($meta->{license} =~ s/^#//) {
428 $meta->{license} = ({
429 "pd" => "Public Domain",
430 "gpl" => "GNU General Public License, version 3.0 or any later",
431 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
432 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/",
433 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
434 })->{$meta->{license}}
435 || warn "$dir/$file: license tag '$meta->{license}' not found.";
436 }
437
438 $file =~ s/\.res$//;
439 $file =~ s/\.(ogg|wav|jpg|png)$//;
440
441 substr $dir, 0, 1 + length $PATH, "";
442
443 $RESOURCE{"$dir/$file"} = {
444 type => (delete $meta->{type}) || $type,
445 data => $data,
446 chksum => (Digest::MD5::md5 $data),
447 %$meta ? (meta => $meta) : (),
448 };
449 }
450 }
451
372 sub find_files; 452 sub find_files;
373 sub find_files { 453 sub find_files {
374 my ($path) = @_; 454 my ($path) = @_;
375 455
376 IO::AIO::aioreq_pri 4; 456 IO::AIO::aioreq_pri 4;
… …
378 my ($dirs, $nondirs) = @_; 458 my ($dirs, $nondirs) = @_;
379 459
380 find_files "$path/$_" 460 find_files "$path/$_"
381 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 461 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
382 462
463 my $dir = $path;
464 substr $dir, 0, 1 + length $PATH, "";
465
383 for my $file (@$nondirs) { 466 for my $file (@$nondirs) {
467 if ($dir =~ /^music(?:\/|$)/) {
468 push @res, [$path, $file, 3] # FT_MUSIC
469 if $file =~ /\.(ogg)$/;
470
471 } elsif ($dir =~ /^sound(?:\/|$)/) {
472 push @res, [$path, $file, 5] # FT_SOUND
473 if $file =~ /\.(wav|ogg)$/;
474
475 } elsif ($dir =~ /^res(?:\/|$)/) {
476 push @res, [$path, $file, 0] # FT_FACE
477 if $file =~ /\.(jpg|png)$/;
478 push @res, [$path, $file, 7] # FT_RSRC
479 if $file =~ /\.(res)$/;
480
384 if ($file =~ /\.png$/) { 481 } elsif ($file =~ /\.png$/) {
385 push @png, ["$path/$file", 0]; 482 push @png, ["$path/$file", 0];
483
386 } elsif ($file =~ /\.trs$/) { 484 } elsif ($file =~ /\.trs$/) {
387 push @trs, [$path, $file]; 485 push @trs, [$path, $file];
486
388 } elsif ($file =~ /\.arc$/) { 487 } elsif ($file =~ /\.arc$/) {
389 push @arc, [$path, $file]; 488 push @arc, [$path, $file];
489
390 } else { 490 } else {
391 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 491 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
392 } 492 }
393 } 493 }
394 }; 494 };
395 } 495 }
396 496
397 sub inst_arch($) { 497 sub inst_arch($) {
398 my (undef, $path) = @_; 498 my (undef, $path) = @_;
499
500 $PATH = $path;
399 501
400 print "\n", 502 print "\n",
401 "Installing '$path' to '$DATADIR'\n", 503 "Installing '$path' to '$DATADIR'\n",
402 "\n", 504 "\n",
403 "This can take a long time if you run this\n", 505 "This can take a long time if you run this\n",
… …
418 $_->join for ( 520 $_->join for (
419 # four png crunchers work fine for my 2x smp machine 521 # four png crunchers work fine for my 2x smp machine
420 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 522 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
421 (async \&process_trs), (async \&process_trs), 523 (async \&process_trs), (async \&process_trs),
422 (async \&process_arc), (async \&process_arc), 524 (async \&process_arc), (async \&process_arc),
525 (async \&process_res), (async \&process_res),
423 ); 526 );
424 527
425 { 528 {
426 # remove path prefix from editor_folder 529 # remove path prefix from editor_folder
427 substr $_->{editor_folder}, 0, 1 + length $path, "" 530 substr $_->{editor_folder}, 0, 1 + length $path, ""
… …
457 560
458 last; 561 last;
459 } 562 }
460 } 563 }
461 564
565 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
566 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
567
462 open my $fh, ">:utf8", "$DATADIR/archetypes~" 568 open my $fh, ">:utf8", "$DATADIR/archetypes~"
463 or die "$DATADIR/archetypes~: $!"; 569 or die "$DATADIR/archetypes~: $!";
464 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 570 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
465 } 571 }
466 572
… …
478 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 584 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
479 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 585 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
480 586
481 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 587 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
482 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 588 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
589
590 if (my $magicmap = $v->{magicmap}) {
591 $magicmap =~ y/A-Z_\-/a-z/d;
592 $v->{magicmap} = $COLOR{$magicmap};
593 }
483 } 594 }
484 595
485 open my $fh, ">:perlio", "$DATADIR/facedata~" 596 open my $fh, ">:perlio", "$DATADIR/facedata~"
486 or die "$DATADIR/facedata~: $!"; 597 or die "$DATADIR/facedata~: $!";
487 598
488 print $fh freeze { 599 print $fh freeze {
489 version => 2, 600 version => 2,
490 faceinfo => \%FACEINFO, 601 faceinfo => \%FACEINFO,
491 animinfo => \%ANIMINFO, 602 animinfo => \%ANIMINFO,
603 resource => \%RESOURCE,
492 }; 604 };
493 } 605 }
494 606
495 for (qw(archetypes facedata treasures)) { 607 for (qw(archetypes facedata treasures)) {
496 chmod 0644, "$DATADIR/$_~"; 608 chmod 0644, "$DATADIR/$_~";

Diff Legend

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