--- deliantra/Deliantra-Client/util/gatherer	2012/01/18 23:10:18	1.11
+++ deliantra/Deliantra-Client/util/gatherer	2012/01/26 20:11:14	1.12
@@ -63,15 +63,12 @@
 
 export DIST="$(pwd)/dist/$OS-$ARCHNAME"
 
-rm -rf "$DIST"
-mkdir -p "$DIST"
+eval $($PERL -V:sitebinexp:)
 
-#PERL=/opt/perl
-#PANGO=1.6.0
-
-export EV_EVENTFD=0
-export EV_INOTIFY=0
-export EV_SIGNALFD=0
+"$sitebinexp"/perl-libextractor --exedir . --dlldir . --bindir pm/bin --libdir pm \
+   --perl --core-support --script deliantra \
+   --runtime-only --strip \
+   --copy "$DIST"
 
 cat <<EOF >"$DIST"/pango.rc
 [Pango]
@@ -98,95 +95,6 @@
 cp "$sitebinexp"/deliantra "$DIST"/pm/bin/
 cp -p util/run "$DIST"
 
-(
-   exec <util/modules.dep
-
-#   while read type name; do
-#      if [ "$type" = d ]; then
-#         # not implemented
-#         dir=$(echo "$name" | sed -e s%::%/%g)
-#         for lib in "$sitearchexp" "$sitelib" "$vendorarchexp" "$vendorlibexp" "$archlibexp" "$privlibexp"; do
-#            if [ -e "$lib/auto/$dir/.packlist" ]; then
-#               cat "$lib/auto/$dir/.packlist"
-#            fi
-#            echo "x $lib $dir"
-#         done
-#      elif [ $type = m ]; then
-#         :
-#      else
-#         echo "unknown type $type ($name)"
-#         exit 1
-#      fi
-#   done
-   mkdir -p "$DIST"/pm
-
-   export OSDIST="$DIST"
-   [ "$OS" = windows ] && OSDIST=$(cygpath -w "$OSDIST")
-
-   $PERL -e '
-      use Config;
-      use File::Glob qw(:glob);
-      use File::Copy;
-      use File::Path;
-      use File::Basename;
-
-      my @path = do {
-         my %seen;
-         grep !$seen{$_}++, grep length, map $Config{$_}, qw(
-            sitearchexp
-            sitelib
-            vendorarchexp
-            vendorlibexp
-            archlibexp
-            privlibexp
-         )
-      };
-
-      while (<>) {
-         s/\015?\012$//;
-         next if /^(#|$)/;
-         s/\.dynob$/.'$SO'/;
-
-         my $found;
-         for my $lib (@path) {
-            chdir $lib || next;
-
-            my @glob = File::Glob::bsd_glob $_, 0; # explicit 0 needed
-
-            if (@glob) {
-               ++$found;
-
-               for (@glob) {
-                  if (-d $_) {
-                     system "rsync", "-aR", $_, "$ENV{DIST}/pm/.";
-                  } else {
-                     File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_;
-                     File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_"
-                        or die "$lib/$_ => $ENV{OSDIST}/pm/$_: $!";
-
-                     if (s/\.pm$//) {
-                        $auto = "auto/$_";
-
-                        for my $glob ("*.'$SO'", "autosplit.ix", "*.al") {
-                           for (bsd_glob "$auto/$glob", 0) {
-                              File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_;
-                              File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_";
-                           }
-                        }
-                     }
-                  }
-               }
-
-               last;
-            }
-         }
-
-         warn "$_: not found\n"
-            unless $found;
-      }
-   '
-) || exit
-
 #############################################################################
 
 if [ "$OS" = windows ]; then
@@ -227,8 +135,6 @@
 (
    cd "$DIST"
 
-   cp -p "$PERL" .
-
    if [ "$OS" = windows ]; then
       cp -p $SYSLIB/libvorbisfile-3.dll $SYSLIB/mikmod.dll $SYSLIB/libpng12-0.dll .
       cp /root/src/CFPlus/util/splash.bmp .