@@ -12,13 +12,12 @@ REM UCRT64: mingw-w64-ucrt-x86_64-boost mingw-w64-ucrt-x86_64-openssl mingw-w64-
12
12
REM MINGW32: mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-gcc
13
13
14
14
REM setting up variables for MSYS
15
- REM Note: if you installed MSYS64 to different path, edit WD variable (only C:\msys64 needed to edit)!
16
- set " WD = C:\msys64\usr\bin\"
15
+ REM Note: if you installed MSYS64 to different path, edit WD variable (only C:\msys64 needed to edit)
17
16
set MSYS2_PATH_TYPE = inherit
18
17
set CHERE_INVOKING = enabled_from_arguments
19
- REM set MSYSTEM=MSYS
20
18
set MSYSTEM = MINGW32
21
19
20
+ set " WD = C:\msys64\usr\bin\"
22
21
set " xSH = %WD% bash -lc"
23
22
24
23
set " FILELIST = i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates contrib/tunnels.d contrib/webconsole"
@@ -55,12 +54,12 @@ REM converting configuration files to DOS format (make usable in Windows Notepad
55
54
REM Prepare binary signing command if signing key and password provided
56
55
if defined SIGNKEY (
57
56
if defined SIGNPASS (
58
- echo Signing options found^^!
57
+ echo Signing options found
59
58
60
59
for %%X in (signtool.exe) do (set xSIGNTOOL=%%~$PATH:X )
61
60
if not defined xSIGNTOOL (
62
61
if not defined SIGNTOOL (
63
- echo Error: Can't find signtool^^! Please provide path to binary using SIGNTOOL variable^^!
62
+ echo Error: Can't find signtool. Please provide path to binary using SIGNTOOL variable.
64
63
exit /b 1
65
64
) else (
66
65
set " xSIGNTOOL = %SIGNTOOL% "
@@ -80,15 +79,10 @@ set MSYSTEM=UCRT64
80
79
set bitness = 64
81
80
call :BUILDING
82
81
83
- if exist C:\msys64-xp\ (
84
- REM building for WinXP
85
- set " WD = C:\msys64-xp\usr\bin\"
86
- set MSYSTEM = MINGW32
87
- set bitness = 32
88
- set " xSH = %WD% bash -lc"
89
- call :BUILDING_XP
90
- echo .
91
- )
82
+ REM build for Windows XP
83
+ if exist C:\msys64-xp\ ( call :BUILDING_XP )
84
+
85
+ echo .
92
86
93
87
REM compile installer
94
88
echo Building installer...
@@ -125,6 +119,11 @@ REM Clean work directory
125
119
goto EOF
126
120
127
121
:BUILDING_XP
122
+ set MSYSTEM = MINGW32
123
+ set bitness = 32
124
+ set " WD = C:\msys64-xp\usr\bin\"
125
+ set " xSH = %WD% bash -lc"
126
+
128
127
%xSH% " make clean" >> nul
129
128
echo Building i2pd %tag% for winxp...
130
129
%xSH% " make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads% " > build\build_winxp_%tag% .log 2 >& 1
@@ -139,5 +138,6 @@ REM Copy binary for installer and create distribution archive
139
138
140
139
REM Clean work directory
141
140
%xSH% " make clean" >> build\build_winxp_%tag% .log 2 >& 1
141
+ goto EOF
142
142
143
- :EOF
143
+ :EOF
0 commit comments