diff options
| author | Sverker Eriksson <[email protected]> | 2017-08-30 20:55:08 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-08-30 20:55:08 +0200 |
| commit | 7c67bbddb53c364086f66260701bc54a61c9659c (patch) | |
| tree | 92ab0d4b91d5e2f6e7a3f9d61ea25089e8a71fe0 /.gitignore | |
| parent | 97dc5e7f396129222419811c173edc7fa767b0f8 (diff) | |
| parent | 3b7a6ffddc819bf305353a593904cea9e932e7dc (diff) | |
| download | otp-7c67bbddb53c364086f66260701bc54a61c9659c.tar.gz otp-7c67bbddb53c364086f66260701bc54a61c9659c.tar.bz2 otp-7c67bbddb53c364086f66260701bc54a61c9659c.zip | |
Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 52 |
1 files changed, 41 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 7ccedd3ff3..3fc95170aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ # emacs *~ +lib/tools/emacs/*.elc +TAGS # vim .*.sw[a-z] @@ -35,6 +37,8 @@ i386-pc-solaris[0-9]*.[0-9]* i386-unknown-freebsd[0-9]*.[0-9]* tile-tilera-linux-gnu powerpc-unknown-linux-gnu +i386-elf-ose +powerpc-unknown-ose # Mac OS X a.out.dSYM/ @@ -96,6 +100,11 @@ lib/wx/c_src/win32/ lib/wx/priv/win32/ lib/wx/win32/ make/win32/ +make/otp_built +make/otp_doc_built + +# OSE +*.d # Used by ic & orber & cos* applications. IDL-GENERATED @@ -114,6 +123,8 @@ JAVADOC-GENERATED /bootstrap/lib/asn1 /bootstrap/lib/common_test +/bootstrap/lib/edoc +/bootstrap/lib/erl_docgen /bootstrap/lib/hipe /bootstrap/lib/ic /bootstrap/lib/orber @@ -150,6 +161,7 @@ JAVADOC-GENERATED /erts/epmd/test/Emakefile /lib/*/SKIP +/lib/SKIP-APPLICATIONS /lib/*/doc/html/*.html /lib/*/doc/html/*.css @@ -171,11 +183,35 @@ JAVADOC-GENERATED # Files generated by configure. # -/lib/*/configure /lib/*/config.log /lib/*/config.status # +# Files generated by "./otp_build autoconf" +# + +/lib/*/configure +/lib/common_test/test_server/configure +/lib/configure.in +/aclocal.m4 +/lib/common_test/priv/auxdir/config.guess +/lib/common_test/priv/auxdir/config.sub +/lib/common_test/priv/auxdir/install-sh +/lib/erl_interface/aclocal.m4 +/lib/erl_interface/src/auxdir/config.guess +/lib/erl_interface/src/auxdir/config.sub +/lib/erl_interface/src/auxdir/install-sh +/lib/megaco/aclocal.m4 +/lib/odbc/aclocal.m4 +/lib/common_test/test_server/config.guess +/lib/common_test/test_server/config.sub +/lib/common_test/test_server/install-sh +/lib/wx/aclocal.m4 +/lib/wx/autoconf/config.guess +/lib/wx/autoconf/config.sub +/lib/wx/autoconf/install-sh + +# # Files generated when building/running tests (especially if # a directory in $ERL_TOP/release/tests has been symlinked to # a test directory in lib). @@ -198,6 +234,7 @@ JAVADOC-GENERATED # common_test +/lib/common_test/doc/src/ct_property_test.xml /lib/common_test/doc/src/ct_slave.xml /lib/common_test/priv/install.sh @@ -324,15 +361,8 @@ JAVADOC-GENERATED # system -/system/doc/pdf/*.pdf -/system/doc/pdf/*.fo -/system/doc/html/*.html -/system/doc/html/*.eix -/system/doc/html/js -/system/doc/html/*/*.html -/system/doc/html/*/*.gif -/system/doc/html/*/*.jpg -/system/doc/html/*/*.eix +/system/doc/pdf +/system/doc/html /system/doc/top/PR.template /system/doc/top/erlresolvelinks.js /system/doc/programming_examples/funs.xml @@ -347,6 +377,7 @@ JAVADOC-GENERATED /system/doc/installation_guide/INSTALL.xml /system/doc/installation_guide/INSTALL-CROSS.xml /system/doc/installation_guide/INSTALL-WIN32.xml +/system/doc/installation_guide/OTP-PATCH-APPLY.xml /system/doc/installation_guide/MARKDOWN.xml # test_server @@ -378,4 +409,3 @@ JAVADOC-GENERATED /lib/xmerl/src/xmerl_xpath_parse.erl /lib/xmerl/test/xmerl_test.erl /lib/erl_interface/config.h.in -/lib/configure.in |