1 files changed, 247 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 0207d07dfe..33649ed7f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,41 @@
 # Match at any level.
 *~
 autom4te.cache
+*.beam
+*.asn1db
+
+!/bootstrap/lib/compiler/ebin/*.beam
+!/bootstrap/lib/kernel/ebin/*.beam
+!/bootstrap/lib/stdlib/ebin/*.beam
+!/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
+/config.status
 
-/lib/*/ebin
+/bootstrap/bin/*
+!/bootstrap/bin/*.script
+!/bootstrap/bin/*.boot
 
-/bootstrap/bin
 /bootstrap/lib/asn1
 /bootstrap/lib/hipe
 /bootstrap/lib/ic
@@ -15,9 +43,226 @@ autom4te.cache
 /bootstrap/lib/sasl
 /bootstrap/lib/snmp
 /bootstrap/lib/syntax_tools
+/bootstrap/lib/test_server
 /bootstrap/lib/wx
 
 /Makefile
 /configure
 
 /release
+
+
+# Created by "out_build update_primary"
+/bootstrap/primary_compiler/
+
+# General patterns for applications in lib.
+#
+# Assume that all test/Emakefiles are generated.
+#
+# Any application with a checked-in test/Emakefile should
+# use a negative pattern in its own .gitignore.
+
+/lib/*/ebin/*.app
+/lib/*/ebin/*.appup
+
+/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
+
+#
+# Files generated by configure.
+#
+
+/lib/*/configure
+/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
+
+/lib/compiler/test/*_r11_SUITE.erl
+/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
+
+/lib/ic/examples/pre_post_condition/m.hrl
+/lib/ic/examples/pre_post_condition/m_i.erl
+/lib/ic/examples/pre_post_condition/m_i.hrl
+/lib/ic/examples/pre_post_condition/m_NotAnInteger.erl
+/lib/ic/examples/pre_post_condition/oe_ex.erl
+/lib/ic/examples/pre_post_condition/oe_ex.hrl
+/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
+
+/lib/kernel/src/inet_dns_record_adts.hrl
+
+# otp_mibs
+
+/lib/otp_mibs/include/[A-Z]*.hrl
+/lib/otp_mibs/mibs/v1/OTP*.mib.v1
+/lib/otp_mibs/priv/mibs/OTP*.bin
+
+# os_mon
+
+/lib/os_mon/include/[A-Z]*.hrl
+/lib/os_mon/mibs/v1/OTP*.mib.v1
+/lib/os_mon/priv/mibs/OTP*.bin
+
+# public_key
+
+/lib/public_key/asn1/*.asn1db
+/lib/public_key/asn1/*.erl
+/lib/public_key/asn1/*.hrl
+/lib/public_key/include/OTP-PUB-KEY.hrl
+
+# ssh
+
+/lib/ssh/src/*.asn1db
+/lib/ssh/src/DSS.erl
+/lib/ssh/src/DSS.hrl
+/lib/ssh/src/PKCS-1.erl
+/lib/ssh/src/PKCS-1.hrl
+
+# ssl
+
+/lib/ssl/pkix/*.asn1db
+/lib/ssl/examples/certs/done
+/lib/ssl/examples/certs/ebin/make_certs.beam
+/lib/ssl/examples/certs/etc/
+/lib/ssl/include/OTP-PKIX.hrl
+/lib/ssl/pkix/OTP-PKIX.erl
+/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
+/lib/snmp/examples/ex1/EX1-MIB.bin
+/lib/snmp/mibs/Makefile
+/lib/snmp/mibs/v1/OTP-SNMPEA-MIB.mib.v1
+/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/*
+/lib/wx/api_gen/gl_xml/*
+/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
+
+/lib/xmerl/src/xmerl_sax_parser_*.erl
+/lib/xmerl/src/xmerl_b64Bin.erl
+/lib/xmerl/src/xmerl_xpath_parse.erl