From cfd8802218be0fec7e9ca9da9b78dfa05fadcd63 Mon Sep 17 00:00:00 2001 From: "Walter F.J. Mueller" Date: Sat, 17 Dec 2016 20:18:29 +0100 Subject: [PATCH] re-organize .gitignores --- .gitignore | 48 ++++------------ doc/man/man1/svn_set_ignore.1 | 16 +++--- rtl/.gitignore | 55 ++++++++++++++++++ tools/asm-11/.gitignore | 2 + tools/asm-11/tests/.gitignore | 1 - tools/bin/svn_set_ignore | 89 ++++++++++++++++------------- tools/oskit/.gitignore | 10 ++++ tools/src/librlink/.gitignore | 1 - tools/src/librlinktpp/.gitignore | 1 - tools/src/librtcltools/.gitignore | 1 - tools/src/librtools/.gitignore | 1 - tools/src/librutiltpp/.gitignore | 1 - tools/src/librw11/.gitignore | 1 - tools/src/librwxxtpp/.gitignore | 1 - tools/src/tclshcpp/.gitignore | 1 - tools/src/testtclsh/.gitignore | 1 - tools/tcl/{ibd_dl11 => }/.gitignore | 0 tools/tcl/ibd_ibmon/.gitignore | 1 - tools/tcl/ibd_lp11/.gitignore | 1 - tools/tcl/ibd_pc11/.gitignore | 1 - tools/tcl/ibd_rhrp/.gitignore | 1 - tools/tcl/ibd_rk11/.gitignore | 1 - tools/tcl/ibd_rl11/.gitignore | 1 - tools/tcl/ibd_tm11/.gitignore | 1 - tools/tcl/rbbram/.gitignore | 1 - tools/tcl/rbemon/.gitignore | 1 - tools/tcl/rbmoni/.gitignore | 1 - tools/tcl/rbs3hio/.gitignore | 1 - tools/tcl/rbsysmon/.gitignore | 1 - tools/tcl/rbtest/.gitignore | 1 - tools/tcl/rlink/.gitignore | 1 - tools/tcl/rutil/.gitignore | 1 - tools/tcl/rw11/.gitignore | 1 - tools/tcl/rw11util/.gitignore | 1 - tools/tcl/tst_rlink/.gitignore | 1 - tools/tcl/tst_sram/.gitignore | 1 - 36 files changed, 136 insertions(+), 113 deletions(-) create mode 100644 rtl/.gitignore create mode 100644 tools/asm-11/.gitignore create mode 100644 tools/oskit/.gitignore delete mode 100644 tools/src/librlink/.gitignore delete mode 100644 tools/src/librlinktpp/.gitignore delete mode 100644 tools/src/librtcltools/.gitignore delete mode 100644 tools/src/librtools/.gitignore delete mode 100644 tools/src/librutiltpp/.gitignore delete mode 100644 tools/src/librw11/.gitignore delete mode 100644 tools/src/librwxxtpp/.gitignore delete mode 100644 tools/src/tclshcpp/.gitignore rename tools/tcl/{ibd_dl11 => }/.gitignore (100%) delete mode 100644 tools/tcl/ibd_ibmon/.gitignore delete mode 100644 tools/tcl/ibd_lp11/.gitignore delete mode 100644 tools/tcl/ibd_pc11/.gitignore delete mode 100644 tools/tcl/ibd_rhrp/.gitignore delete mode 100644 tools/tcl/ibd_rk11/.gitignore delete mode 100644 tools/tcl/ibd_rl11/.gitignore delete mode 100644 tools/tcl/ibd_tm11/.gitignore delete mode 100644 tools/tcl/rbbram/.gitignore delete mode 100644 tools/tcl/rbemon/.gitignore delete mode 100644 tools/tcl/rbmoni/.gitignore delete mode 100644 tools/tcl/rbs3hio/.gitignore delete mode 100644 tools/tcl/rbsysmon/.gitignore delete mode 100644 tools/tcl/rbtest/.gitignore delete mode 100644 tools/tcl/rlink/.gitignore delete mode 100644 tools/tcl/rutil/.gitignore delete mode 100644 tools/tcl/rw11/.gitignore delete mode 100644 tools/tcl/rw11util/.gitignore delete mode 100644 tools/tcl/tst_rlink/.gitignore delete mode 100644 tools/tcl/tst_sram/.gitignore diff --git a/.gitignore b/.gitignore index 8ae24a0b..b79c3a5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,18 @@ +# backup files +*.bak +*~ + +# archives *.gz *.tar *.tgz + +# make auto-dependency +*.dep *.dep_* -work-obj93.cf -*.vcd -*.ghw -*.sav + +# temporary and generated +*.o *.tmp -*.exe -ise -xflow.his -*.ngc -*.ncd -*.pcf -*.bit -*.msk -*.svf *.log -isim -*_[sfot]sim.vhd -*_tsim.sdf -rlink_cext_fifo_[rt]x -rlink_cext_conf -tmu_ofile -*.dsk -*.tap -*.lst -*.cof -.Xil -project_mflow -xsim.dir -webtalk_* -*_[sfot]sim -*_[IX]Sim -*_[IX]Sim_[sfot]sim -*.dcp -*.jou -*.pb -*.prj -*.rpt -*.wdb +core diff --git a/doc/man/man1/svn_set_ignore.1 b/doc/man/man1/svn_set_ignore.1 index d14f14c0..f0071456 100644 --- a/doc/man/man1/svn_set_ignore.1 +++ b/doc/man/man1/svn_set_ignore.1 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" $Id: svn_set_ignore.1 550 2014-02-03 08:16:57Z mueller $ +.\" $Id: svn_set_ignore.1 822 2016-12-17 18:50:04Z mueller $ .\" .\" Copyright 2013- by Walter F.J. Mueller .\" @@ -8,7 +8,7 @@ .TH SVN_SET_IGNORE 1 2010-04-26 "Retro Project" "Retro Project Manual" .\" ------------------------------------------------------------------ .SH NAME -svn_set_ignore \- setup svn:ignore properties based on .cvsignore files +svn_set_ignore \- setup svn:ignore properties based on .gitignore files .\" ------------------------------------------------------------------ .SH SYNOPSIS . @@ -20,13 +20,13 @@ svn_set_ignore \- setup svn:ignore properties based on .cvsignore files .SH DESCRIPTION Creates or updates a \fIsvn:ignore\fP property for the current directory and all sub-directories. The current directory must contain a -\fI.cvsignore\fP file which defines the default list of ignore patterns for the -whole project. If a local \fI.cvsignore\fP file is found in a sub directory -its content will be appended to the default list. +\fI.gitignore\fP file which defines the default list of ignore patterns for the +whole project. The local ignore pattern for each directory is the concatination +of all \fI.gitignore\fP files found in the directory hierarchy. . If no \fIsvn:ignore\fP property exists or the existing one differs from the ignore pattern list determined from the top level and local -\f.cvsignore\fP file the property is set or updated. +\f.gitignore\fP file the property is set or updated. . .\" ------------------------------------------------------------------ .SH OPTIONS @@ -38,8 +38,8 @@ svn repository. . .\" ------------------------------------------------------------------ .SH EXIT STATUS -If no \fI.cvsignore\fP file is found or a \fBsvn\fP(1) command fails the -script dies with exit status 2. +If no top level \fI.gitignore\fP file is found or a \fBsvn\fP(1) command fails +the script dies with exit status 2. . .\" ------------------------------------------------------------------ .SH "SEE ALSO" diff --git a/rtl/.gitignore b/rtl/.gitignore new file mode 100644 index 00000000..91587682 --- /dev/null +++ b/rtl/.gitignore @@ -0,0 +1,55 @@ +# ghdl + gtkwave +work-obj93.cf +ghdl.[bsfort]sim +*.vcd +*.ghw +*.sav +*.gcov +*.gcda +*.gcno + +# generated hdl models +*_[sfort]sim.vhd +*_[sorept]sim.v +*_[ept]sim.sdf + +# Xilinx tools ISE +ise +xflow.his +*.ngc +*.ncd +*.pcf +*.bit +*.msk +*.svf +*.log +isim +fuse.xmsgs +fuseRelaunch.cmd + +# Xilinx tools Vivado +.Xil +project_mflow +xsim.dir +xsim.[bsorept]sim.* +webtalk_* +*_[sfot]sim +*_[IX]Sim +*_[IX]Sim_[sfot]sim +*.dcp +*.jou +*.pb +*.prj +*.rpt +*.wdb + +# rlink +rlink_cext_fifo_[rt]x +rlink_cext_conf + +# simulation +tmu_ofile +*.dsk +*.tap +*.lst +*.cof diff --git a/tools/asm-11/.gitignore b/tools/asm-11/.gitignore new file mode 100644 index 00000000..073e1835 --- /dev/null +++ b/tools/asm-11/.gitignore @@ -0,0 +1,2 @@ +*.lda +*.lst diff --git a/tools/asm-11/tests/.gitignore b/tools/asm-11/tests/.gitignore index 35c294cc..c480c56a 100644 --- a/tools/asm-11/tests/.gitignore +++ b/tools/asm-11/tests/.gitignore @@ -1,3 +1,2 @@ -*.lda *.ldart *.lstrt diff --git a/tools/bin/svn_set_ignore b/tools/bin/svn_set_ignore index c3a56631..1ec4d312 100755 --- a/tools/bin/svn_set_ignore +++ b/tools/bin/svn_set_ignore @@ -1,7 +1,7 @@ #!/usr/bin/perl -w -# $Id: svn_set_ignore 601 2014-11-07 22:44:43Z mueller $ +# $Id: svn_set_ignore 822 2016-12-17 18:50:04Z mueller $ # -# Copyright 2007-2014 by Walter F.J. Mueller +# Copyright 2007-2016 by Walter F.J. Mueller # # This program is free software; you may redistribute and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -14,12 +14,13 @@ # # Revision History: # Date Rev Vers Comment +# 2016-12-17 821 1.2 use .gitignore rather .cvsignore # 2014-11-04 601 1.1 use 'svn info' rather /.svn check for svn >= 1.7 # 2010-04-26 284 1.0.1 add error check for GetOptions # 2007-06-16 56 1.0 Initial version # -use 5.005; # require Perl 5.005 or higher +use 5.14.0; # require Perl 5.14 or higher use strict; # require strict checking use Getopt::Long; @@ -27,33 +28,30 @@ use Getopt::Long; sub do_dir; my @dirlist; -my @def_ipat; +my %ignores; my %opts = (); -GetOptions(\%opts, "dry-run") +GetOptions(\%opts, "trace", "dry-run") or die "bad options"; if (@ARGV) { push @dirlist, @ARGV; } else { - @dirlist = `find -type d | grep -v "\.svn"`; + @dirlist = `find -type d | sort`; die "bad find|grep" if $?; + chomp @dirlist; + # drop some directories at this level + @dirlist = grep {! /\/(\.svn|\.Xil)/} @dirlist; } -open (CVSIG, ".cvsignore") or die "no top level .cvsigore found"; -@def_ipat = grep /.+/, ; -close (CVSIG); - -foreach (@dirlist) { chomp; do_dir($_); } +foreach (@dirlist) { do_dir($_); } #------------------------------------------------------------------------------- sub do_dir { my ($dirname) = @_; my @cur_ipat; - my @loc_ipat; - my @sum_ipat; my @new_ipat; my %ipat; @@ -64,43 +62,54 @@ sub do_dir { return if $?; print "$dirname\n"; - open (SVN, "svn pg svn:ignore $dirname|") or die "failed to open svn pg pipe"; - @cur_ipat = grep /.+/, ; # prop get and drop empty lines - close (SVN); - if ($dirname ne "." && -r "$dirname/.cvsignore") { - open (CVSIG, "$dirname/.cvsignore") - or die "failed to read local .cvsignore"; - @loc_ipat = grep /.+/, ; - close (CVSIG); - } - - push @sum_ipat, @def_ipat; - push @sum_ipat, @loc_ipat; - - foreach (@sum_ipat) { - if (exists $ipat{$_}) { - my $pat = $_; - chomp $pat; - print "duplicate ignore: $pat in $dirname\n"; - } else { - $ipat{$_} = 1; - push @new_ipat, $_; + my @dpelist = split '/', $dirname; + my @dpecurr = (); + foreach my $e (@dpelist) { + push @dpecurr, $e; + my $d = join '/',@dpecurr; + if (not exists $ignores{$d}) { + $ignores{$d} = (); + if (-r "$d/.gitignore") { + print "read $d/.gitignore\n" if exists $opts{trace}; + open (CVSIG, "$d/.gitignore") + or die "failed to read $d/.gitignore"; + while () { + chomp; + next if /^\s*$/; # ignore empty or space only lines + next if /^#/; # ignore comments + push @{$ignores{$d}}, $_; + print " $_\n" if exists $opts{trace}; + } + close (CVSIG); + } + } + foreach my $i (@{$ignores{$d}}) { + next if exists $ipat{$i}; + $ipat{$i} = 1; + push @new_ipat, $i; } } - if (join("",@cur_ipat) ne join("",@new_ipat)) { + open (SVN, "svn pg svn:ignore $dirname|") + or die "failed to open svn pg pipe for '$dirname'"; + while () { + chomp; + next if /^\s*$/; # ignore empty or space only lines + push @cur_ipat, $_; + } + close (SVN); + + if (join("\n",@cur_ipat) ne join("\n",@new_ipat)) { print "update svn:ignore for $dirname\n"; print "old svn:ignore:\n"; - print " ", join " ",@cur_ipat if @cur_ipat; - print "local .cvsignore:\n"; - print " ", join " ",@loc_ipat if @loc_ipat; + print " ", join("\n ",@cur_ipat),"\n"; print "new svn:ignore:\n"; - print " ", join " ",@new_ipat if @new_ipat; + print " ", join("\n ",@new_ipat),"\n"; if (not exists $opts{"dry-run"}) { open (TMP, ">/tmp/svn_set_ignore_$$") or die "failed to open tmp file"; - print TMP join "",@new_ipat; + print TMP join("\n",@new_ipat),"\n"; close (TMP); print `svn ps svn:ignore -F /tmp/svn_set_ignore_$$ $dirname`; die "bad svn ps" if $?; diff --git a/tools/oskit/.gitignore b/tools/oskit/.gitignore new file mode 100644 index 00000000..6238dc1a --- /dev/null +++ b/tools/oskit/.gitignore @@ -0,0 +1,10 @@ +*.dsk +*.tap + +# simulation stuff +rlink_cext_conf +rlink_cext_fifo_rx +rlink_cext_fifo_tx + +# monitoring stuff +*.scnt diff --git a/tools/src/librlink/.gitignore b/tools/src/librlink/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librlink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/librlinktpp/.gitignore b/tools/src/librlinktpp/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librlinktpp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/librtcltools/.gitignore b/tools/src/librtcltools/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librtcltools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/librtools/.gitignore b/tools/src/librtools/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librtools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/librutiltpp/.gitignore b/tools/src/librutiltpp/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librutiltpp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/librw11/.gitignore b/tools/src/librw11/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librw11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/librwxxtpp/.gitignore b/tools/src/librwxxtpp/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/librwxxtpp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/tclshcpp/.gitignore b/tools/src/tclshcpp/.gitignore deleted file mode 100644 index 49858186..00000000 --- a/tools/src/tclshcpp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.dep diff --git a/tools/src/testtclsh/.gitignore b/tools/src/testtclsh/.gitignore index 661be0f4..63b7189a 100644 --- a/tools/src/testtclsh/.gitignore +++ b/tools/src/testtclsh/.gitignore @@ -1,2 +1 @@ -*.dep testtclsh diff --git a/tools/tcl/ibd_dl11/.gitignore b/tools/tcl/.gitignore similarity index 100% rename from tools/tcl/ibd_dl11/.gitignore rename to tools/tcl/.gitignore diff --git a/tools/tcl/ibd_ibmon/.gitignore b/tools/tcl/ibd_ibmon/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_ibmon/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/ibd_lp11/.gitignore b/tools/tcl/ibd_lp11/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_lp11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/ibd_pc11/.gitignore b/tools/tcl/ibd_pc11/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_pc11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/ibd_rhrp/.gitignore b/tools/tcl/ibd_rhrp/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_rhrp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/ibd_rk11/.gitignore b/tools/tcl/ibd_rk11/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_rk11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/ibd_rl11/.gitignore b/tools/tcl/ibd_rl11/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_rl11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/ibd_tm11/.gitignore b/tools/tcl/ibd_tm11/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/ibd_tm11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rbbram/.gitignore b/tools/tcl/rbbram/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rbbram/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rbemon/.gitignore b/tools/tcl/rbemon/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rbemon/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rbmoni/.gitignore b/tools/tcl/rbmoni/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rbmoni/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rbs3hio/.gitignore b/tools/tcl/rbs3hio/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rbs3hio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rbsysmon/.gitignore b/tools/tcl/rbsysmon/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rbsysmon/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rbtest/.gitignore b/tools/tcl/rbtest/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rbtest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rlink/.gitignore b/tools/tcl/rlink/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rlink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rutil/.gitignore b/tools/tcl/rutil/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rutil/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rw11/.gitignore b/tools/tcl/rw11/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rw11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/rw11util/.gitignore b/tools/tcl/rw11util/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/rw11util/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/tst_rlink/.gitignore b/tools/tcl/tst_rlink/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/tst_rlink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl diff --git a/tools/tcl/tst_sram/.gitignore b/tools/tcl/tst_sram/.gitignore deleted file mode 100644 index fc959ab2..00000000 --- a/tools/tcl/tst_sram/.gitignore +++ /dev/null @@ -1 +0,0 @@ -pkgIndex.tcl