Skip to content

Commit

Permalink
Merge branch 'main' into cpp17
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith committed Aug 18, 2023
2 parents 3984e61 + cbc81a3 commit 3cdbe13
Show file tree
Hide file tree
Showing 1,041 changed files with 210,728 additions and 210,716 deletions.
108 changes: 108 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# prevent git from changing line endings for conan recipes and CMake files,
# since they are hashed to produce a conan recipe revision ID
conanfile.py text eol=lf
CMakeLists.txt text eol=lf
*.cmake text eol=lf
*.in text eol=lf

# Modern tools on Windows can handle Linux LF
# See https://stackoverflow.com/a/13154031/8877 for details
* text=auto eol=lf
.git?* text

# Leave known Windows-only text files as CR/LF
*.sln text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf

# Text file formats
*.txt text eol=lf
*.md text eol=lf
*.tex text eol=lf
*.?ml text eol=lf
*.kmz binary

# Programming languages
*.htm? text eol=lf
*.css text eol=lf
*.c text eol=lf
*.cc text eol=lf
*.c?? text eol=lf
*.c??m text eol=lf
*.ccm text eol=lf
*.C text eol=lf
*.h?? text eol=lf
*.h text eol=lf
*.hh text eol=lf
*.ixx text eol=lf
*.mpp text eol=lf
*.py text eol=lf
*.pyc binary
# .f and .f90
*.f* text eol=lf
*.m text eol=lf
*.java text eol=lf
*.cs text eol=lf
*.vb text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.pl text eol=lf
*.sh text eol=lf
*.csh text eol=lf

######################
# Known binary files

# from various unit_test/ directories
*.dat binary
*.*hdr binary
*.flat binary
*.sig binary
*.bin binary

# images
*.bmp binary
*.ico binary
*.tiff binary
*.tif binary
*.gif binary
*.jpg binary
*.jpeg binary
*.png binary
# SVG images are XML
*.svg text eol=lf
*.raw binary
*.hei* binary

# music
*.mp3 binary
*.m4a binary
*.wav binary
*.wma binary

# video
*.m4v binary
*.avi binary
*.wmv binary
*.mkv binary

# documents
*.pdf binary
*.dvi binary
*.doc* binary
*.xls* binary
*.ppt* binary

*.h5 binary
*.sio binary
*.ntf binary
*.nitf binary
*.si?d binary

# containers
*.zip binary
*.gz binary
*.tar binary
*.tgz binary
*.jar binary
102 changes: 102 additions & 0 deletions externals/coda-oss/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,105 @@ conanfile.py text eol=lf
CMakeLists.txt text eol=lf
*.cmake text eol=lf
*.in text eol=lf

# Modern tools on Windows can handle Linux LF
# See https://stackoverflow.com/a/13154031/8877 for details
* text=auto eol=lf
.git?* text

# Leave known Windows-only text files as CR/LF
*.sln text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf

# Text file formats
*.txt text eol=lf
*.md text eol=lf
*.tex text eol=lf
*.?ml text eol=lf
*.kmz binary

# Programming languages
*.htm? text eol=lf
*.css text eol=lf
*.c text eol=lf
*.cc text eol=lf
*.c?? text eol=lf
*.c??m text eol=lf
*.ccm text eol=lf
*.C text eol=lf
*.h?? text eol=lf
*.h text eol=lf
*.hh text eol=lf
*.ixx text eol=lf
*.mpp text eol=lf
*.py text eol=lf
*.pyc binary
# .f and .f90
*.f* text eol=lf
*.m text eol=lf
*.java text eol=lf
*.cs text eol=lf
*.vb text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.pl text eol=lf
*.sh text eol=lf
*.csh text eol=lf

######################
# Known binary files

# from various unit_test/ directories
*.dat binary
*.*hdr binary
*.flat binary
*.sig binary
*.bin binary

# images
*.bmp binary
*.ico binary
*.tiff binary
*.tif binary
*.gif binary
*.jpg binary
*.jpeg binary
*.png binary
# SVG images are XML
*.svg text eol=lf
*.raw binary
*.hei* binary

# music
*.mp3 binary
*.m4a binary
*.wav binary
*.wma binary

# video
*.m4v binary
*.avi binary
*.wmv binary
*.mkv binary

# documents
*.pdf binary
*.dvi binary
*.doc* binary
*.xls* binary
*.ppt* binary

*.h5 binary
*.sio binary
*.ntf binary
*.nitf binary
*.si?d binary

# containers
*.zip binary
*.gz binary
*.tar binary
*.tgz binary
*.jar binary
110 changes: 55 additions & 55 deletions externals/coda-oss/.gitignore
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
*.swp
*~
*.pyc
__pycache__/

# Build artifacts
install/
install-*/
target/

# Conan
modules/drivers/**/build
test_package/build/

# CMake
_deps/
CMakeCache.txt
CMakeFiles/
*_config.h
Makefile
modules/**/Makefile
out/
CMakeSettings.json

# Waf
.waf-*
waf-*
.waf3-*
waf3-*
.lock-waf*
build/waf*/

# Eclipse
.project
.cproject

# Drivers
modules/drivers/fftw/fftw-2.1.*/
modules/drivers/jpeg/jpeg-9/
modules/drivers/jpeg/jpeg-9d/
modules/drivers/j2k/openjpeg/openjpeg-2.3.*_mod/
modules/drivers/pcre/pcre2-10.*/
modules/drivers/uuid/e2fsprogs-1.*-uuid/
modules/drivers/xml/xerces/xerces-c-*/
modules/drivers/zlib/zlib-1.2.*/

# VS
.vs/
project.sln
.depproj/
*.tlog
**/x64/
*.vcxproj.user

# Unit-tests
*.swp
*~
*.pyc
__pycache__/

# Build artifacts
install/
install-*/
target/

# Conan
modules/drivers/**/build
test_package/build/

# CMake
_deps/
CMakeCache.txt
CMakeFiles/
*_config.h
Makefile
modules/**/Makefile
out/
CMakeSettings.json

# Waf
.waf-*
waf-*
.waf3-*
waf3-*
.lock-waf*
build/waf*/

# Eclipse
.project
.cproject

# Drivers
modules/drivers/fftw/fftw-2.1.*/
modules/drivers/jpeg/jpeg-9/
modules/drivers/jpeg/jpeg-9d/
modules/drivers/j2k/openjpeg/openjpeg-2.3.*_mod/
modules/drivers/pcre/pcre2-10.*/
modules/drivers/uuid/e2fsprogs-1.*.*/
modules/drivers/xml/xerces/xerces-c-*/
modules/drivers/zlib/zlib-1.2.*/

# VS
.vs/
project.sln
.depproj/
*.tlog
**/x64/
*.vcxproj.user

# Unit-tests
TEST_*_TMP*.*
Loading

0 comments on commit 3cdbe13

Please sign in to comment.