Skip to content

Commit c398685

Browse files
tardyptardyp
committed
restore git diff functionality
all aboutcode repositories have "* binary" in .gitattribute This has the side effet of disabling the git diff functionality from the commandline. git diff will always refuse to report diff and say the binary files differ problem is tests are requiring some of the dataset is kept as is, so we mark all the **/data/** as binary, as well as certain other files. Signed-off-by: Pierre Tardy <[email protected]>
1 parent 6c43e29 commit c398685

File tree

6 files changed

+127
-118
lines changed

6 files changed

+127
-118
lines changed

‎.dockerignore‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Ignore the Docker files themselves to avoid that all layers are invalidated if the Docker files are changed during development.
2-
.dockerignore
3-
Dockerfile
4-
5-
# Ignore the Git directory and files and github directory.
6-
.git/
7-
.github/
8-
.gitattributes
9-
.gitignore
10-
11-
# Ignore other directories that are not required in the image
12-
tests/
13-
docs/
1+
# Ignore the Docker files themselves to avoid that all layers are invalidated if the Docker files are changed during development.
2+
.dockerignore
3+
Dockerfile
4+
5+
# Ignore the Git directory and files and github directory.
6+
.git/
7+
.github/
8+
.gitattributes
9+
.gitignore
10+
11+
# Ignore other directories that are not required in the image
12+
tests/
13+
docs/
1414
samples/

‎.gitattributes‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
# Ignore all Git auto CR/LF line endings conversions
2-
* binary
1+
# make sure end of lines are always lf
2+
* text eol=lf
3+
*.bat text eol=crlf
4+
5+
# data in the tests should be kept as is
6+
**/data/** binary
7+
**/assets/** binary
8+
**/samples/** binary
9+
*.pyz binary
10+
11+
# *.json text eol=lf
312
# save the version details for git tarballs
413
.VERSION export-subst

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ pyvenv.cfg
8282
lib64
8383
tcl
8484
/.env
85-
86-
*.orig
85+
86+
*.orig
8787
/release*
8888
/00-*.txt
8989
/z-todo-licenses-*

‎docs/make.bat‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
@ECHO OFF
2-
3-
pushd %~dp0
4-
5-
REM Command file for Sphinx documentation
6-
7-
if "%SPHINXBUILD%" == "" (
8-
set SPHINXBUILD=sphinx-build
9-
)
10-
set SOURCEDIR=source
11-
set BUILDDIR=build
12-
13-
if "%1" == "" goto help
14-
15-
%SPHINXBUILD% >NUL 2>NUL
16-
if errorlevel 9009 (
17-
echo.
18-
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
19-
echo.installed, then set the SPHINXBUILD environment variable to point
20-
echo.to the full path of the 'sphinx-build' executable. Alternatively you
21-
echo.may add the Sphinx directory to PATH.
22-
echo.
23-
echo.If you don't have Sphinx installed, grab it from
24-
echo.http://sphinx-doc.org/
25-
exit /b 1
26-
)
27-
28-
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
29-
goto end
30-
31-
:help
32-
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
33-
34-
:end
35-
popd
1+
@ECHO OFF
2+
3+
pushd %~dp0
4+
5+
REM Command file for Sphinx documentation
6+
7+
if "%SPHINXBUILD%" == "" (
8+
set SPHINXBUILD=sphinx-build
9+
)
10+
set SOURCEDIR=source
11+
set BUILDDIR=build
12+
13+
if "%1" == "" goto help
14+
15+
%SPHINXBUILD% >NUL 2>NUL
16+
if errorlevel 9009 (
17+
echo.
18+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
19+
echo.installed, then set the SPHINXBUILD environment variable to point
20+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
21+
echo.may add the Sphinx directory to PATH.
22+
echo.
23+
echo.If you don't have Sphinx installed, grab it from
24+
echo.http://sphinx-doc.org/
25+
exit /b 1
26+
)
27+
28+
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
29+
goto end
30+
31+
:help
32+
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
33+
34+
:end
35+
popd

‎extractcode.bat‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
@echo OFF
2-
3-
@rem Copyright (c) nexB Inc. and others. All rights reserved.
4-
@rem SPDX-License-Identifier: Apache-2.0
5-
@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6-
@rem ScanCode is a trademark of nexB Inc.
7-
@rem See https://github.com/nexB/scancode-toolkit for support or download.
8-
@rem See https://aboutcode.org for more information about nexB OSS projects.
9-
10-
@rem A wrapper to ScanCode command line entry point
11-
12-
set SCANCODE_ROOT_DIR=%~dp0
13-
set SCANCODE_CONFIGURED_PYTHON=%SCANCODE_ROOT_DIR%Scripts\python.exe
14-
15-
if not exist "%SCANCODE_CONFIGURED_PYTHON%" goto configure
16-
goto scancode
17-
18-
:configure
19-
echo * Configuring ScanCode for first use...
20-
set CONFIGURE_QUIET=1
21-
call "%SCANCODE_ROOT_DIR%configure"
22-
23-
@rem Return a proper return code on failure
24-
if %errorlevel% neq 0 (
25-
exit /b %errorlevel%
26-
)
27-
28-
:scancode
29-
@rem without this things may not always work on Windows 10, but this makes things slower
30-
set PYTHONDONTWRITEBYTECODE=1
31-
32-
"%SCANCODE_ROOT_DIR%Scripts\extractcode" %*
1+
@echo OFF
2+
3+
@rem Copyright (c) nexB Inc. and others. All rights reserved.
4+
@rem SPDX-License-Identifier: Apache-2.0
5+
@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6+
@rem ScanCode is a trademark of nexB Inc.
7+
@rem See https://github.com/nexB/scancode-toolkit for support or download.
8+
@rem See https://aboutcode.org for more information about nexB OSS projects.
9+
10+
@rem A wrapper to ScanCode command line entry point
11+
12+
set SCANCODE_ROOT_DIR=%~dp0
13+
set SCANCODE_CONFIGURED_PYTHON=%SCANCODE_ROOT_DIR%Scripts\python.exe
14+
15+
if not exist "%SCANCODE_CONFIGURED_PYTHON%" goto configure
16+
goto scancode
17+
18+
:configure
19+
echo * Configuring ScanCode for first use...
20+
set CONFIGURE_QUIET=1
21+
call "%SCANCODE_ROOT_DIR%configure"
22+
23+
@rem Return a proper return code on failure
24+
if %errorlevel% neq 0 (
25+
exit /b %errorlevel%
26+
)
27+
28+
:scancode
29+
@rem without this things may not always work on Windows 10, but this makes things slower
30+
set PYTHONDONTWRITEBYTECODE=1
31+
32+
"%SCANCODE_ROOT_DIR%Scripts\extractcode" %*

‎scancode.bat‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
@echo OFF
2-
3-
@rem Copyright (c) nexB Inc. and others. All rights reserved.
4-
@rem SPDX-License-Identifier: Apache-2.0
5-
@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6-
@rem ScanCode is a trademark of nexB Inc.
7-
@rem See https://github.com/nexB/scancode-toolkit for support or download.
8-
@rem See https://aboutcode.org for more information about nexB OSS projects.
9-
10-
@rem A wrapper to ScanCode command line entry point
11-
12-
set SCANCODE_ROOT_DIR=%~dp0
13-
set SCANCODE_CONFIGURED_PYTHON=%SCANCODE_ROOT_DIR%Scripts\python.exe
14-
15-
if not exist "%SCANCODE_CONFIGURED_PYTHON%" goto configure
16-
goto scancode
17-
18-
:configure
19-
echo * Configuring ScanCode for first use...
20-
echo * WARNING: Native Windows will be deprecated in the future in favor of Windows Subsystem for Linux
21-
echo * WARNING: Please visit https://github.com/nexB/scancode-toolkit/issues/2366 for details and to provide feedback
22-
set CONFIGURE_QUIET=1
23-
call "%SCANCODE_ROOT_DIR%configure"
24-
25-
@rem Return a proper return code on failure
26-
if %errorlevel% neq 0 (
27-
exit /b %errorlevel%
28-
)
29-
30-
:scancode
31-
@rem without this things may not always work on Windows 10, but this makes things slower
32-
set PYTHONDONTWRITEBYTECODE=1
33-
34-
"%SCANCODE_ROOT_DIR%Scripts\scancode" %*
1+
@echo OFF
2+
3+
@rem Copyright (c) nexB Inc. and others. All rights reserved.
4+
@rem SPDX-License-Identifier: Apache-2.0
5+
@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
6+
@rem ScanCode is a trademark of nexB Inc.
7+
@rem See https://github.com/nexB/scancode-toolkit for support or download.
8+
@rem See https://aboutcode.org for more information about nexB OSS projects.
9+
10+
@rem A wrapper to ScanCode command line entry point
11+
12+
set SCANCODE_ROOT_DIR=%~dp0
13+
set SCANCODE_CONFIGURED_PYTHON=%SCANCODE_ROOT_DIR%Scripts\python.exe
14+
15+
if not exist "%SCANCODE_CONFIGURED_PYTHON%" goto configure
16+
goto scancode
17+
18+
:configure
19+
echo * Configuring ScanCode for first use...
20+
echo * WARNING: Native Windows will be deprecated in the future in favor of Windows Subsystem for Linux
21+
echo * WARNING: Please visit https://github.com/nexB/scancode-toolkit/issues/2366 for details and to provide feedback
22+
set CONFIGURE_QUIET=1
23+
call "%SCANCODE_ROOT_DIR%configure"
24+
25+
@rem Return a proper return code on failure
26+
if %errorlevel% neq 0 (
27+
exit /b %errorlevel%
28+
)
29+
30+
:scancode
31+
@rem without this things may not always work on Windows 10, but this makes things slower
32+
set PYTHONDONTWRITEBYTECODE=1
33+
34+
"%SCANCODE_ROOT_DIR%Scripts\scancode" %*

0 commit comments

Comments
 (0)