--- deliantra/Deliantra-Client/util/gatherer 2011/12/30 04:17:19 1.1 +++ deliantra/Deliantra-Client/util/gatherer 2011/12/30 05:44:23 1.2 @@ -169,7 +169,7 @@ if (-d $_) { system "rsync", "-aR", $_, "$ENV{DIST}/pm/."; } else { - File::Path::make_path "$ENV{OSDIST}/pm/" . dirname $_; + File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_; File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_" or die "$ENV{OSDIST}/pm/$_: $!"; @@ -178,7 +178,7 @@ for my $glob ("*.'$SO'", "autosplit.ix", "*.al") { for (bsd_glob "$auto/$glob", 0) { - File::Path::make_path "$ENV{OSDIST}/pm/" . dirname $_; + File::Path::mkpath "$ENV{OSDIST}/pm/" . dirname $_; File::Copy::syscopy "$_", "$ENV{OSDIST}/pm/$_"; } } @@ -236,25 +236,27 @@ ( cd "$DIST" - # # patch braindamaged pango - if [ "$OS" != windows ]; then - 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 - chmod 755 libpango-1.0.$LIB0 - fi + 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 . chmod -R u+rwX pm/auto + + # convert perl to a non-console-app + $PERL -MWin32::Exe -e '$e = new Win32::Exe"perl.exe"; $e->set_subsystem_windows; $e->write' + else + # patch braindamaged pango + 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 + chmod 755 libpango-1.0.$LIB0 + for lib in mikmod vorbisfile; do cp -p $SYSLIB/lib$lib.$LIB0 . chmod 755 lib$lib.$LIB0 done fi - cp -p "$PERL" . - for so in $(find . -name "*.$SO" -o -name "*.$LIBEXT" -o -name "*.$LIB0") perl; do add_deps "$so" done @@ -315,7 +317,7 @@ printf -- urlader$URLADER >"$DIST".urlader -echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS./perl run +echo >"$DIST".genpack genpack deliantra_S-$OS-"$ARCHNAME" '"$EXE_VER"' '"$1"' $GENPACK_ENVVARS ./perl run exit