diff options
| author | Arnavion <arnavion@gmail.com> | 2013-12-27 12:05:07 -0800 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2013-12-27 12:05:07 -0800 |
| commit | c7bf4b0474c613f81e3724043386373d7bc7d2a3 (patch) | |
| tree | 82a47c7c7306a736f0d6ec8afbd17ac0eb45f68e /src | |
| parent | 61ceaef57e19f7b19669bca4f7972123d2e6b119 (diff) | |
Replaced use of T4 templates with PS-based templates.
TextTransform.exe is not available with Express versions of Visual Studio.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/common.vcxproj | 6 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.vcxproj | 4 | ||||
| -rw-r--r-- | src/fe-gtk/hexchat.rc.tt | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 39c50222..720faae7 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -159,8 +159,10 @@ <Command> <![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -$(TextTransformPath) -out "%SOLUTIONDIR%config-win32.h" "%SOLUTIONDIR%config-win32.h.tt" -$(TextTransformPath) -out "%SOLUTIONDIR%win32\version.txt" "%SOLUTIONDIR%win32\version.txt.tt" +powershell "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\config-win32.h.tt" "$(SolutionDir)..\config-win32.h" +powershell "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\win32\version.txt.tt" "$(SolutionDir)..\win32\version.txt.tmp" +REM version.txt must be in UTF-8 without trailing newline +powershell "[string] $content = Get-Content '$(SolutionDir)..\win32\version.txt.tmp' -Encoding UTF8; [System.IO.File]::WriteAllText('$(SolutionDir)..\win32\version.txt', $content); Remove-Item '$(SolutionDir)..\win32\version.txt.tmp';" ]]> </Command> </PreBuildEvent> diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index f7341904..6b6301b2 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -100,7 +100,9 @@ <Command> <![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -$(TextTransformPath) -out hexchat.rc hexchat.rc.tt +powershell "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.tt" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8" +REM hexchat.rc needs to be in UCS-2 or Resource Compiler will complain +powershell "Get-Content -Encoding UTF8 '$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8' | Out-File '$(SolutionDir)..\src\fe-gtk\hexchat.rc'; Remove-Item '$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8'" "$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --sourcedir $(DataDir) --target "$(ProjectDir)resources.c" "$(DataDir)hexchat.gresource.xml" ]]> </Command> diff --git a/src/fe-gtk/hexchat.rc.tt b/src/fe-gtk/hexchat.rc.tt index 87507340..2b384c49 100644 --- a/src/fe-gtk/hexchat.rc.tt +++ b/src/fe-gtk/hexchat.rc.tt @@ -1,7 +1,7 @@ -<#@ include file="..\..\version.include.tt" #>#include <winver.h> +#include <winver.h> #include "../../config-win32.h" -#define COMMA_VERSION <#= string.Join(",", versionParts) #>,0 +#define COMMA_VERSION <#= [string]::Join(',', $versionParts) #>,0 XC_ICON ICON "../../data/icons/hexchat.ico" |