X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Farchival%2Fshared_snarfer.pl;h=9edc41427297fde85a2349f197ca938c2d1e420a;hb=abad259144d11f1a8a752f14ae8a79968a073c89;hp=0a37bf093a29d71a5ab4b001ed7da7cd26bc7ae9;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl
index 0a37bf09..9edc4142 100644
--- a/scripts/archival/shared_snarfer.pl
+++ b/scripts/archival/shared_snarfer.pl
@@ -26,16 +26,9 @@ require "importenv.pl";
 require "inc_num.pl";
 
 use Cwd;
+use File::Which;
 
-#hmmm: maybe move this to a utility script file.
 $null_log = "/dev/null";
-#hmmm: move especially this check to a script file, and recast anything
-#      referring to Windows_NT to it.
-if ( ("$OS" =~ /[wW][iI][nN]/) || ("$OS" =~ /[Oo][Ss]2/)
-    || ("$OS" =~ /[Dd][Oo][Ss]/) ) {
-  $null_log = "nul"
-}
-#print "nul log=$null_log \n";
 
 $TMP =~ s/\\/\//g;  # fix the temp variable for ms-winders.
 
@@ -45,7 +38,8 @@ $TMP =~ s/\\/\//g;  # fix the temp variable for ms-winders.
 # these files are considered unimportant and won't be included in the archive.
 @junk_file_list = ("*~", "*.$$$", "3rdparty", "*.aps", "*.bak", "binaries",
     "*.bsc", "*.cgl", "*.csm", "CVS", "Debug", "*.dll", "*.err", "*.exe",
-    "generated_*", "*.glb", "inprogress", "ipch", "*.llm", "*.log", "*.lnk",
+    "generated_*", "*.git", "*.glb", "inprogress", "ipch", "*.llm",
+    "*.log", "*.lnk",
     "makefile.fw*", "*.mbt", "*.mrt", "*.ncb", "*.o", "obj", "*.obj",
     "octalforty.Wizardby", "*.obr", "*.opt", "packages", 
     "*.pch", "*.pdb", "*.plg", "*.r$p", "*.rcs", "Release",
@@ -53,7 +47,6 @@ $TMP =~ s/\\/\//g;  # fix the temp variable for ms-winders.
     "*.sdf", "*.suo", ".svn", "*.sym", "*.td", "*.tds", "*.tdw", "*.tlb",
     "*.trw", "*.tmp", "*.tr", "*.user", "*_version.h", "*_version.rc",
     "*.vspscc", "waste");
-###, "*.wav"
 #print "junk list=@junk_file_list\n";
 @excludes = ();
 for (local($i) = 0; $i < scalar(@junk_file_list); $i++) {
@@ -62,18 +55,8 @@ for (local($i) = 0; $i < scalar(@junk_file_list); $i++) {
 #print "excludes list=@excludes\n";
 
 # generic versions work on sane OSes.
-$find_tool = `which find`; chop $find_tool;
-$tar_tool = `which tar`; chop $tar_tool;
-
-# pick a more specific version for windows.
-if ( ("$OS" =~ /[wW][iI][nN]/) || ("$OS" =~ /[Oo][Ss]2/)
-    || ("$OS" =~ /[Dd][Oo][Ss]/) ) {
-  $top_level = "$BUILD_TOP";
-  $msys_folder = "$top_level/build/msys/bin";
-  $find_tool = "$msys_folder/find.exe";
-  $tar_tool = "$msys_folder/tar.exe";
-}
-
+$find_tool = which('find');
+$tar_tool = which('tar');
 #print "find tool: $find_tool\n";
 #print "tar tool: $tar_tool\n";
 
@@ -100,22 +83,14 @@ sub short_hostname {
 # a timestamp and hostname.
 sub snarf_prefix {
   local($base) = @_;
-  local($extra_path) = "";
-  if ($OS =~ /win/i) {
-    if (length($MINGBIN)) {
-      # we rely on the ming binary path on windows, since otherwise a strange
-      # interaction between perl and windowz causes 'date' to use the retarded
-      # windows date program, even with the ming binaries in the path before
-      # the windows directory.
-      $extra_path = "$MINGBIN/";
-#print "ming path here is:\n$MINGBIN\n";
-    } else {
-      # just hope that this is running under msys in our build bin.
-      $extra_path = "$HOME/hoople2/build/msys/bin/";
-    }
-  }
+  $date_tool = "date";
 
-  local($date_part) = `${extra_path}date +%Y-%m-%d-%H%M`;
+#  if ($OS =~ /win/i) {
+#    # just hope that this is running under msys in our build bin.
+#    $date_tool = "$PRODUCTION_DIR/msys/bin/date";
+#  }
+
+  local($date_part) = `$date_tool +%Y-%m-%d-%H%M`;
   while ($date_part =~ /[\r\n]$/) { chop $date_part; }
   local($host) = &short_hostname();
   while ($host =~ /[\r\n]$/) { chop $host; }
@@ -194,7 +169,7 @@ sub snarfer {
   chdir($root);
 
   local($outcome) = 0;
-  my @lines = qx( $find_tool $subdir @extra_flags "-type" "f" );
+  my @lines = qx( $find_tool "$subdir" @extra_flags "-type" "f" );
 #  if ( ($! != 0) || ($? != 0) ) {
 #    die("failure to find files in $subdir"); 
 #  }
@@ -209,6 +184,7 @@ sub snarfer {
     push(@missing_log, $base);
   }
 
+print "snarfer function assumes msys canonicalization is appropriate--not cygwin compat.\n";
   local($outcome) = 0xff & system $tar_tool, 
       "-rf", &msys_canonicalize($target_file), @excludes,
       "--files-from=" . &msys_canonicalize($temp_file);
@@ -248,6 +224,7 @@ sub snarf_file_list {
     if ($i =~ /^\.\//) {
       $i = substr $i, 2, length($i) - 2;
     }
+print "snarf_file_list function assumes msys canonicalization is appropriate--not cygwin compat.\n";
     local($outcome) = 0xff & system $tar_tool,
 #"--directory=" . "$root",
         @extra_flags, "-rf", &msys_canonicalize($target_file), @excludes, $i;
@@ -286,6 +263,7 @@ sub remove_from_backup {
 #print "remove_from_backup: pref=$prefix, num=$number, patt=$pattern,\n";
   local($target_file) = &snarf_name($prefix, $number);
 
+print "remove_from_backup function assumes msys canonicalization is appropriate--not cygwin compat.\n";
   open(TARPROC, "$tar_tool --delete -f " . &msys_canonicalize($target_file)
       . " \"$pattern\" 2>$null_log |");
   <TARPROC>;
@@ -341,22 +319,37 @@ sub backup_hierarchies {
   }
 }
 
-# grab up all the files in a directory (first parm) that are named matching
-# a simple text pattern (second parm).
+# grab up all the files in a directory (second parm) that are named matching
+# a simple text pattern (third parm).  if there is a fourth parameter, it is
+# used as an extra directory component after the main directory.
 sub snarf_by_pattern {
-  local($dir, $pattern) = @_;
-#  print "dir = $dir and patt = $pattern\n";
-
+  local($prefix, $dir, $pattern, $extra_component) = @_;
+  local($had_extra) = length($extra_component) != 0;
+#print "snarf by pattern, dir = $dir, patt = $pattern, extra = $extra_component\n";
+  if ($had_extra) {
+    $dir = "$dir/$extra_component";
+  }
   @dir_contents = &glob_list("$dir/*$pattern*"); 
-#  print "dir contents: @dir_contents\n";
+#print "dir contents: @dir_contents\n";
 
   if (!scalar(@dir_contents)) {
-    print "no $pattern directores were backed up in $dir.\n";
+    print "no '$pattern' directores were backed up in $dir.\n";
   }
+  
   foreach $item (@dir_contents) {
     if ( ($item =~ /$pattern.*snarf/) || ($item =~ /$pattern.*tar/) ) { next; }
     if ( ! -d "$item" ) { next; }
-    &backup_hierarchy($base, $number, $item, ".");
+#print "now really planning to backup hier of $item\n";
+    # normal backup had no extra component.
+    local $upper_dir = &dirname($item);
+    local $dir_plus_base = &basename($item);
+    # if we did have an extra component, we do this a bit differently.
+    if ($had_extra) {
+      $upper_dir = &dirname( &dirname($item) );
+      $dir_plus_base = &basename( &dirname($item) ) . "/" . &basename($item);
+    }
+#print "using upper=$upper_dir and dir+base=$dir_plus_base\n";
+    &backup_hierarchy($prefix, $number, $upper_dir, $dir_plus_base);
   }
 }
 
@@ -383,6 +376,7 @@ sub backup_number {
   local($currdir) = cwd();
   chdir($TMP);
 
+print "backup_number function assumes msys canonicalization is appropriate--not cygwin compat.\n";
   local($outcome) = 0xff & system $tar_tool, "-cf",
       &msys_canonicalize($target_file), &msys_canonicalize($number_file);
   if ($outcome) { die("failure to archive"); }
@@ -461,12 +455,13 @@ sub restore_archive {
     $filename = "../" . $filename;
   }
 
+print "restore_archive function assumes msys canonicalization is appropriate--not cygwin compat.\n";
   local($outcome) = 0xff & system $tar_tool, "-xzf",
       &msys_canonicalize($filename);
   if ($outcome) { die("failure to undo archive"); }
 
   local($outcome) =
-      0xff & system "bash", "$SHELLDIR/files/normal_perm.sh", ".";
+      0xff & system "bash", "$FEISTY_MEOW_SCRIPTS/files/normal_perm.sh", ".";
   if ($outcome) { die("failure to normalize permissions"); }
 
   # remove any links that might have crept in; these can cause mischief.