Ensure we don't include the globals twice at the beginning of the file in non-svn environments as the .<foo>ignore_global file already contains them. Remove the extra check for svn repo in the hgignore script.

This commit was SVN r31533.

contrib/git/build-gitignore.pl

@@ -31,40 +31,11 @@ Usage: $0 [-v] [-o output] [-h]\n";
 print "Writing to: $output_arg\n"
     if ($verbose_arg);
 
-#############################################################################
-
-# Put in some specials that we ignore everywhere
-my @globals = qw/.libs
-.deps
-.libs
-.svn
-*.la
-*.lo
-*.o
-*.so
-*.a
-.dirstamp
-*.dSYM
-*.S
-*.loT
-*.orig
-*.rej
-*.class
-*.xcscheme
-*.plist
-*~
-Makefile
-Makefile.in
-static-components.h
-*\\\#/;
-unshift(@globals, "# Automatically generated by build-gitignore.pl; edits may be lost!");
-
 open(OUT, ">$output_arg");
 
-# add the globals */
-foreach my $val (@globals) {
-    print OUT "$val\n";
-}
+my @globals;
+
+#############################################################################
 
 print "Thinking...\n"
     if (!$verbose_arg);
@@ -96,6 +67,38 @@ if (! -d "./.svn") {
         print OUT "$val\n";
     }
 } else {
+    # Put in some specials that we ignore everywhere
+    @globals = qw/.libs
+                  .deps
+                  .libs
+                  .svn
+                  *.la
+                  *.lo
+                  *.o
+                  *.so
+                  *.a
+                  .dirstamp
+                  *.dSYM
+                  *.S
+                  *.loT
+                  *.orig
+                  *.rej
+                  *.class
+                  *.xcscheme
+                  *.plist
+                  *~
+                  Makefile
+                  Makefile.in
+                  static-components.h
+                  *\\\#/;
+    unshift(@globals, "# Automatically generated by build-gitignore.pl; edits may be lost!");
+    
+
+    # add the globals */
+    foreach my $val (@globals) {
+        print OUT "$val\n";
+    }
+
     # Start at the top level
     process(".");
 }

contrib/hg/build-hgignore.pl

@@ -34,62 +34,12 @@ print "Writing to: $output_arg\n"
 
 #############################################################################
 
-# Sanity check
-die "Not in an SVN repository top dir"
-    if (! -d ".svn");
-
-# Put in some specials that we ignore everywhere
-my @hgignore;
-push(@hgignore, "# Automatically generated by build-hgignore.pl; edits may be lost!
-syntax: glob");
-my @globals = qw/.libs
-.deps
-.svn
-*.la
-*.lo
-*.o
-*.so
-*.a
-.dirstamp
-*.dSYM
-*.S
-*.loT
-*.orig
-*.rej
-*.class
-*.xcscheme
-*.plist
-.git*
-.mailmap
-.DS_Store
-stamp-h[1-9]
-configure
-config.guess
-config.sub
-config.log
-config.status
-libtool
-ltmain.sh
-missing
-depcomp
-install-sh
-aclocal.m4
-autom4te.cache
-Makefile
-static-components.h
-project_list.m4
-orte_wrapper_script
-ompi_wrapper_script
-make.out
-config.out
-auto.out
-diff.out
-*~
-*\\\#/;
-
 print "Thinking...\n"
     if (!$verbose_arg);
 
+my @hgignore;
+my @globals;
+
 # if we are not in an svn repo, then just concatenate
 # the .hgignore_global and any .hgignore_local files
 # to make the new .hgignore
@@ -106,12 +56,60 @@ if (! -d "./.svn") {
                 if ($verbose_arg);
             while (<IN>) {
                 chomp;
-                push(@globals, $_);
+                push(@hgignore, $_);
             }
             close(IN);
         }
     }
 } else {
+    # Put in some specials that we ignore everywhere
+    push(@hgignore, "# Automatically generated by build-hgignore.pl; edits may be lost!
+syntax: glob");
+    @globals = qw/.libs
+                  .deps
+                  .svn
+                  *.la
+                  *.lo
+                  *.o
+                  *.so
+                  *.a
+                  .dirstamp
+                  *.dSYM
+                  *.S
+                  *.loT
+                  *.orig
+                  *.rej
+                  *.class
+                  *.xcscheme
+                  *.plist
+                  .git*
+                  .mailmap
+                  .DS_Store
+                  stamp-h[1-9]
+                  configure
+                  config.guess
+                  config.sub
+                  config.log
+                  config.status
+                  libtool
+                  ltmain.sh
+                  missing
+                  depcomp
+                  install-sh
+                  aclocal.m4
+                  autom4te.cache
+                  Makefile
+                  static-components.h
+                  project_list.m4
+                  orte_wrapper_script
+                  ompi_wrapper_script
+                  make.out
+                  config.out
+                  auto.out
+                  diff.out
+                  *~
+                  *\\\#/;
+    
     # Start at the top level
     process(".");