ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: windows installer fix

Browse Source 
* added project specific icons to windows installer
* implemented automatic generation of the version number for the windows installer
This commit is contained in:
malte_langkabel
2016-10-27 12:56:27 +02:00
parent 9f847f7897
commit 4cb285b138
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/build.bat
+10 -1
View File
@@ -1,3 +1,11 @@
VERSION_STRING=$(git describe --long)
VERSION_STRING="${VERSION_STRING//-/_}"
VERSION_STRING="${VERSION_STRING//./_}"
VERSION_STRING="${VERSION_STRING%_*}"
VERSION_STRING="${VERSION_STRING//_/.}"
echo "installer version is $VERSION_STRING"
rm -rf build
mkdir build
@@ -7,7 +15,8 @@ mkdir build
rm -rf bin
mkdir bin
candle.exe -dprojectVersion="0.9.0" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
candle.exe -dprojectVersion="$VERSION_STRING" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
cp -u -r build/coati.msi bin
deployment/windows/wixSetup/coati.wxs
+3
View File
@@ -186,7 +186,10 @@
<ComponentRef Id='Typedef_2Png'/>
<ComponentRef Id='Typedef_3Png'/>
<ComponentRef Id='C_icon_Png'/>
<ComponentRef Id='CoatiIco'/>
<ComponentRef Id='Cpp_icon_Png'/>
<ComponentRef Id='Java_icon_Png'/>
<ComponentRef Id='Logo_1024_1024_Png'/>
<ComponentRef Id='ProjectIco'/>
<ComponentRef Id='Project_256_256_Png'/>
deployment/windows/wixSetup/installDir.wxs
+9
View File
@@ -254,9 +254,18 @@
</Directory>
<Directory Id='DataIcon' Name='icon'>
<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F'>
<File Id='C_icon' Name='c_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/c_icon.png' KeyPath='yes' />
</Component>
<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371'>
<File Id='Coati' Name='coati.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/coati.ico' KeyPath='yes' />
</Component>
<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839'>
<File Id='Cpp_icon' Name='cpp_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cpp_icon.png' KeyPath='yes' />
</Component>
<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3'>
<File Id='Java_icon' Name='java_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/java_icon.png' KeyPath='yes' />
</Component>
<Component Id='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116'>
<File Id='Logo_1024_1024' Name='logo_1024_1024.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/logo_1024_1024.png' KeyPath='yes' />
</Component>
script/deploy_windows.sh
-3
View File
@@ -32,9 +32,6 @@ if [ $UPDATE_DATABASES = false ]; then
read -p "Press [Enter] key to continue"
fi
echo -e "$INFO Did you set the correct version number for the installers?"
read -p "Press [Enter] key to continue"
echo -e "$INFO Did you set the correct version number for the Visual Studio plugin?"
read -p "Press [Enter] key to continue"