Changeset 367

Timestamp:

06/07/06 12:55:32 (3 years ago)

Author:

gary

Message:

rename scripts so that all nightly scripts have names starting nightly_xxx

reorder dir work in nightly_copy_tsuite.pl so that cluster work done first, so that, in case of abort, unix and win versions are not deleted

Location:

trunk/scripts

Files:

• nightly_copy_data.pl (moved) (moved from trunk/scripts/copy_data.pl)
• nightly_copy_files.pl (modified) (2 diffs)
• nightly_copy_source.pl (moved) (moved from trunk/scripts/copy_source.pl)
• nightly_copy_tsuite.pl (moved) (moved from trunk/scripts/copy_tsuite.pl) (1 diff)

trunk/scripts/nightly_copy_files.pl

@@ -28 +28 @@
 }
 
-
 # this is where the scripts live
 $scripts = "c:/projects/cloudy/trunk/scripts";
@@ -36 +35 @@
 
 # execute source script
-system( "perl copy_source.pl" );
+system( "perl nightly_copy_source.pl" );
 
 # execute copy tsuite script
-system( "perl copy_tsuite.pl" );
+system( "perl nightly_copy_tsuite.pl" );
 
 # execute source script
-system( "perl copy_data.pl" );
+system( "perl nightly_copy_data.pl" );
 

trunk/scripts/nightly_copy_tsuite.pl

@@ -41 +41 @@
 for ($ndir=0; $ndir<2; $ndir++)
 {
-
-# --------------------------------------------------------------------------
-# this block - clean out the target directories so we get fresh copies
-#
-# move to the pc unix tsuite dir
-$dir = "$unix_copy_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to test suite directory \n";
-print(" moved to tsuite unix target directory, about to delete all files\n");
-# remove all files
-unlink <*> ; 
-
-# move to the win tsuite directory
-$dir = "$win_copy_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to test suite directory \n";
-print(" moved to tsuite win target directory, about to delete all files\n");
-# remove the win tsuite files
-unlink <*> ; 
-
-# move to cluster tsuite directory
-$dir = "$cluster_copy_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to cluster target directory \n";
-print(" moved to cluster tsuite directory, about to delete in files\n");
-# remove the old unix tsuite files - do not do * since want to keep perl files
-unlink <*.in>; 
-# do not remove the *.out since a job may be running
-
-# end block - all target directories cleaned out the so we get fresh copies
-# --------------------------------------------------------------------------
-
-
-# --------------------------------------------------------------------------
-# now copy files from trunk to copy dirs
-#
-# move to original tsuite directory
-$dir = "$trunk_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to trunk directory \n";
-
-# this loops over all input files in the original tsuite directory
-# and copies unix eol version to subdir unix, which is now empty
-# and windows eol version to subdir win/tsuite, which is empty
-while( defined( $input = glob("*.in") ) )
-{
-        print( "$input going to " );
-        $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually copy the file
-        system "dos2unix < $input  > $output";
-#
-#       now do win version
-        print( "$input going to " );
-        $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        copy( $input  , $output );
+   
+   # --------------------------------------------------------------------------
+   # clean out the target directories so we get fresh copies
+   
+   # move to cluster tsuite directory - do this first since this will abort if
+   # u drive is not mounted 
+   $dir = "$cluster_copy_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to cluster target directory \n";
+   print(" moved to cluster tsuite directory, about to delete in files\n");
+   # remove the old unix tsuite files - do not do * since want to keep perl files
+   unlink <*.in>; 
+   #
+   # move to the unix tsuite dir
+   $dir = "$unix_copy_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to test suite directory \n";
+   print(" moved to tsuite unix target directory, about to delete all files\n");
+   # remove all files
+   unlink <*> ; 
+   
+   # move to the win tsuite directory
+   $dir = "$win_copy_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to test suite directory \n";
+   print(" moved to tsuite win target directory, about to delete all files\n");
+   # remove the win tsuite files
+   unlink <*> ; 
+   # do not remove the *.out since a job may be running
+   
+   # end block - all target directories cleaned out the so we get fresh copies
+   # --------------------------------------------------------------------------
+   
+   
+   # --------------------------------------------------------------------------
+   # now copy files from trunk to copy dirs
+   #
+   # move to original tsuite directory
+   $dir = "$trunk_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to trunk directory \n";
+   
+   # this loops over all input files in the original tsuite directory
+   # and copies unix eol version to subdir unix, which is now empty
+   # and windows eol version to subdir win/tsuite, which is empty
+   while( defined( $input = glob("*.in") ) )
+   {
+           print( "$input going to " );
+           $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually copy the file
+           system "dos2unix < $input  > $output";
+   #
+   #       now do win version
+           print( "$input going to " );
+           $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           copy( $input  , $output );
+   }
+   
+   # now copy all html files 
+   while( defined( $input = glob("*.htm") ) )
+   {
+           print( "$input going to " );
+           $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           system "dos2unix < $input  > $output";
+           $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           copy( $input , $output );
+   }
+   
+   # now copy all ini files 
+   while( defined( $input = glob("*.ini") ) )
+   {
+           print( "$input going to " );
+           $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           system "dos2unix < $input  > $output";
+           $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           copy( $input , $output );
+   }
+   
+   # now copy all dat files 
+   while( defined( $input = glob("*.dat") ) )
+   {
+           print( "$input going to " );
+           $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           system "dos2unix < $input  > $output";
+           $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           copy( $input , $output );
+   }
+   
+   # the clouds image is a binary file do a straight copy
+   copy( "clouds.jpg" , "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."clouds.jpg" );
+   # the clouds image is a binary file
+   copy( "clouds.jpg" , "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."clouds.jpg" );
+   
+   # now copy all perl scripts 
+   while( defined( $input = glob("*.pl") ) )
+   {
+           print( "$input going to " );
+           $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           system "dos2unix < $input  > $output";
+           $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually execute the code
+           copy( $input , $output );
+   }
+   
+   print("All tsuite files have been copied to pc unix and win subdirs\n");
+   
+   # move to pc unix copy tsuite directory and copy across to cluster
+   $dir = "$unix_copy_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to pc unix directory \n";
+   # this loops over all files in the pc unix tsuite directory
+   # and copies unix version to subdir unix on cluster, which is now empty
+   while( defined( $input = glob("*") ) )
+   {
+           print( "$input going to " );
+           $output = "$cluster_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
+           print("$output\n");
+           # actually copy the file
+           copy( $input  , $output );
+   }
+   # end copying files around
+   # --------------------------------------------------------------------------
+   
+   
+   # now zip up the directories we created - move into each do it from there
+   # so that dir name is not included
+   
+   # base name of tar file
+   $tarfile_basename = "tsuite_"."$subdirs[$ndir]";
+   
+   $dir = "$unix_copy_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to pc unix directory \n";
+   print(" moved to unix copy directory\n");
+   
+   $tarfile = "$unix_copy_basedir"."/"."$tarfile_basename".".tar";
+   # remove old gzipd file if it exists
+   if( -e "$tarfile" )
+   {
+      unlink("$tarfile" );
+   }
+   
+   #   tar the files
+   #   NB we must do this in the directory so that we do not keep the dir structure, just names
+   # the cygwin tar chocked on the fully resolved tarfile name 
+   #system "tar -cf $tarfile * ";
+   system "C:\\u\\mks\\mksnt\\tar_mks.exe -cf $tarfile * ";
+   print( "about to gzip $tarfile\n" );
+   # remove old gzipd file if it exists
+   if( -e "$tarfile".".gz" )
+   {
+      unlink("$tarfile".".gz" );
+   }
+   system "gzip $tarfile ";
+   
+   # copy to the ftp site
+   copy( "$tarfile".".gz" , $ftp_last );
+   
+   # how go to win home and zip the win source dir
+   $dir = "$win_copy_dir"."/"."$subdirs[$ndir]";
+   chdir( "$dir" ) or die " could not move to pc win directory \n";
+   print(" moved to win copy directory\n");
+   
+   # remove old gzipd file if it exists
+   $tarfile = "$win_copy_basedir"."/"."$tarfile_basename".".zip";
+   if( -e "$tarfile" )
+   {
+      unlink("$tarfile" );
+   }
+   
+   # create zip file
+   #system "c:\\u\\wzzip $tarfile  ";
+   system "wzzip $tarfile  ";
+   
+   # finally copy the newly created files to the ftp site
+   copy( "$tarfile" , $ftp_last );
+   
+   print("\ndone\n");
+
 }
-
-# now copy all html files 
-while( defined( $input = glob("*.htm") ) )
-{
-        print( "$input going to " );
-        $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        system "dos2unix < $input  > $output";
-        $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        copy( $input , $output );
-}
-
-# now copy all ini files 
-while( defined( $input = glob("*.ini") ) )
-{
-        print( "$input going to " );
-        $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        system "dos2unix < $input  > $output";
-        $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        copy( $input , $output );
-}
-
-# now copy all dat files 
-while( defined( $input = glob("*.dat") ) )
-{
-        print( "$input going to " );
-        $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        system "dos2unix < $input  > $output";
-        $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        copy( $input , $output );
-}
-
-# the clouds image is a binary file do a straight copy
-copy( "clouds.jpg" , "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."clouds.jpg" );
-# the clouds image is a binary file
-copy( "clouds.jpg" , "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."clouds.jpg" );
-
-# now copy all perl scripts 
-while( defined( $input = glob("*.pl") ) )
-{
-        print( "$input going to " );
-        $output = "$unix_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        system "dos2unix < $input  > $output";
-        $output = "$win_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually execute the code
-        copy( $input , $output );
-}
-
-print("All tsuite files have been copied to pc unix and win subdirs\n");
-
-# move to pc unix copy tsuite directory and copy across to cluster
-$dir = "$unix_copy_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to pc unix directory \n";
-# this loops over all files in the pc unix tsuite directory
-# and copies unix version to subdir unix on cluster, which is now empty
-while( defined( $input = glob("*") ) )
-{
-        print( "$input going to " );
-        $output = "$cluster_copy_dir"."/"."$subdirs[$ndir]"."/"."$input";
-        print("$output\n");
-        # actually copy the file
-        copy( $input  , $output );
-}
-# end copying files around
-# --------------------------------------------------------------------------
-
-
-# now zip up the directories we created - move into each do it from there
-# so that dir name is not included
-
-# base name of tar file
-$tarfile_basename = "tsuite_"."$subdirs[$ndir]";
-
-$dir = "$unix_copy_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to pc unix directory \n";
-print(" moved to unix copy directory\n");
-
-$tarfile = "$unix_copy_basedir"."/"."$tarfile_basename".".tar";
-# remove old gzipd file if it exists
-if( -e "$tarfile" )
-{
-   unlink("$tarfile" );
-}
-
-#   tar the files
-#   NB we must do this in the directory so that we do not keep the dir structure, just names
-# the cygwin tar chocked on the fully resolved tarfile name 
-#system "tar -cf $tarfile * ";
-system "C:\\u\\mks\\mksnt\\tar_mks.exe -cf $tarfile * ";
-print( "about to gzip $tarfile\n" );
-# remove old gzipd file if it exists
-if( -e "$tarfile".".gz" )
-{
-   unlink("$tarfile".".gz" );
-}
-system "gzip $tarfile ";
-
-# copy to the ftp site
-copy( "$tarfile".".gz" , $ftp_last );
-
-# how go to win home and zip the win source dir
-$dir = "$win_copy_dir"."/"."$subdirs[$ndir]";
-chdir( "$dir" ) or die " could not move to pc win directory \n";
-print(" moved to win copy directory\n");
-
-# remove old gzipd file if it exists
-$tarfile = "$win_copy_basedir"."/"."$tarfile_basename".".zip";
-if( -e "$tarfile" )
-{
-   unlink("$tarfile" );
-}
-
-# create zip file
-#system "c:\\u\\wzzip $tarfile  ";
-system "wzzip $tarfile  ";
-
-# finally copy the newly created files to the ftp site
-copy( "$tarfile" , $ftp_last );
-
-print("\ndone\n");
-
-}