Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ocaml/.gitattributes

179 lines
7.4 KiB
Plaintext
Raw Normal View History

Update headers for the new license. Remains to be done: remove all headers in testsuite/tests.
2016-02-18 07:11:59 -08:00
#**************************************************************************
#* *
#* OCaml *
#* *
#* Damien Doligez, projet Gallium, INRIA *
#* *
#* Copyright 2015 Institut National de Recherche en Informatique et *
#* en Automatique. *
#* *
#* All rights reserved. This file is distributed under the terms of *
#* the GNU Lesser General Public License version 2.1, with the *
#* special exception on linking described in the file LICENSE. *
#* *
#**************************************************************************
Update .gitattributes for improved Windows support Explicitly state which files should always be checked out with LF endings (shell scripts, especially).
2015-12-12 05:33:31 -08:00
# Default behaviour, for if core.autocrlf isn't set
* text=auto
# Binary files
tweak ocaml-typo in .gitattributes
2016-04-19 05:57:43 -07:00
/boot/ocamlc binary
/boot/ocamllex binary
/boot/ocamldep binary
Handle binary files correctly in tools/check-typo I'm not familiar enough with Subversion to know how properties work there, but the translation for detecting binary files to git using attributes is incorrect. Checking for the binary attribute with check-attr only detects if the file has been *specified* as binary. Script altered to use a "well-known" plumbing command to detect whether git regards a particular file as binary. This takes into account .gitattributes, but also works if the file has been automatically detected as binary by git.
2015-12-12 15:59:39 -08:00
*.gif binary
*.png binary
*.tfm binary
update tools/check-typo to work with git attributes instead of svn properties
2015-11-03 08:32:50 -08:00
use 'text' as merge driver for .mailmap
2017-02-24 17:56:34 -08:00
# 'union' merge driver just unions textual content in case of conflict
# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
/.mailmap merge=union
.gitattributes: disable the 'union' merge driver for Changes (#1277)
2017-08-09 04:58:40 -07:00
# We tried using 'union' for Changes and it did not work:
# instead of creating Changes conflict it would silently duplicate
# the lines involved in the conflict, which is arguably worse
#/Changes merge=union
use 'text' as merge driver for .mailmap
2017-02-24 17:56:34 -08:00
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
# No header for text files (would be too obtrusive).
*.md ocaml-typo=missing-header
README* ocaml-typo=missing-header
*.adoc ocaml-typo=missing-header,long-line,unused-prop
tweak ocaml-typo in .gitattributes
2016-04-19 05:57:43 -07:00
/.mailmap ocaml-typo=long-line,missing-header,non-ascii
/.merlin ocaml-typo=missing-header
/Changes ocaml-typo=non-ascii,missing-header
/INSTALL ocaml-typo=missing-header
fix whitespace, long lines, headers
2016-08-01 07:06:59 -07:00
/LICENSE ocaml-typo=long-line,very-long-line,missing-header
Move AppVeyor commands to a script Gets rid of all the silly escaping requirements of appveyor.yml and allows a certain level of refactoring. Most functionality is moved to appveyor_build.sh with appveyor_build.cmd setting things up.
2017-09-29 07:02:42 -07:00
# appveyor_build.cmd only has missing-header because dra27 too lazy to update
# check-typo to interpret Cmd-style comments!
/appveyor_build.cmd ocaml-typo=long-line,very-long-line,missing-header
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
update tools/check-typo to work with git attributes instead of svn properties
2015-11-03 08:32:50 -08:00
simplify .gitignore; remove .ignore files and tools/setignore; adjust tools/check-typo
2015-11-06 07:25:05 -08:00
asmcomp/*/emit.mlp ocaml-typo=tab,long-line,unused-prop
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
asmcomp/power/NOTES.md ocaml-typo=missing-header,long-line
update tools/check-typo to work with git attributes instead of svn properties
2015-11-03 08:32:50 -08:00
asmrun/i386.S ocaml-typo=long-line
config/gnu ocaml-typo=prune
simplify .gitignore; remove .ignore files and tools/setignore; adjust tools/check-typo
2015-11-06 07:25:05 -08:00
emacs/*.el ocaml-typo=long-line,unused-prop
Follow Emacs Lisp conventions for caml.el (#1346) * Reformat header of caml.el to follow Emacs Lisp package conventions This is important to make sure the package keeps being distributed in MELPA. See https://github.com/melpa/melpa/issues/5002 * Update .gitattributes for caml.el
2017-09-29 00:13:00 -07:00
emacs/caml.el ocaml-typo=long-line,unused-prop,missing-header
update tools/check-typo to work with git attributes instead of svn properties
2015-11-03 08:32:50 -08:00
emacs/COPYING ocaml-typo=tab,non-printing,missing-header
emacs/ocamltags.in ocaml-typo=non-printing
experimental ocaml-typo=prune
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
manual ocaml-typo=prune
update tools/check-typo to work with git attributes instead of svn properties
2015-11-03 08:32:50 -08:00
ocamlbuild/* ocaml-typo=long-line
ocamlbuild/AUTHORS ocaml-typo=missing-header
ocamlbuild/ChangeLog ocaml-typo=tab,missing-header
ocamlbuild/TODO ocaml-typo=missing-header
ocamldoc/Changes.txt ocaml-typo=missing-header
ocamldoc/ocamldoc.sty ocaml-typo=missing-header
Update .gitattributes for improved Windows support Explicitly state which files should always be checked out with LF endings (shell scripts, especially).
2015-12-12 05:33:31 -08:00
Support Unix.readlink on Windows
2015-07-28 06:26:16 -07:00
otherlibs/win32unix/readlink.c ocaml-typo=long-line
otherlibs/win32unix/stat.c ocaml-typo=long-line
Add Unix.has_symlink
2015-07-28 15:43:20 -07:00
otherlibs/win32unix/symlink.c ocaml-typo=long-line
Support symbolic links in Win32 Unix.stat
2015-07-27 05:21:21 -07:00
fix whitespace, long lines, headers
2016-08-01 07:06:59 -07:00
stdlib/hashbang ocaml-typo=white-at-eol,missing-lf
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
tweak ocaml-typo in .gitattributes
2016-04-19 05:57:43 -07:00
testsuite/tests/** ocaml-typo=missing-header
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
testsuite/tests/lib-bigarray-2/bigarrf.f ocaml-typo=missing-header,tab
testsuite/tests/misc-unsafe/almabench.ml ocaml-typo=missing-header,long-line
Update headers for the new license. Remains to be done: remove all headers in testsuite/tests.
2016-02-18 07:11:59 -08:00
testsuite/typing ocaml-typo=missing-header
clean up whitespace and cut long lines
2016-02-16 04:23:31 -08:00
tools/magic ocaml-typo=missing-header
yacc/*.[ch] ocaml-typo=long-line,very-long-line,unused-prop
Update .gitattributes for improved Windows support Explicitly state which files should always be checked out with LF endings (shell scripts, especially).
2015-12-12 05:33:31 -08:00
# Line-ending specifications, for Windows interoperability
*.sh text eol=lf
*.sh.in text eol=lf
*.awk text eol=lf
Fix test-suite custom scripts on Windows .precheck, .runner and .checker files are part of scripts and need to have LF line-endings.
2015-12-22 05:40:17 -08:00
# Test suite command fragments
*.checker text eol=lf
*.precheck text eol=lf
*.runner text eol=lf
Update .gitattributes for improved Windows support Explicitly state which files should always be checked out with LF endings (shell scripts, especially).
2015-12-12 05:33:31 -08:00
configure text eol=lf
config/auto-aux/hasgot text eol=lf
config/auto-aux/hasgot2 text eol=lf
config/auto-aux/runtest text eol=lf
config/auto-aux/searchpath text eol=lf
config/auto-aux/solaris-ld text eol=lf
config/auto-aux/tryassemble text eol=lf
config/auto-aux/trycompile text eol=lf
config/gnu/config.guess text eol=lf
config/gnu/config.sub text eol=lf
ocamldoc/remove_DEBUG text eol=lf
ocamltest: the test driver for the OCaml compiler This commit contains: - The initial version of the tool itself, in the ocamltest directory - The required additions to the main .gitignore and .merlin files. The integration of ocamltest in OCaml's main build system and its use in the testsuite are not part of this commit. Credits go to David Allsopp for - Extending the computation of ocamlsrcdir to the Windows case - Making ocamltest compile when flexlink is being bootstrapped.
2017-07-21 07:43:36 -07:00
ocamltest/getocamloptdefaultflags text eol=lf
Update .gitattributes for improved Windows support Explicitly state which files should always be checked out with LF endings (shell scripts, especially).
2015-12-12 05:33:31 -08:00
stdlib/Compflags text eol=lf
stdlib/sharpbang text eol=lf
tools/check-typo text eol=lf
tools/ci-build text eol=lf
tools/msvs-promote-path script Script intended to make the compilation instructions for the Microsoft Visual C++ Compiler ports a little simpler. This script allows the user to start Cygwin from the appropriate Visual Studio Command Prompt (e.g. by issuing `C:\cygwin\bin\mintty -`) and then, from the OCaml sources directory, issue ```bash eval `tools/msvs-promote-path` ``` This script emits an error if the Microsoft Linker cannot be found in any of the directories in `PATH` or if the `link` command already refers to the Microsoft Linker. If, as will usually be the default, `link` refers to the coreutils `link` command, `PATH` is altered to move the first entry containing the Microsoft Linker to the start of `PATH`. This has the effect of overriding the Unix interpretation of the `link` command, but this will never affect OCaml's build process. This script is taken from msvs-tools (https://github.com/metastack/msvs-tools) and re-licensed by the copyright holder.
2015-12-23 05:57:10 -08:00
tools/msvs-promote-path text eol=lf
Update .gitattributes for improved Windows support Explicitly state which files should always be checked out with LF endings (shell scripts, especially).
2015-12-12 05:33:31 -08:00
tools/gdb-macros text eol=lf
tools/magic text eol=lf
tools/make-opcodes text eol=lf
tools/make-package-macosx text eol=lf
tools/ocaml-objcopy-macosx text eol=lf
tools/ocamlmktop.tpl text eol=lf
tools/ocamlsize text eol=lf
# These two are cat scripts, so may not actually require this
config/auto-aux/sharpbang text eol=lf
config/auto-aux/sharpbang2 text eol=lf
# Similarly, these are all Perl scripts, so may not actually require this
manual/tools/caml-tex text eol=lf
manual/tools/format-intf text eol=lf
manual/tools/htmlcut text eol=lf
manual/tools/htmltbl text eol=lf
manual/tools/htmlthread text eol=lf
manual/tools/texexpand text eol=lf
Fix parsing tests on Windows Testing the parsetree fails on Windows because the .ml files have `\r\n` endings. For these tests, simplest simply to ensure that they are checked out using LF endings, even on Windows.
2015-12-22 05:34:28 -08:00
\r testsuite issues on Windows
2017-08-11 02:43:11 -07:00
# Tests which include references spanning multiple lines fail with \r\n
# endings, so use \n endings only, even on Windows.
Fix parsing tests on Windows Testing the parsetree fails on Windows because the .ml files have `\r\n` endings. For these tests, simplest simply to ensure that they are checked out using LF endings, even on Windows.
2015-12-22 05:34:28 -08:00
testsuite/tests/parsing/*.ml text eol=lf
Use Unix line-endings for docstrings test
2016-09-02 02:01:22 -07:00
testsuite/tests/docstrings/empty.ml text eol=lf
Actually fix .gitattributes... (#1286)
2017-08-11 05:37:48 -07:00
testsuite/tests/functors/functors.ml text eol=lf
testsuite/tests/translprim/module_coercion.ml text eol=lf
Fix tests/warnings/w04.ml on Windows
2017-01-29 03:32:41 -08:00
testsuite/tests/warnings/w04.ml text eol=lf
Wallpaper over \r\n problem for Cygwin testsuite This allows the Cygwin testsuite to pass on a Windows (CRLF) checkout of the OCaml sources.
2017-04-01 06:20:35 -07:00
# These are forced to \n to allow the Cygwin testsuite to pass on a
# Windows-checkout
testsuite/tests/formatting/margins.ml text eol=lf
Fix Cygwin testsuite problems on \r\n checkout
2017-08-11 04:32:26 -07:00
testsuite/tests/lexing/uchar_esc.ml text eol=lf
Wallpaper over \r\n problem for Cygwin testsuite This allows the Cygwin testsuite to pass on a Windows (CRLF) checkout of the OCaml sources.
2017-04-01 06:20:35 -07:00
testsuite/tests/match-exception-warnings/exhaustiveness_warnings.ml text eol=lf
testsuite/tests/typing-extension-constructor/test.ml text eol=lf
testsuite/tests/typing-extensions/extensions.ml text eol=lf
testsuite/tests/typing-extensions/open_types.ml text eol=lf
testsuite/tests/typing-objects/Exemples.ml text eol=lf
testsuite/tests/typing-objects/pr5619_bad.ml text eol=lf
testsuite/tests/typing-objects/pr6123_bad.ml text eol=lf
testsuite/tests/typing-objects/pr6907_bad.ml text eol=lf
testsuite/tests/typing-objects/Tests.ml text eol=lf
testsuite/tests/typing-pattern_open/pattern_open.ml text eol=lf
testsuite/tests/typing-private/private.ml text eol=lf
testsuite/tests/typing-recordarg/recordarg.ml text eol=lf
testsuite/tests/typing-short-paths/pr5918.ml text eol=lf
testsuite/tests/typing-sigsubst/sigsubst.ml text eol=lf
testsuite/tests/typing-typeparam/newtype.ml text eol=lf
testsuite/tests/typing-unboxed/test.ml text eol=lf
testsuite/tests/typing-unboxed-types/test.ml text eol=lf
testsuite/tests/typing-warnings/ambiguous_guarded_disjunction.ml text eol=lf
Minor fix to Cygwin testsuite on CRLF-checkouts
2017-07-10 02:42:49 -07:00
testsuite/tests/typing-warnings/application.ml text eol=lf
Wallpaper over \r\n problem for Cygwin testsuite This allows the Cygwin testsuite to pass on a Windows (CRLF) checkout of the OCaml sources.
2017-04-01 06:20:35 -07:00
testsuite/tests/typing-warnings/coercions.ml text eol=lf
testsuite/tests/typing-warnings/exhaustiveness.ml text eol=lf
Fix Cygwin testsuite problems on \r\n checkout
2017-08-11 04:32:26 -07:00
testsuite/tests/typing-warnings/pr6587.ml text eol=lf
Wallpaper over \r\n problem for Cygwin testsuite This allows the Cygwin testsuite to pass on a Windows (CRLF) checkout of the OCaml sources.
2017-04-01 06:20:35 -07:00
testsuite/tests/typing-warnings/pr6872.ml text eol=lf
testsuite/tests/typing-warnings/pr7085.ml text eol=lf
testsuite/tests/typing-warnings/pr7115.ml text eol=lf
Fix Cygwin testsuite problems on \r\n checkout
2017-08-11 04:32:26 -07:00
testsuite/tests/typing-warnings/pr7261.ml text eol=lf
Minor fix to Cygwin testsuite on CRLF-checkouts
2017-07-10 02:42:49 -07:00
testsuite/tests/typing-warnings/pr7297.ml text eol=lf
Wallpaper over \r\n problem for Cygwin testsuite This allows the Cygwin testsuite to pass on a Windows (CRLF) checkout of the OCaml sources.
2017-04-01 06:20:35 -07:00
testsuite/tests/typing-warnings/records.ml text eol=lf
testsuite/tests/typing-warnings/unused_types.ml text eol=lf