From ad330a44bfa39430cf6340cb52971568cccdf1d6 Mon Sep 17 00:00:00 2001 From: "Felipe \\\"Zimmerle\\\" Costa" Date: Wed, 4 Dec 2013 16:16:28 -0200 Subject: [PATCH] iis: Avoids directory link while building Build scripts was creating links allowing the project to be loaded into Visual Studio without care about the dependencies versions. Sometimes windows refuse to delete those links leading the script to fail. This patch moves the sources directories instead of create links to it. --- iis/dependencies/build_curl.bat | 72 +++++++++++++-------------- iis/dependencies/build_libxml2.bat | 70 +++++++++++++-------------- iis/dependencies/build_lua.bat | 78 +++++++++++++++--------------- iis/dependencies/build_pcre.bat | 64 ++++++++++++------------ iis/dependencies/build_zlib.bat | 68 +++++++++++++------------- 5 files changed, 176 insertions(+), 176 deletions(-) diff --git a/iis/dependencies/build_curl.bat b/iis/dependencies/build_curl.bat index 7b5d3b8e..f9d98fe1 100644 --- a/iis/dependencies/build_curl.bat +++ b/iis/dependencies/build_curl.bat @@ -1,36 +1,36 @@ -cd "%WORK_DIR%" - -@if NOT EXIST "%SOURCE_DIR%\%CURL%" goto file_not_found_bin - -7z.exe x "%SOURCE_DIR%\%CURL%" - -set CURL_DIR=%CURL:~0,-4% - -mklink /D "curl" "%CURL_DIR%" - -copy /y CMakeLists.txt "%CURL_DIR%" -CD "%CURL_DIR%" -CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -:: "%WORK_DIR%\fart.exe" -r -C "%WORK_DIR%\%CURL_DIR%\include\curl\curlbuild.h" LLU ULL -NMAKE -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -cd "%WORK_DIR%" - -copy /y "%WORK_DIR%\%CURL_DIR%\lib\libcurl.dll" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%CURL_DIR%\lib\libcurl.pdb" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%CURL_DIR%\lib\libcurl_imp.lib" "%OUTPUT_DIR%" - -exit /B 0 - -:file_not_found_bin -@echo File not found: "%SOURCE_DIR%\%CURL%" -@goto failed - -:build_failed -@echo Problems during the building phase -@goto failed - -:failed -@exit /B 1 - +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%CURL%" goto file_not_found_bin + +7z.exe x "%SOURCE_DIR%\%CURL%" + +set CURL_DIR=%CURL:~0,-4% + +move "%CURL_DIR%" "curl" + +:: copy /y CMakeLists.txt "curl" +CD "curl" +CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +:: "%WORK_DIR%\fart.exe" -r -C "%WORK_DIR%\curl\include\curl\curlbuild.h" LLU ULL +NMAKE +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +cd "%WORK_DIR%" + +copy /y "%WORK_DIR%\curl\lib\libcurl.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\curl\lib\libcurl.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\curl\lib\libcurl_imp.lib" "%OUTPUT_DIR%" + +exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%CURL%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_libxml2.bat b/iis/dependencies/build_libxml2.bat index a4b14736..f2581d89 100644 --- a/iis/dependencies/build_libxml2.bat +++ b/iis/dependencies/build_libxml2.bat @@ -1,35 +1,35 @@ -cd "%WORK_DIR%" - -@if NOT EXIST "%SOURCE_DIR%\%LIBXML2%" goto file_not_found_bin - -@7z.exe x "%SOURCE_DIR%\%LIBXML2%" -so | 7z.exe x -aoa -si -ttar - -set LIBXML2_DIR=%LIBXML2:~0,-7% - -mklink /D "libxml2" "%LIBXML2_DIR%" - -:: fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " " -cd "%LIBXML2_DIR%\win32" -CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -NMAKE -f Makefile.msvc -@if NOT (%ERRORLEVEL%) == (0) goto build_failed - -cd "%WORK%" - -copy /y "%WORK_DIR%\%LIBXML2_DIR%\win32\bin.msvc\libxml2.dll" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%LIBXML2_DIR%\win32\bin.msvc\libxml2.lib" "%OUTPUT_DIR%" - -@exit /B 0 - -:file_not_found_bin -@echo File not found: "%SOURCE_DIR%\%LIBXML2%" -@goto failed - -:build_failed -@echo Problems during the building phase -@goto failed - -:failed -@exit /B 1 - +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%LIBXML2%" goto file_not_found_bin + +@7z.exe x "%SOURCE_DIR%\%LIBXML2%" -so | 7z.exe x -aoa -si -ttar + +set LIBXML2_DIR=%LIBXML2:~0,-7% + +move "%LIBXML2_DIR%" "libxml2" + +:: fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " " +cd "libxml2\win32" +CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +NMAKE -f Makefile.msvc +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +cd "%WORK%" + +copy /y "%WORK_DIR%\libxml2\win32\bin.msvc\libxml2.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\libxml2\win32\bin.msvc\libxml2.lib" "%OUTPUT_DIR%" + +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%LIBXML2%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_lua.bat b/iis/dependencies/build_lua.bat index 79b05b6f..dda0e4d0 100644 --- a/iis/dependencies/build_lua.bat +++ b/iis/dependencies/build_lua.bat @@ -1,39 +1,39 @@ -cd "%WORK_DIR%" - -@if NOT EXIST "%SOURCE_DIR%\%LUA%" goto file_not_found_bin - -@7z.exe x "%SOURCE_DIR%\%LUA%" -so | 7z.exe x -aoa -si -ttar - -set LUA_DIR=%LUA:~0,-7% - -mklink /D "lua" "%LUA_DIR%" - -cd "%LUA_DIR%\src" - -CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -DEL lua.obj luac.obj -LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -IF EXIST lua5.1.dll.manifest MT -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2 -@if NOT (%ERRORLEVEL%) == (0) goto build_failed - -cd "%WORK_DIR%" - -copy /y "%WORK_DIR%\%LUA_DIR%\src\lua5.1.dll" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%LUA_DIR%\src\lua5.1.pdb" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%LUA_DIR%\src\lua5.1.lib" "%OUTPUT_DIR%" - -@exit /B 0 - -:file_not_found_bin -@echo File not found: "%SOURCE_DIR%\%LUA%" -@goto failed - -:build_failed -@echo Problems during the building phase -@goto failed - -:failed -@exit /B 1 - +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%LUA%" goto file_not_found_bin + +@7z.exe x "%SOURCE_DIR%\%LUA%" -so | 7z.exe x -aoa -si -ttar + +set LUA_DIR=%LUA:~0,-7% + +move "%LUA_DIR%" "lua" + +cd "lua\src" + +CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +DEL lua.obj luac.obj +LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +IF EXIST lua5.1.dll.manifest MT -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2 +@if NOT (%ERRORLEVEL%) == (0) goto build_failed + +cd "%WORK_DIR%" + +copy /y "%WORK_DIR%\lua\src\lua5.1.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\lua\src\lua5.1.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\lua\src\lua5.1.lib" "%OUTPUT_DIR%" + +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%LUA%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 + diff --git a/iis/dependencies/build_pcre.bat b/iis/dependencies/build_pcre.bat index 55ef3832..9d728a40 100644 --- a/iis/dependencies/build_pcre.bat +++ b/iis/dependencies/build_pcre.bat @@ -1,32 +1,32 @@ -cd "%WORK_DIR%" - -@if NOT EXIST "%SOURCE_DIR%\%APACHE_BIN%" goto file_not_found_bin - -7z.exe x "%SOURCE_DIR%\%PCRE%" -set PCRE_DIR=%PCRE:~0,-4% - -mklink /D "pcre" "%PCRE_DIR%" - -cd "%PCRE_DIR%" -CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -NMAKE -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -cd "%WORK%" - -copy /y "%WORK_DIR%\%PCRE_DIR%\pcre.dll" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%PCRE_DIR%\pcre.pdb" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%PCRE_DIR%\pcre.lib" "%OUTPUT_DIR%" -echo "a" -@exit /B 0 - -:file_not_found_bin -@echo File not found: "%SOURCE_DIR%\%PCRE%" -@goto failed - -:build_failed -@echo Problems during the building phase -@goto failed - -:failed -@exit /B 1 +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%APACHE_BIN%" goto file_not_found_bin + +7z.exe x "%SOURCE_DIR%\%PCRE%" +set PCRE_DIR=%PCRE:~0,-4% + +move "%PCRE_DIR%" "pcre" + +cd "pcre" +CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +NMAKE +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +cd "%WORK%" + +copy /y "%WORK_DIR%\pcre\pcre.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\pcre\pcre.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\pcre\pcre.lib" "%OUTPUT_DIR%" +echo "a" +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%PCRE%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1 diff --git a/iis/dependencies/build_zlib.bat b/iis/dependencies/build_zlib.bat index 22a8aa0a..af0281a6 100644 --- a/iis/dependencies/build_zlib.bat +++ b/iis/dependencies/build_zlib.bat @@ -1,34 +1,34 @@ -cd "%WORK_DIR%" - -@if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin - - -@7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar - -set ZLIB_DIR=%ZLIB:~0,-7% - -mklink /D "zlib" "%ZLIB_DIR%" - -cd "%ZLIB_DIR%" -nmake -f win32\Makefile.msc -@if NOT (%ERRORLEVEL%) == (0) goto build_failed -SET INCLUDE=%INCLUDE%;%WORK_DIR%\%ZLIB_DIR% -SET LIB=%LIB%;%WORK_DIR%\%ZLIB_DIR% -cd "%WORK_DIR%" - -copy /y "%WORK_DIR%\%ZLIB_DIR%\zlib1.dll" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%ZLIB_DIR%\zlib1.pdb" "%OUTPUT_DIR%" -copy /y "%WORK_DIR%\%ZLIB_DIR%\zdll.lib" "%OUTPUT_DIR%" - -@exit /B 0 - -:file_not_found_bin -@echo File not found: "%SOURCE_DIR%\%ZLIB%" -@goto failed - -:build_failed -@echo Problems during the building phase -@goto failed - -:failed -@exit /B 1 +cd "%WORK_DIR%" + +@if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin + + +@7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar + +set ZLIB_DIR=%ZLIB:~0,-7% + +move "%ZLIB_DIR%" "zlib" + +cd "zlib" +nmake -f win32\Makefile.msc +@if NOT (%ERRORLEVEL%) == (0) goto build_failed +SET INCLUDE=%INCLUDE%;%WORK_DIR%\zlib +SET LIB=%LIB%;%WORK_DIR%\zlib +cd "%WORK_DIR%" + +copy /y "%WORK_DIR%\zlib\zlib1.dll" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\zlib\zlib1.pdb" "%OUTPUT_DIR%" +copy /y "%WORK_DIR%\zlib\zdll.lib" "%OUTPUT_DIR%" + +@exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%ZLIB%" +@goto failed + +:build_failed +@echo Problems during the building phase +@goto failed + +:failed +@exit /B 1