diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/hexchat.props | 2 | ||||
| -rw-r--r-- | win32/installer/hexchat.iss.tt | 4 | ||||
| -rw-r--r-- | win32/installer/installer.vcxproj | 2 | ||||
| -rw-r--r-- | win32/version.txt.tt | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/win32/hexchat.props b/win32/hexchat.props index 3acfd913..8f5b6644 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -94,8 +94,6 @@ copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\share\locale" xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale" </HexChatCopy> - <TextTransformPath Condition="'$(Platform)'=='Win32'">"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe"</TextTransformPath> - <TextTransformPath Condition="'$(Platform)'=='x64'">"%PROGRAMFILES(x86)%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe"</TextTransformPath> <IsccPath Condition="'$(Platform)'=='Win32'">"%PROGRAMFILES%\Inno Setup 5\iscc.exe"</IsccPath> <IsccPath Condition="'$(Platform)'=='x64'">"%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"</IsccPath> </PropertyGroup> diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 1ba55303..74156720 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -1,5 +1,5 @@ -<#@ include file="..\..\version.include.tt" #>#define APPNAM "HexChat" -#define APPVER "<#= string.Join(".", versionParts) #>" +#define APPNAM "HexChat" +#define APPVER "<#= [string]::Join('.', $versionParts) #>" ; These are defined by our installer project at build time ;#define APPARCH "x64" ;#define PROJECTDIR "C:\...\hexchat\win32\installer\" diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index 09654ab0..0e46f373 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -64,7 +64,7 @@ <Command> <![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -$(TextTransformPath) -out "%SOLUTIONDIR%win32\installer\hexchat.iss" "%SOLUTIONDIR%win32\installer\hexchat.iss.tt" +powershell "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\win32\installer\hexchat.iss.tt" "$(SolutionDir)..\win32\installer\hexchat.iss" del "$(OutDir)hexchat.iss" type hexchat.iss >> "$(OutDir)hexchat.iss" $(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss" diff --git a/win32/version.txt.tt b/win32/version.txt.tt index 64e50010..778db65c 100644 --- a/win32/version.txt.tt +++ b/win32/version.txt.tt @@ -1 +1 @@ -<#@ include file="..\version.include.tt" #><#= string.Join(".", versionParts) #> \ No newline at end of file +<#= [string]::Join('.', $versionParts) #> \ No newline at end of file |