mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-20 04:30:18 +00:00
Fixed installer detection to evaluate IsccPath safely when the path contains spaces by changing the existence check to Exists('$(IsccPath)').
Fixed ISCC path normalization by trimming surrounding quotes from ZOITECHAT_ISCC_PATH and storing discovered default paths unquoted (so they can be checked reliably with Exists(...)). Fixed installer invocation by quoting $(IsccPath) at execution time in the pre-build command, which supports paths like C:\Program Files (x86)\Inno Setup 6\ISCC.exe
This commit is contained in:
@@ -39,7 +39,7 @@
|
|||||||
SET SOLUTIONDIR=$(SolutionDir)..\
|
SET SOLUTIONDIR=$(SolutionDir)..\
|
||||||
if not exist "$(ZoiteChatBin)" mkdir "$(ZoiteChatBin)"
|
if not exist "$(ZoiteChatBin)" mkdir "$(ZoiteChatBin)"
|
||||||
powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\zoitechat.iss.tt" "$(ZoiteChatBin)zoitechat.iss"
|
powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\zoitechat.iss.tt" "$(ZoiteChatBin)zoitechat.iss"
|
||||||
$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(ZoiteChatBin)zoitechat.iss"
|
"$(IsccPath)" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(ZoiteChatBin)zoitechat.iss"
|
||||||
]]>
|
]]>
|
||||||
</Command>
|
</Command>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<Python3Enabled Condition="'$(Python3Enabled)'==''">false</Python3Enabled>
|
<Python3Enabled Condition="'$(Python3Enabled)'==''">false</Python3Enabled>
|
||||||
<PerlEnabled Condition="Exists('$(PerlPath)\\bin\\perl.exe') and Exists('$(PerlPath)\\bin\\$(PerlLib).dll') and Exists('$(GendefPath)\\gendef.exe')">true</PerlEnabled>
|
<PerlEnabled Condition="Exists('$(PerlPath)\\bin\\perl.exe') and Exists('$(PerlPath)\\bin\\$(PerlLib).dll') and Exists('$(GendefPath)\\gendef.exe')">true</PerlEnabled>
|
||||||
<PerlEnabled Condition="'$(PerlEnabled)'==''">false</PerlEnabled>
|
<PerlEnabled Condition="'$(PerlEnabled)'==''">false</PerlEnabled>
|
||||||
<InstallerEnabled Condition="Exists($(IsccPath))">true</InstallerEnabled>
|
<InstallerEnabled Condition="Exists('$(IsccPath)')">true</InstallerEnabled>
|
||||||
<InstallerEnabled Condition="'$(InstallerEnabled)'==''">false</InstallerEnabled>
|
<InstallerEnabled Condition="'$(InstallerEnabled)'==''">false</InstallerEnabled>
|
||||||
<LuaInclude>$(DepsRoot)\include\luajit-2.1;$(DepsRoot)\include\lua;$(DepsRoot)\include\lua5.1;$(DepsRoot)\include\lua54;$(DepsRoot)\include\lua5.4;$(DepsRoot)\include\lua-5.4;$(SolutionDir)..\plugins\lua\luajit\src;$(SolutionDir)..\plugins\lua\luajit\src\jit</LuaInclude>
|
<LuaInclude>$(DepsRoot)\include\luajit-2.1;$(DepsRoot)\include\lua;$(DepsRoot)\include\lua5.1;$(DepsRoot)\include\lua54;$(DepsRoot)\include\lua5.4;$(DepsRoot)\include\lua-5.4;$(SolutionDir)..\plugins\lua\luajit\src;$(SolutionDir)..\plugins\lua\luajit\src\jit</LuaInclude>
|
||||||
<LuaOutput>hclua</LuaOutput>
|
<LuaOutput>hclua</LuaOutput>
|
||||||
|
|||||||
Reference in New Issue
Block a user