diff options
| author | Arnavion <arnavion@gmail.com> | 2013-10-12 18:41:27 -0700 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2013-10-12 18:41:27 -0700 |
| commit | e2edbfe47d89059f2020baccd76ad4715ef87871 (patch) | |
| tree | f1948820b339f513f036e62f04ebcd0ed9803085 /win32 | |
| parent | 0061cd38d07396cfa42deaaa199c334b40f3d0d3 (diff) | |
win32: Use version information from configure.ac to populate the Windows-specific files that need it - config-win32.h, version.txt, hexchat.rc, hexchat.iss
This is done via T4 templates. The original files are now generated at build-time and so have been added to .gitignore and removed from the repository, with the exception of version.txt which must be hosted on GitHub for the updater plugin.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/installer/hexchat.iss.tt (renamed from win32/installer/hexchat.iss) | 4 | ||||
| -rw-r--r-- | win32/installer/installer.vcxproj | 9 | ||||
| -rw-r--r-- | win32/version.txt.tt | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/win32/installer/hexchat.iss b/win32/installer/hexchat.iss.tt index 68d0bedb..486e2f8d 100644 --- a/win32/installer/hexchat.iss +++ b/win32/installer/hexchat.iss.tt @@ -1,5 +1,5 @@ -#define APPNAM "HexChat" -#define APPVER "2.9.6" +<#@ include file="..\..\version.include.tt" #>#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 88de2c35..453e87bd 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -62,9 +62,14 @@ </Link> <PreBuildEvent> <Command> + <![CDATA[ +SET SOLUTIONDIR=$(SolutionDir)..\ +"%PROGRAMFILES%\Common Files\microsoft shared\TextTemplating\12.0\TextTransform.exe" -out "%SOLUTIONDIR%win32\installer\hexchat.iss" "%SOLUTIONDIR%win32\installer\hexchat.iss.tt" del "$(OutDir)hexchat.iss" -type hexchat.iss >> "$(OutDir)hexchat.iss" -"$(ProgramFiles)\Inno Setup 5\iscc.exe" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss"</Command> +type hexchat.iss >> "$(OutDir)hexchat.iss" +"$(ProgramFiles)\Inno Setup 5\iscc.exe" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss" + ]]> + </Command> </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> diff --git a/win32/version.txt.tt b/win32/version.txt.tt new file mode 100644 index 00000000..64e50010 --- /dev/null +++ b/win32/version.txt.tt @@ -0,0 +1 @@ +<#@ include file="..\version.include.tt" #><#= string.Join(".", versionParts) #> \ No newline at end of file |