1
0
Fork 0

Merge branch 'cvs.terragear'

This commit is contained in:
Ralf Gerlich 2009-12-15 21:24:04 +01:00
commit f16756b9fe
4 changed files with 18 additions and 10 deletions

View file

@ -1,11 +1,18 @@
#!/usr/bin/perl
$tgzdir = "/stage/fgfs03/curt/Scenery/Scenery-0.9.5";
$tgzdir = "/stage/fgfs07/ftp/pub/fgfs/Scenery-1.0.0/";
$verbose = 0;
if ( $#ARGV < 0 ) {
die "usage: $0 <disk_size_mb> (DVD=4500, CDROM=700)\n";
if ( $#ARGV != 1 ) {
print "usage: $0 <reserve> <disk_size_mb>\n";
print " - where <reserve> is some amount to reserve on the first disk\n";
print " for things like the win32 setup program or aircraft or src.\n";
print " At the moment 700 (Mb) works well.\n";
print " - and <disk_size_mb> is the size in MB of each individual disk.\n";
print " DVD=4500 (Mb), CDROM=700 (Mb)\n";
exit;
} else {
$reserve = shift(@ARGV);
$disksize = shift(@ARGV);
}
@ -25,13 +32,13 @@ if ( $#ARGV < 0 ) {
for $lon (@lons) {
for $lat (@lats) {
push( @files, "$lon$lat.tar.gz" );
push( @files, "$lon$lat.tgz" );
}
}
$disk = 1;
$total_disk = 0;
$total_disk = $reserve;
$total_collection = 0;
foreach $file ( @files ) {

View file

@ -1,12 +1,12 @@
#!/usr/bin/perl
$source = "/stage/fgfs03/curt/Scenery/Scenery-0.9.5";
$source = "/stage/fgfs07/ftp/pub/fgfs/Scenery-1.0.0";
$layout_master = shift( @ARGV );
$dest = shift( @ARGV );
if ( $layout_master eq "" ) {
$layout_master = "./layout-disks-0.9.5";
$layout_master = "./layout-dvd-1.0.0";
}
if ( $dest eq "" ) {
$dest = "./Images";
@ -43,5 +43,6 @@ foreach $file ( @layout ) {
system( "mkdir -p $dest/$dir" );
}
system( "ln -sf $source/$base $dest/$file\n" );
printf( "ln -sf $source/$base $dest/$file\n" );
system( "ln -sf $source/$base $dest/$file" );
}

View file

@ -8,7 +8,7 @@ if [ "x${2}" == "x" ]; then
exit
fi
VERSION=0.9.5
VERSION=1.0.0
SOURCE=$1
DEST=$2
VOLUME_ID=FG_Scenery_${SOURCE}_v${VERSION}

View file

@ -8,7 +8,7 @@ if ( $#ARGV < 0 ) {
$cdromdir = shift(@ARGV);
}
@files = `ls $cdromdir/*.tar.gz`;
@files = `ls $cdromdir/*.tgz`;
$total = 0;
foreach $file ( @files ) {