Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1447766

Browse files
author
Felipe \\\"Zimmerle\\\" Costa
committed
iis: Renamves winbuild to dependencies
Since the directory becomes all about dependenciesthere is no need to call it winbuild anymore.
1 parent9f8cbf6 commit1447766

File tree

10 files changed

+82
-82
lines changed

10 files changed

+82
-82
lines changed

‎iis/build_dependencies.bat‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
:: Use full paths.
33

44
:: General paths
5-
@setWORK_DIR=%cd%\winbuild\build_dir
6-
@setOUTPUT_DIR=%cd%\winbuild\release_files
5+
@setWORK_DIR=%cd%\dependencies\build_dir
6+
@setOUTPUT_DIR=%cd%\dependencies\release_files
77
@setSOURCE_DIR=%USERPROFILE%\Downloads
88

99
:: Aditional paths.
@@ -41,33 +41,33 @@ if EXIST "%OUTPUT_DIR%" @rmdir /s /q "%OUTPUT_DIR%"
4141

4242
@echo Starting with the depdendencies...
4343
@echo # Apache -%HTTPD%/%APACHE24_ZIP%
44-
@callwinbuild/build_apache.bat
44+
@calldependencies/build_apache.bat
4545
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_apache
4646
@cd"%CURRENT_DIR%"
4747
echo"c"
4848
@echo # pcre. -%PCRE%
49-
@callwinbuild/build_pcre.bat
49+
@calldependencies/build_pcre.bat
5050
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_pcre
5151
@cd"%CURRENT_DIR%"
5252
echo"b"
5353

5454
@echo # zlib -%ZLIB%
55-
@callwinbuild/build_zlib.bat
55+
@calldependencies/build_zlib.bat
5656
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_zlib
5757
@cd"%CURRENT_DIR%"
5858

5959
@echo # libxml2 -%LIBXML2%
60-
@callwinbuild/build_libxml2.bat
60+
@calldependencies/build_libxml2.bat
6161
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_libxml2
6262
@cd"%CURRENT_DIR%"
6363

6464
@echo # lua -%LUA%
65-
@callwinbuild/build_lua.bat
65+
@calldependencies/build_lua.bat
6666
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_lua
6767
@cd"%CURRENT_DIR%"
6868

6969
@echo # curl -%CURL%
70-
@callwinbuild/build_curl.bat
70+
@calldependencies/build_curl.bat
7171
@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_curl
7272
@cd"%CURRENT_DIR%"
7373

File renamed without changes.

‎iis/winbuild/build_curl.bat‎renamed to ‎iis/dependencies/build_curl.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ set CURL_DIR=%CURL:~0,-4%
88

99
copy /y CMakeLists.txt"%CURL_DIR%"
1010
CD"%CURL_DIR%"
11-
CMAKE -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True
11+
CMAKE -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True
1212
"%WORK_DIR%\fart.exe" -r -C"%WORK_DIR%\%CURL_DIR%\include\curl\curlbuild.h" LLU ULL
13-
NMAKE
14-
13+
NMAKE
14+
1515
cd"%WORK_DIR%"
1616

1717
copy /y"%WORK_DIR%\%CURL_DIR%\lib\libcurl.dll""%OUTPUT_DIR%"

‎iis/winbuild/build_libxml2.bat‎renamed to ‎iis/dependencies/build_libxml2.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ set LIBXML2_DIR=%LIBXML2:~0,-7%
88

99
fart.exe -r -i -C"%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98""
1010
cd"%LIBXML2_DIR%\win32"
11-
CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes
12-
NMAKE -f Makefile.msvc
13-
11+
CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes
12+
NMAKE -f Makefile.msvc
13+
1414
cd"%WORK%"
1515

1616
copy /y"%WORK_DIR%\%LIBXML2_DIR%\win32\bin.msvc\libxml2.dll""%OUTPUT_DIR%"

‎iis/winbuild/build_lua.bat‎renamed to ‎iis/dependencies/build_lua.bat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ set LUA_DIR=%LUA:~0,-7%
88

99
cd"%LUA_DIR%\src"
1010

11-
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
12-
DEL lua.obj luac.obj
13-
LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj
14-
IFEXIST lua5.1.dll.manifest MT -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2
15-
11+
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
12+
DEL lua.obj luac.obj
13+
LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj
14+
IFEXIST lua5.1.dll.manifest MT -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2
15+
1616
cd"%WORK_DIR%"
1717

1818
copy /y"%WORK_DIR%\%LUA_DIR%\src\lua5.1.dll""%OUTPUT_DIR%"
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
cd%WORK%
2-
CD mod_security\apache2
3-
del *.obj *.dll *.lib
4-
NMAKE -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% LIBXML2=%WORK%\%LIBXML2% LUA=%WORK%\%LUA%\src VERSION=VERSION_IIS
5-
cd ..\mlogc
6-
copy /y%WORK%\Makefile.win .
7-
nmake -f Makefile.win clean
8-
nmake -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% CURL=%WORK%\%CURL% VERSION=VERSION_IIS
9-
cd ..\iis
10-
nmake -f Makefile.win clean
11-
NMAKE -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% LIBXML2=%WORK%\%LIBXML2% LUA=%WORK%\%LUA%\src VERSION=VERSION_IIS
12-
cd%WORK%
13-
14-
copy /y%WORK%\mod_security\mlogc\mlogc.exe%DROP%
15-
copy /y%WORK%\mod_security\iis\modsecurityiis.dll%DROP%
16-
copy /y%WORK%\mod_security\iis\modsecurityiis.pdb%DROP%
1+
cd%WORK%
2+
CD mod_security\apache2
3+
del *.obj *.dll *.lib
4+
NMAKE -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% LIBXML2=%WORK%\%LIBXML2% LUA=%WORK%\%LUA%\src VERSION=VERSION_IIS
5+
cd ..\mlogc
6+
copy /y%WORK%\Makefile.win .
7+
nmake -f Makefile.win clean
8+
nmake -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% CURL=%WORK%\%CURL% VERSION=VERSION_IIS
9+
cd ..\iis
10+
nmake -f Makefile.win clean
11+
NMAKE -f Makefile.win APACHE=%APACHE% PCRE=%WORK%\%PCRE% LIBXML2=%WORK%\%LIBXML2% LUA=%WORK%\%LUA%\src VERSION=VERSION_IIS
12+
cd%WORK%
13+
14+
copy /y%WORK%\mod_security\mlogc\mlogc.exe%DROP%
15+
copy /y%WORK%\mod_security\iis\modsecurityiis.dll%DROP%
16+
copy /y%WORK%\mod_security\iis\modsecurityiis.pdb%DROP%

‎iis/winbuild/build_pcre.bat‎renamed to ‎iis/dependencies/build_pcre.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set PCRE_DIR=%PCRE:~0,-4%
77

88
cd"%PCRE_DIR%"
99
CMAKE -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True
10-
NMAKE
10+
NMAKE
1111
cd"%WORK%"
1212

1313
copy /y"%WORK_DIR%\%PCRE_DIR%\pcre.dll""%OUTPUT_DIR%"
@@ -19,6 +19,6 @@ echo "a"
1919
:file_not_found_bin
2020
@echo File not found:"%SOURCE_DIR%\%PCRE%"
2121
@goto failed
22-
22+
2323
:failed
2424
@exit /B1

‎iis/winbuild/build_zlib.bat‎renamed to ‎iis/dependencies/build_zlib.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd "%WORK_DIR%"
77
setZLIB_DIR=%ZLIB:~0,-7%
88

99
cd"%ZLIB_DIR%"
10-
nmake -f win32\Makefile.msc
10+
nmake -f win32\Makefile.msc
1111
SETINCLUDE=%INCLUDE%;%WORK_DIR%\%ZLIB_DIR%
1212
SETLIB=%LIB%;%WORK_DIR%\%ZLIB_DIR%
1313
cd"%WORK_DIR%"
File renamed without changes.
Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
WARNING!
2-
3-
Building ModSecurityIIS on Windows is a relatively complicated process. Understanding it requires advanced knowledge of Windows and Unix environments.
4-
Using the same versions of libraries as listed below is strongly recommended.
5-
6-
--------------------------------------
7-
Tested on:
8-
9-
Windows 7 x64
10-
Vistual Studio 2010 Ultimate SP1
11-
IIS enabled/installed
12-
13-
cmake 2.8.7
14-
curl 7.24.0
15-
apache 2.2.22 or apache 2.4.3
16-
libxml2 2.7.7
17-
lua 5.1.5
18-
pcre 8.30
19-
zlib 1.2.7
20-
7-Zip
21-
--------------------------------------
22-
23-
1. Create working directory c:\work and drop directory c:\drop
24-
2. Sync SVN ModSecurity branch to c:\work\mod_security
25-
3. Copy files from c:\work\mod_security\iis\winbuild to c:\work
26-
4. Download and install cmake (unpack to c:\work\cmake-2.8.7-win32-x86)
27-
5. Download and install 7-Zip
28-
6. Adjust paths in c:\work\init.bat accordingly if needed
29-
7. Download curl, apache, libxml2, lua, pcre and zlib, place them in zip files in c:\work
30-
31-
curl-7.24.0.zip
32-
httpd-2.2.22-win32-src.zip or (httpd-2.4.3.zip (source) and httpd-2.4.3-win32.zip + httpd-2.4.3-win64.zip (binaries))
33-
libxml2-2.7.7.zip
34-
lua-5.1.5.zip
35-
pcre-8.30.zip
36-
zlib-1.2.7.zip
37-
38-
Modify c:\work\build.bat accordingly (if other versions were used)
39-
40-
8. Open cmd.exe window, go to c:\work and run buildall.bat
41-
9. When done, the binaries, lib and pdb files should appear under c:\drop\x86 (32-bit) and c:\drop\amd64 (64-bit)
42-
10. Open the VS ModSecurity IIS installer project
43-
11. Copy new binaries to the installer's x86 and amd64 directories
44-
12. Build installer from within VS
1+
WARNING!
2+
3+
Building ModSecurityIIS on Windows is a relatively complicated process. Understanding it requires advanced knowledge of Windows and Unix environments.
4+
Using the same versions of libraries as listed below is strongly recommended.
5+
6+
--------------------------------------
7+
Tested on:
8+
9+
Windows 7 x64
10+
Vistual Studio 2010 Ultimate SP1
11+
IIS enabled/installed
12+
13+
cmake 2.8.7
14+
curl 7.24.0
15+
apache 2.2.22 or apache 2.4.3
16+
libxml2 2.7.7
17+
lua 5.1.5
18+
pcre 8.30
19+
zlib 1.2.7
20+
7-Zip
21+
--------------------------------------
22+
23+
1. Create working directory c:\work and drop directory c:\drop
24+
2. Sync SVN ModSecurity branch to c:\work\mod_security
25+
3. Copy files from c:\work\mod_security\iis\winbuild to c:\work
26+
4. Download and install cmake (unpack to c:\work\cmake-2.8.7-win32-x86)
27+
5. Download and install 7-Zip
28+
6. Adjust paths in c:\work\init.bat accordingly if needed
29+
7. Download curl, apache, libxml2, lua, pcre and zlib, place them in zip files in c:\work
30+
31+
curl-7.24.0.zip
32+
httpd-2.2.22-win32-src.zip or (httpd-2.4.3.zip (source) and httpd-2.4.3-win32.zip + httpd-2.4.3-win64.zip (binaries))
33+
libxml2-2.7.7.zip
34+
lua-5.1.5.zip
35+
pcre-8.30.zip
36+
zlib-1.2.7.zip
37+
38+
Modify c:\work\build.bat accordingly (if other versions were used)
39+
40+
8. Open cmd.exe window, go to c:\work and run buildall.bat
41+
9. When done, the binaries, lib and pdb files should appear under c:\drop\x86 (32-bit) and c:\drop\amd64 (64-bit)
42+
10. Open the VS ModSecurity IIS installer project
43+
11. Copy new binaries to the installer's x86 and amd64 directories
44+
12. Build installer from within VS

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp