lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set installer version via env variable from the code version

Browse Source
This commit is contained in:
baldurk
2014-09-09 23:59:04 +01:00
parent 3e45d2775b
commit 48748936ba
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist.sh
+4
View File
@@ -51,6 +51,10 @@ if [[ $AUTOBUILD -eq 0 ]]; then
read;
fi
VERSION=`egrep "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/data/version.h | tr -dc '[0-9\n]' | tr '\n' '.' | egrep -o '[0-9]+\.[0-9]+'`
export RENDERDOC_VERSION="${VERSION}.0"
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.8/bin/candle.exe -o dist/Installer32.wixobj installer/Installer32.wxs
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.8/bin/light.exe -ext WixUIExtension -sw1076 -o dist/Installer32.msi dist/Installer32.wixobj
installer/Installer32.wxs
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='RenderDoc' Id='*' UpgradeCode='D320753C-4B18-4905-A752-E68959943E7D'
Language='1033' Codepage='1252' Version='0.21.0' Manufacturer='Crytek'>
Language='1033' Codepage='1252' Version='$(env.RENDERDOC_VERSION)' Manufacturer='Crytek'>
<Package Id='*' Keywords='Installer' Description="Installer for RenderDoc"
Comments='RenderDoc Homepage is http://renderdoc.org/' Manufacturer='Crytek'
@@ -25,7 +25,7 @@
<UpgradeVersion Minimum="0.18.0"
IncludeMinimum="yes"
IncludeMaximum="yes"
Maximum="0.21.0"
Maximum="$(env.RENDERDOC_VERSION)"
Property="OLDERVERSIONBEINGUPGRADED" />
</Upgrade>
installer/Installer64.wxs
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='RenderDoc' Id='*' UpgradeCode='D320753C-4B18-4905-A752-E68959943E7D'
Language='1033' Codepage='1252' Version='0.21.0' Manufacturer='Crytek'>
Language='1033' Codepage='1252' Version='$(env.RENDERDOC_VERSION)' Manufacturer='Crytek'>
<Package Id='*' Keywords='Installer' Description="Installer for RenderDoc"
Comments='RenderDoc Homepage is http://renderdoc.org/' Platform="x64" Manufacturer='Crytek'
@@ -15,7 +15,7 @@
<UpgradeVersion Minimum="0.18.0"
IncludeMinimum="yes"
IncludeMaximum="yes"
Maximum="0.21.0"
Maximum="$(env.RENDERDOC_VERSION)"
Property="OLDERVERSIONBEINGUPGRADED" />
</Upgrade>