Skip to content

Commit 43feefe

Browse files
committed
All: corr. crlf
1 parent abc981f commit 43feefe

File tree

10 files changed

+113
-111
lines changed

10 files changed

+113
-111
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* text=auto
2+
13
*.h text
24
*.hxx text
35
*.hpp text

Cassiopee/Envs/env_Cassiopee_win32

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Ceci est l'environement pour compiler Cassiopee sous mingw32
2-
# Pour bien installer
3-
# - Installer Python, numpy, scons (Windows version)
4-
# - Faire une commande scons : python /c/Python27/Scripts/scons.py
5-
6-
export CASSIOPEE="d:\Documents and Settings/gleize/Mes documents/Cassiopee"
7-
export PATH=$PATH:/c/Python27:/c/Python27/Scripts
8-
export PATH=$PATH:"$CASSIOPEE/emacs-23.1/bin"
9-
export PATH=$PATH:"$CASSIOPEE/Dist/bin/x86":"$CASSIOPEE/Dist/bin/x86/Lib"
10-
export ELSAPROD=x86
11-
export LIBRARY_PATH=/c/Python27
12-
export PYTHONPATH=$PYTHONPATH:/c/Python27/Scripts:"$CASSIOPEE/Dist/bin/$ELSAPROD/Lib/site-packages"
13-
# python /c/Python27/Scripts/scons.py
14-
# python setupScons.py install --prefix="$CASSIOPEE/Dist/bin"
1+
# Ceci est l'environement pour compiler Cassiopee sous mingw32
2+
# Pour bien installer
3+
# - Installer Python, numpy, scons (Windows version)
4+
# - Faire une commande scons : python /c/Python27/Scripts/scons.py
5+
6+
export CASSIOPEE="d:\Documents and Settings/gleize/Mes documents/Cassiopee"
7+
export PATH=$PATH:/c/Python27:/c/Python27/Scripts
8+
export PATH=$PATH:"$CASSIOPEE/emacs-23.1/bin"
9+
export PATH=$PATH:"$CASSIOPEE/Dist/bin/x86":"$CASSIOPEE/Dist/bin/x86/Lib"
10+
export ELSAPROD=x86
11+
export LIBRARY_PATH=/c/Python27
12+
export PYTHONPATH=$PYTHONPATH:/c/Python27/Scripts:"$CASSIOPEE/Dist/bin/$ELSAPROD/Lib/site-packages"
13+
# python /c/Python27/Scripts/scons.py
14+
# python setupScons.py install --prefix="$CASSIOPEE/Dist/bin"
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
set CASSIOPEE=D:\Documents and Settings\gleize\Mes documents\Cassiopee
2-
path = %PATH%;%CASSIOPEE%\emacs-23.1\bin
3-
path = %PATH%;C:\Python27;C:\Python27\Scripts
4-
path = %PATH%;%CASSIOPEE%\Dist\bin\x86;%CASSIOPEE%\Dist\bin\x86\Lib;%CASSIOPEE%\Dist\bin\x86\Lib\site-packages
5-
set ELSAPROD=x86
1+
set CASSIOPEE=D:\Documents and Settings\gleize\Mes documents\Cassiopee
2+
path = %PATH%;%CASSIOPEE%\emacs-23.1\bin
3+
path = %PATH%;C:\Python27;C:\Python27\Scripts
4+
path = %PATH%;%CASSIOPEE%\Dist\bin\x86;%CASSIOPEE%\Dist\bin\x86\Lib;%CASSIOPEE%\Dist\bin\x86\Lib\site-packages
5+
set ELSAPROD=x86
66
set PYTHONPATH=C:\Python27\Scripts;%CASSIOPEE%\Dist\bin\%ELSAPROD%\Lib\site-packages

Cassiopee/Envs/env_Cassiopee_win64

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Ceci est l'environement pour compiler Cassiopee sous mingw64
2-
# Pour bien installer
3-
# - Installer Python, numpy, scons (Windows version)
4-
# - Faire une commande scons : python /c/Python27/Scripts/scons.py
5-
export CASSIOPEE="c:\Users/Administrateur/Cassiopee"
6-
export PATH=$PATH:/c/Python27:/c/Python27/Scripts
7-
export PATH=$PATH:"/c/emacs-23.1/bin"
8-
export PATH=$PATH:"/c/TDM-GCC-64/bin"
9-
export PATH=$PATH:"$CASSIOPEE/Dist/bin/win64":"$CASSIOPEE/Dist/bin/win64/lib":"$CASSIOPEE/Dist/bin/win64/lib/site-packages"
10-
export ELSAPROD=win64
11-
export LIBRARY_PATH=/c/Python27
12-
export PYTHONPATH=$PYTHONPATH:/c/Python27/Scripts:"$CASSIOPEE/Dist/bin/$ELSAPROD/lib/site-packages"
13-
# python /c/Python27/Scripts/scons.py
14-
# python setupScons.py install --prefix="$CASSIOPEE/Dist/bin"
1+
# Ceci est l'environement pour compiler Cassiopee sous mingw64
2+
# Pour bien installer
3+
# - Installer Python, numpy, scons (Windows version)
4+
# - Faire une commande scons : python /c/Python27/Scripts/scons.py
5+
export CASSIOPEE="c:\Users/Administrateur/Cassiopee"
6+
export PATH=$PATH:/c/Python27:/c/Python27/Scripts
7+
export PATH=$PATH:"/c/emacs-23.1/bin"
8+
export PATH=$PATH:"/c/TDM-GCC-64/bin"
9+
export PATH=$PATH:"$CASSIOPEE/Dist/bin/win64":"$CASSIOPEE/Dist/bin/win64/lib":"$CASSIOPEE/Dist/bin/win64/lib/site-packages"
10+
export ELSAPROD=win64
11+
export LIBRARY_PATH=/c/Python27
12+
export PYTHONPATH=$PYTHONPATH:/c/Python27/Scripts:"$CASSIOPEE/Dist/bin/$ELSAPROD/lib/site-packages"
13+
# python /c/Python27/Scripts/scons.py
14+
# python setupScons.py install --prefix="$CASSIOPEE/Dist/bin"
+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
set CASSIOPEE=C:\Users\Administrateur\Cassiopee
2-
path = %PATH;"C:\emacs-23.1\bin"
3-
path = %PATH;C:\Python27;C:\Python27\Scripts
4-
5-
path = %PATH;C:\TDM-GCC-64\bin
6-
path = %PATH;%CASSIOPEE\Dist\bin\win64;%CASSIOPEE\Dist\bin\win64\lib;%CASSIOPEE\Dist\bin\win64\lib\site-packages
7-
set ELSAPROD=win64
8-
set PYTHONPATH=%PYTHONPATH;C:\Python27\Scripts;%CASSIOPEE\Dist\bin\$ELSAPROD\lib\site-packages
1+
set CASSIOPEE=C:\Users\Administrateur\Cassiopee
2+
path = %PATH;"C:\emacs-23.1\bin"
3+
path = %PATH;C:\Python27;C:\Python27\Scripts
4+
5+
path = %PATH;C:\TDM-GCC-64\bin
6+
path = %PATH;%CASSIOPEE\Dist\bin\win64;%CASSIOPEE\Dist\bin\win64\lib;%CASSIOPEE\Dist\bin\win64\lib\site-packages
7+
set ELSAPROD=win64
8+
set PYTHONPATH=%PYTHONPATH;C:\Python27\Scripts;%CASSIOPEE\Dist\bin\$ELSAPROD\lib\site-packages
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@echo off
2-
python -m cython --cleanup 3 -w src -I include %* mpi4py.MPI.pyx
1+
@echo off
2+
python -m cython --cleanup 3 -w src -I include %* mpi4py.MPI.pyx
33
move src\mpi4py.MPI*.h src\include\mpi4py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REM Generate the JNI header file from the Java code for JPortAudio
2-
REM by Phil Burk
3-
4-
javah -classpath ../jportaudio/bin -d ../c/src com.portaudio.PortAudio com.portaudio.BlockingStream
1+
REM Generate the JNI header file from the Java code for JPortAudio
2+
REM by Phil Burk
3+
4+
javah -classpath ../jportaudio/bin -d ../c/src com.portaudio.PortAudio com.portaudio.BlockingStream
+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
rem Use Astyle to fix style in 'C' files
2-
cd %1%
3-
4-
fixlines -p *.c
5-
fixlines -p *.cpp
6-
fixlines -p *.cc
7-
8-
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.c
9-
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.cpp
10-
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.cc
11-
del *.orig
12-
@rem convert line terminators to Unix style LFs
13-
fixlines -u *.c
14-
fixlines -u *.cpp
15-
fixlines -u *.cc
16-
fixlines -u *.h
17-
del *.bak
18-
19-
cd ..\
1+
rem Use Astyle to fix style in 'C' files
2+
cd %1%
3+
4+
fixlines -p *.c
5+
fixlines -p *.cpp
6+
fixlines -p *.cc
7+
8+
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.c
9+
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.cpp
10+
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor *.cc
11+
del *.orig
12+
@rem convert line terminators to Unix style LFs
13+
fixlines -u *.c
14+
fixlines -u *.cpp
15+
fixlines -u *.cc
16+
fixlines -u *.h
17+
del *.bak
18+
19+
cd ..\
+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
rem Use Astyle to fix style in a file
2-
fixlines -p %1%
3-
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor %1%
4-
del %1%.orig
5-
@rem convert line terminators to Unix style LFs
6-
fixlines -u %1%
7-
del %1%.bak
1+
rem Use Astyle to fix style in a file
2+
fixlines -p %1%
3+
astyle --style=ansi -c -o --convert-tabs --indent-preprocessor %1%
4+
del %1%.orig
5+
@rem convert line terminators to Unix style LFs
6+
fixlines -u %1%
7+
del %1%.bak
+38-38
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
@REM Copyright (c) 2001 - 2019 The SCons Foundation
2-
@REM src/script/scons.bat a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan
3-
@echo off
4-
set SCONS_ERRORLEVEL=
5-
if "%OS%" == "Windows_NT" goto WinNT
6-
7-
@REM for 9x/Me you better not have more than 9 args
8-
python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-3.0.5'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.0.5'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
9-
@REM no way to set exit status of this script for 9x/Me
10-
goto endscons
11-
12-
@REM Credit where credit is due: we return the exit code despite our
13-
@REM use of setlocal+endlocal using a technique from Bear's Journal:
14-
@REM http://code-bear.com/bearlog/2007/06/01/getting-the-exit-code-from-a-batch-file-that-is-run-from-a-python-program/
15-
16-
:WinNT
17-
setlocal
18-
@REM ensure the script will be executed with the Python it was installed for
19-
pushd %~dp0..
20-
set path=%~dp0;%CD%;%path%
21-
popd
22-
@REM try the script named as the .bat file in current dir, then in Scripts subdir
23-
set scriptname=%~dp0%~n0.py
24-
if not exist "%scriptname%" set scriptname=%~dp0Scripts\%~n0.py
25-
@REM Handle when running from wheel where the script has no .py extension
26-
if not exist "%scriptname%" set scriptname=%~dp0%~n0
27-
python "%scriptname%" %*
28-
endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%
29-
30-
if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto returncode
31-
if errorlevel 9009 echo you do not have python in your PATH
32-
goto endscons
33-
34-
:returncode
35-
exit /B %SCONS_ERRORLEVEL%
36-
37-
:endscons
38-
call :returncode %SCONS_ERRORLEVEL%
1+
@REM Copyright (c) 2001 - 2019 The SCons Foundation
2+
@REM src/script/scons.bat a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan
3+
@echo off
4+
set SCONS_ERRORLEVEL=
5+
if "%OS%" == "Windows_NT" goto WinNT
6+
7+
@REM for 9x/Me you better not have more than 9 args
8+
python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-3.0.5'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.0.5'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
9+
@REM no way to set exit status of this script for 9x/Me
10+
goto endscons
11+
12+
@REM Credit where credit is due: we return the exit code despite our
13+
@REM use of setlocal+endlocal using a technique from Bear's Journal:
14+
@REM http://code-bear.com/bearlog/2007/06/01/getting-the-exit-code-from-a-batch-file-that-is-run-from-a-python-program/
15+
16+
:WinNT
17+
setlocal
18+
@REM ensure the script will be executed with the Python it was installed for
19+
pushd %~dp0..
20+
set path=%~dp0;%CD%;%path%
21+
popd
22+
@REM try the script named as the .bat file in current dir, then in Scripts subdir
23+
set scriptname=%~dp0%~n0.py
24+
if not exist "%scriptname%" set scriptname=%~dp0Scripts\%~n0.py
25+
@REM Handle when running from wheel where the script has no .py extension
26+
if not exist "%scriptname%" set scriptname=%~dp0%~n0
27+
python "%scriptname%" %*
28+
endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%
29+
30+
if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto returncode
31+
if errorlevel 9009 echo you do not have python in your PATH
32+
goto endscons
33+
34+
:returncode
35+
exit /B %SCONS_ERRORLEVEL%
36+
37+
:endscons
38+
call :returncode %SCONS_ERRORLEVEL%

0 commit comments

Comments
 (0)