diff options
author | Mike Frysinger <vapier@gentoo.org> | 2018-06-21 21:44:54 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2018-06-21 21:44:54 -0400 |
commit | aac77143ddeb561216d9fe63546d17a1d2156bae (patch) | |
tree | 37e53e5369364f319bc95e3ed708eb5a3266cd17 /windows | |
parent | c4ee95d1a403061707c17dcae0343ad059e08d2f (diff) | |
download | libgd-aac77143ddeb561216d9fe63546d17a1d2156bae.tar.gz |
convert all files to native line encodings
A bunch of these files were committed with Windows line encodings.
Strip all those ^M gremlins out as people working on Windows can
use git's autocrlf setting to convert back and forth as needed.
Diffstat (limited to 'windows')
-rw-r--r-- | windows/gentest.bat | 70 | ||||
-rw-r--r-- | windows/readme.md | 106 | ||||
-rw-r--r-- | windows/run_tests.bat | 86 |
3 files changed, 131 insertions, 131 deletions
diff --git a/windows/gentest.bat b/windows/gentest.bat index f57d08b..756e0f9 100644 --- a/windows/gentest.bat +++ b/windows/gentest.bat @@ -1,35 +1,35 @@ -SETLOCAL ENABLEDELAYEDEXPANSION
-@echo off
-set testsdir=%~1
-set builddir=%~2
-set CFLAGS=%~3
-set LDFLAGS=%~4
-set CC=%~5
-set LD=%~6
-set TESTMK=%~7
-set TESTLIST=%~8
-echo %*
-echo recieved !testsdir! !builddir! !CFLAGS! !LDFLAGS! !CC!
-
-copy NUL !TESTMK! > nul
-copy NUL !TESTLIST! > nul
-
-for /D %%d in (!testsdir!/*) do (
- if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
- echo TEST_EXES=!builddir!\tests\%%d_%%~nf.exe ^$^(TEST_EXES^) >> !TESTMK!
- )
-)
-
-for /D %%d in (!testsdir!/*) do (
- if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
- echo !builddir!\%%d_%%~nf.obj: !testsdir!\%%d\%%f; ^$^(CC^) ^$^(TEST_CFLAGS^) /c ^$** /Fd$*.pdb /Fo:$@ >> !TESTMK!
- )
-)
-
-for /D %%d in (!testsdir!/*) do (
- if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do (
- echo !builddir!\tests\%%d_%%~nf.exe: !builddir!\%%d_%%~nf.obj; !LD! !LDFLAGS! $** /out:$@ >> !TESTMK!
- echo %%d_%%~nf.exe >> !TESTLIST!
- )
-)
-ENDLOCAL
\ No newline at end of file +SETLOCAL ENABLEDELAYEDEXPANSION +@echo off +set testsdir=%~1 +set builddir=%~2 +set CFLAGS=%~3 +set LDFLAGS=%~4 +set CC=%~5 +set LD=%~6 +set TESTMK=%~7 +set TESTLIST=%~8 +echo %* +echo recieved !testsdir! !builddir! !CFLAGS! !LDFLAGS! !CC! + +copy NUL !TESTMK! > nul +copy NUL !TESTLIST! > nul + +for /D %%d in (!testsdir!/*) do ( + if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do ( + echo TEST_EXES=!builddir!\tests\%%d_%%~nf.exe ^$^(TEST_EXES^) >> !TESTMK! + ) +) + +for /D %%d in (!testsdir!/*) do ( + if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do ( + echo !builddir!\%%d_%%~nf.obj: !testsdir!\%%d\%%f; ^$^(CC^) ^$^(TEST_CFLAGS^) /c ^$** /Fd$*.pdb /Fo:$@ >> !TESTMK! + ) +) + +for /D %%d in (!testsdir!/*) do ( + if NOT "%%d"=="fontconfig" if NOT "%%d"=="gdtest" for %%f in (!testsdir!/%%d/*.c) do ( + echo !builddir!\tests\%%d_%%~nf.exe: !builddir!\%%d_%%~nf.obj; !LD! !LDFLAGS! $** /out:$@ >> !TESTMK! + echo %%d_%%~nf.exe >> !TESTLIST! + ) +) +ENDLOCAL diff --git a/windows/readme.md b/windows/readme.md index cd95b79..dce5202 100644 --- a/windows/readme.md +++ b/windows/readme.md @@ -1,53 +1,53 @@ -# Building on Windows with Visual Studio 2015
-
-* Get the required dependencies from
- http://windows.php.net/downloads/php-sdk/deps/vc14/ and
- http://windows.php.net/downloads/pecl/deps/, respectively. Choose the x86 or
- x64 packages depending on your needs.
-
- * freetype
- * libiconv
- * libjpeg
- * libpng
- * libtiff
- * libwebp
- * libxpm
- * zlib
-
-* Unpack all dependency packages into the same folder.
-
-* Open the VS2015 x86 or x64 Native Tools Command Prompt.
-
-* Set the environment variable `WITH_DEVEL` to the path where you have unpacked
- the dependencies. `WITH_DEVEL` defaults to `..\deps`.
-
-* If you want a debug build, do
-````
-set DEBUG=1
-````
-
-* `cd` into the libgd source folder.
-
-* To build the libraries, do:
-```
-nmake /f windows\Makefile.vc
-```
-
-* To build and run the tests, do:
-````
-nmake /f windows\Makefile.vc check
-````
-
-* To build the executable programs, do:
-````
-nmake /f windows\Makefile.vc build_progs
-````
-
-* After a successful build, you find the libraries and test executables in
- `..\gdbuild`. You can change the build folder by setting the environment
- variable `WITH_BUILD` to the desired path.
-
-* Before rebuilding, you may have to run:
-```
-nmake /f windows\Makefile.vc clean
-```
+# Building on Windows with Visual Studio 2015 + +* Get the required dependencies from + http://windows.php.net/downloads/php-sdk/deps/vc14/ and + http://windows.php.net/downloads/pecl/deps/, respectively. Choose the x86 or + x64 packages depending on your needs. + + * freetype + * libiconv + * libjpeg + * libpng + * libtiff + * libwebp + * libxpm + * zlib + +* Unpack all dependency packages into the same folder. + +* Open the VS2015 x86 or x64 Native Tools Command Prompt. + +* Set the environment variable `WITH_DEVEL` to the path where you have unpacked + the dependencies. `WITH_DEVEL` defaults to `..\deps`. + +* If you want a debug build, do +```` +set DEBUG=1 +```` + +* `cd` into the libgd source folder. + +* To build the libraries, do: +``` +nmake /f windows\Makefile.vc +``` + +* To build and run the tests, do: +```` +nmake /f windows\Makefile.vc check +```` + +* To build the executable programs, do: +```` +nmake /f windows\Makefile.vc build_progs +```` + +* After a successful build, you find the libraries and test executables in + `..\gdbuild`. You can change the build folder by setting the environment + variable `WITH_BUILD` to the desired path. + +* Before rebuilding, you may have to run: +``` +nmake /f windows\Makefile.vc clean +``` diff --git a/windows/run_tests.bat b/windows/run_tests.bat index bd73946..097d3b9 100644 --- a/windows/run_tests.bat +++ b/windows/run_tests.bat @@ -1,43 +1,43 @@ -@echo off
-setlocal EnableDelayedExpansion
-if [%PLATFORM%]==[] set PLATFORM=x86
-if [%PREFERREDTOOLARCHITECTURE%]==[x64] set PLATFORM=x64
-set PLATFORM=%PLATFORM:X=x%
-
-set total=0
-set total_passed=0
-set total_failed=0
-set total_missing=0
-
-for /f %%T in (testlist.txt) do (
- set test=%%T
- set output=test: !test!....................................................................
- set target=%%~nT.exe
- if not exist !target! SET result=NotFound
- call !target! && (SET result=Passed) || (SET result=Failed)
-
- rem > last_test.out 2> last_test.err
- rem set /p testerr=<last_test.err
- rem set /p testout=<last_test.out
-
- echo !output:~0,70!!result!
-
- rem if defined testerr echo error: !testerr!
- rem if defined testout echo msg: !testout!
-
- set /a total=total+1
- if "!result!"=="Passed" set /a total_passed=total_passed+1
- if "!result!"=="Failed" set /a total_failed=total_failed+1
- if "!result!"=="NotFound" set /a total_missing=total_missing+1
-
- if defined APPVEYOR (
- appveyor AddTest "!test! %PLATFORM%" -Outcome !result! -Framework Custom -Filename %%~nT.exe -Duration 0
- )
-)
-echo.
-echo Tests: !total!
-echo Passed: !total_passed!
-echo Failed: !total_failed!
-echo Missing: !total_missing!
-
-exit /b 0
\ No newline at end of file +@echo off +setlocal EnableDelayedExpansion +if [%PLATFORM%]==[] set PLATFORM=x86 +if [%PREFERREDTOOLARCHITECTURE%]==[x64] set PLATFORM=x64 +set PLATFORM=%PLATFORM:X=x% + +set total=0 +set total_passed=0 +set total_failed=0 +set total_missing=0 + +for /f %%T in (testlist.txt) do ( + set test=%%T + set output=test: !test!.................................................................... + set target=%%~nT.exe + if not exist !target! SET result=NotFound + call !target! && (SET result=Passed) || (SET result=Failed) + + rem > last_test.out 2> last_test.err + rem set /p testerr=<last_test.err + rem set /p testout=<last_test.out + + echo !output:~0,70!!result! + + rem if defined testerr echo error: !testerr! + rem if defined testout echo msg: !testout! + + set /a total=total+1 + if "!result!"=="Passed" set /a total_passed=total_passed+1 + if "!result!"=="Failed" set /a total_failed=total_failed+1 + if "!result!"=="NotFound" set /a total_missing=total_missing+1 + + if defined APPVEYOR ( + appveyor AddTest "!test! %PLATFORM%" -Outcome !result! -Framework Custom -Filename %%~nT.exe -Duration 0 + ) +) +echo. +echo Tests: !total! +echo Passed: !total_passed! +echo Failed: !total_failed! +echo Missing: !total_missing! + +exit /b 0 |