Merge branch 'egil/gitignore' into ccase/r13b04_dev

* egil/gitignore:
  Ignore files generated when running/building tests
  Update .gitignore files

OTP-8411: egil/gitignore

2 files changed, 181 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 06d7e3a124..33649ed7f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,23 @@ autom4te.cache
 !/erts/preloaded/ebin/*.beam
 !/lib/*/test/*_SUITE_data/*.beam
 
+# Compiler derivatives
+#
+# Do not use too creative wildcards.
+# Those might ignore files that should not be ignored.
+
+i686-pc-linux-gnu
+x86_64-unknown-linux-gnu
+i386-apple-darwin[0-9]*.[0-9]*.[0-9]*
+sparc-sun-solaris[0-9]*.[0-9]*
+i386-pc-solaris[0-9]*.[0-9]*
+i386-unknown-freebsd[0-9]*.[0-9]*
+tile-tilera-linux-gnu
+powerpc-unknown-linux-gnu
+
+# Mac OS X
+a.out.dSYM/
+
 # Anchored from $ERL_TOP
 /bin
 /config.log
@@ -26,6 +43,7 @@ autom4te.cache
 /bootstrap/lib/sasl
 /bootstrap/lib/snmp
 /bootstrap/lib/syntax_tools
+/bootstrap/lib/test_server
 /bootstrap/lib/wx
 
 /Makefile
@@ -33,6 +51,10 @@ autom4te.cache
 
 /release
 
+
+# Created by "out_build update_primary"
+/bootstrap/primary_compiler/
+
 # General patterns for applications in lib.
 #
 # Assume that all test/Emakefiles are generated.
@@ -45,6 +67,16 @@ autom4te.cache
 
 /lib/*/test/Emakefile
 
+/lib/*/SKIP
+
+/lib/*/doc/html/*.html
+/lib/*/doc/html/*.gif
+/lib/*/doc/html/*.eix
+/lib/*/doc/man[0-9]/*.[0-9]
+/lib/*/doc/pdf/*.fo
+/lib/*/doc/pdf/*.pdf
+
+
 /lib/configure
 /lib/config.log
 /lib/config.status
@@ -57,11 +89,27 @@ autom4te.cache
 /lib/*/config.log
 /lib/*/config.status
 
+#
+# Files generated when building/running tests (especially if
+# a directory in $ERL_TOP/release/tests has been symlinked to
+# a test directory in lib).
+#
+
+/lib/*/test/*_SUITE_make.erl
+/lib/*/test/*_SUITE_data/Makefile
+/erts/emulator/test/*_SUITE_make.erl
+/erts/emulator/test/*_SUITE_data/Makefile
+
+# asn1
+
+/lib/asn1/doc/src/asn1_spec.xml
+
 # common_test
 
 /lib/common_test/priv/install.sh
 
 # compiler
+
 /lib/compiler/src/beam_opcodes.erl
 /lib/compiler/src/beam_opcodes.hrl
 /lib/compiler/src/core_parse.erl
@@ -70,19 +118,37 @@ autom4te.cache
 /lib/compiler/test/*_no_opt_SUITE.erl
 /lib/compiler/test/*_post_opt_SUITE.erl
 
+# debugger
+
+/lib/debugger/doc/html/images/*.gif
+
 # edoc
 
 /lib/edoc/priv/edoc_generate
+/lib/edoc/src/edoc_parser.erl
+
+# erts
+
+/erts/info
+/erts/doc/html/*.html
+/erts/doc/html/*.gif
+/erts/doc/html/*.eix
+/erts/doc/pdf/*.fo
+/erts/doc/pdf/*.pdf
+/erts/doc/man[0-9]/*.[0-9]
 
 # gs
 
 /lib/gs/src/gstk_generic.hrl
 /lib/gs/contribs/ebin/*.gif
 /lib/gs/contribs/ebin/*.tool
+/lib/gs/doc/html/images/*.gif
+/lib/gs/tcl/win32/Makefile
 
 # hipe
 
 /lib/hipe/main/hipe.hrl
+/lib/hipe/rtl/hipe_literals.hrl
 
 # ic
 
@@ -95,11 +161,13 @@ autom4te.cache
 /lib/ic/priv/com/
 /lib/ic/priv/ic.jar
 /lib/ic/src/icparse.erl
+/lib/ic/doc/html/java
 
 # jinterface
 
 /lib/jinterface/priv/OtpErlang.jar
 /lib/jinterface/priv/com/
+/lib/jinterface/doc/html/java
 
 # kernel
 
@@ -143,6 +211,10 @@ autom4te.cache
 /lib/ssl/pkix/OTP-PKIX.hrl
 /lib/ssl/pkix/ssl_pkix_oid.erl
 
+# stdlib
+
+/lib/stdlib/src/erl_parse.erl
+
 # snmp
 
 /lib/snmp/bin/snmp-v2tov1
@@ -152,11 +224,33 @@ autom4te.cache
 /lib/snmp/src/compile/snmpc_mib_gram.erl
 /lib/snmp/include/[A-Z]*.hrl
 /lib/snmp/priv/mibs/[A-Z]*.bin
+/lib/snmp/test/snmp_test_data/[A-Z]*.bin
+/lib/snmp/test/snmp_test_data/[A-Z]*.hrl
+
+# system
+
+/system/doc/pdf/*.pdf
+/system/doc/pdf/*.fo
+/system/doc/html/*/*.html
+/system/doc/html/*/*.gif
+/system/doc/html/*/*.eix
+/system/doc/programming_examples/funs.xml
+/system/doc/tutorial/c_port.xml
+/system/doc/tutorial/c_portdriver.xml
+/system/doc/tutorial/cnode.xml
+/system/doc/tutorial/erl_interface.xml
+/system/doc/tutorial/example.xml
 
 # test_server
+
 /lib/test_server/src/configure
 
+# tools
+
+/lib/tools/src/xref_parser.erl
+
 # wx
+
 /lib/wx/c_src/Makefile
 /lib/wx/config.mk
 /lib/wx/api_gen/wx_xml/*
@@ -164,6 +258,8 @@ autom4te.cache
 /lib/wx/api_gen/??_doxygen
 /lib/wx/api_gen/??xml_generated
 /lib/wx/wx-*.ez
+/lib/wx/CONF_INFO
+/lib/wx/doc/src/wx*.xml
 
 # xmerl
 
diff --git a/lib/.gitignore b/lib/.gitignore
index 0cb938ea7c..fc8a1c5568 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,3 +1,31 @@
+# common test
+
+/common_test/doc/src/ct.xml
+/common_test/doc/src/ct_cover.xml
+/common_test/doc/src/ct_ftp.xml
+/common_test/doc/src/ct_master.xml
+/common_test/doc/src/ct_rpc.xml
+/common_test/doc/src/ct_snmp.xml
+/common_test/doc/src/ct_ssh.xml
+/common_test/doc/src/ct_telnet.xml
+/common_test/doc/src/unix_telnet.xml
+
+# edoc
+
+/edoc/doc/src/chapter.xml
+/edoc/doc/src/edoc.xml
+/edoc/doc/src/edoc_doclet.xml
+/edoc/doc/src/edoc_extract.xml
+/edoc/doc/src/edoc_layout.xml
+/edoc/doc/src/edoc_lib.xml
+/edoc/doc/src/edoc_run.xml
+
+# eunit
+
+/eunit/doc/src/chapter.xml
+/eunit/doc/src/eunit.xml
+/eunit/doc/src/eunit_surefire.xml
+
 # erl_interface
 
 /erl_interface/bin
@@ -5,6 +33,15 @@
 /erl_interface/obj.st
 /erl_interface/obj
 
+# gs
+
+/gs/doc/src/gs_chapter2.xml
+/gs/doc/src/gs_chapter4.xml
+/gs/doc/src/gs_chapter5.xml
+/gs/doc/src/gs_chapter6.xml
+/gs/doc/src/gs_chapter7.xml
+/gs/doc/src/gs_chapter8.xml
+
 # megaco
 
 /megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.erl
@@ -92,6 +129,16 @@
 /megaco/src/text/megaco_text_parser_v2.erl
 /megaco/src/text/megaco_text_parser_v3.erl
 
+# mnesia
+
+/mnesia/doc/src/Mnesia_App_B.xml
+/mnesia/doc/src/Mnesia_App_C.xml
+/mnesia/doc/src/Mnesia_App_D.xml
+/mnesia/doc/src/Mnesia_chap2.xml
+/mnesia/doc/src/Mnesia_chap4.xml
+/mnesia/doc/src/Mnesia_chap5.xml
+/mnesia/doc/src/Mnesia_chap7.xml
+
 # orber & cos* applications
 
 /cosEvent/include/CosEventChannelAdmin.hrl
@@ -469,3 +516,41 @@
 /orber/src/oe_OrberIFR.hrl
 /orber/src/oe_erlang.erl
 /orber/src/oe_erlang.hrl
+
+# percept
+
+/percept/doc/src/egd.xml
+/percept/doc/src/egd_ug.xml
+/percept/doc/src/percept.xml
+/percept/doc/src/percept_profile.xml
+/percept/doc/src/percept_ug.xml
+
+# syntax_tools
+
+/syntax_tools/doc/src/chapter.xml
+/syntax_tools/doc/src/epp_dodger.xml
+/syntax_tools/doc/src/erl_comment_scan.xml
+/syntax_tools/doc/src/erl_prettypr.xml
+/syntax_tools/doc/src/erl_recomment.xml
+/syntax_tools/doc/src/erl_syntax.xml
+/syntax_tools/doc/src/erl_syntax_lib.xml
+/syntax_tools/doc/src/erl_tidy.xml
+/syntax_tools/doc/src/igor.xml
+/syntax_tools/doc/src/prettypr.xml
+
+# wx
+
+/wx/doc/src/chapter.xml
+/wx/doc/src/gl.xml
+/wx/doc/src/glu.xml
+/wx/doc/src/ref_man.xml
+
+# xmerl
+
+/xmerl/doc/src/xmerl.xml
+/xmerl/doc/src/xmerl_eventp.xml
+/xmerl/doc/src/xmerl_scan.xml
+/xmerl/doc/src/xmerl_ug.xml
+/xmerl/doc/src/xmerl_xpath.xml
+/xmerl/doc/src/xmerl_xs.xml
+/xmerl/doc/src/xmerl_xsd.xml