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

build: windows deploy fixes

Browse Source 
* added home button icon to windows installer projects
* changed deploy script to build the coati dbs in headless mode
This commit is contained in:
malte_langkabel
2016-04-25 13:30:41 +02:00
parent 69925917bc
commit 4b4d2157eb
5 changed files with 79 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj
+28 -2
View File
@@ -111,6 +111,12 @@
}
"Entry"
{
"MsmKey" = "8:_19CAF24FB7714BB0B5D219C2BA924900"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_1B21108076D9489FA204E5E435EAFA3F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -850,7 +856,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
"OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -862,7 +868,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
"OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -1456,6 +1462,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19CAF24FB7714BB0B5D219C2BA924900"
{
"SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\search_view\\images\\home.png"
"TargetName" = "8:home.png"
"Tag" = "8:"
"Folder" = "8:_5D5E082821B345FB90DEA01C1FCC7A41"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1B21108076D9489FA204E5E435EAFA3F"
{
"SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\window\\refresh.png"
deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj
+28 -2
View File
@@ -543,6 +543,12 @@
}
"Entry"
{
"MsmKey" = "8:_A65099A63E6941CCA76E63A99B7E24A1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_A66E166B06CE4949B037BA2DDEAA3152"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -862,7 +868,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
"OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -874,7 +880,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A"
"OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -2888,6 +2894,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A65099A63E6941CCA76E63A99B7E24A1"
{
"SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\search_view\\images\\home.png"
"TargetName" = "8:home.png"
"Tag" = "8:"
"Folder" = "8:_3AD40865D1D747AE81EBCEB665944B1F"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A66E166B06CE4949B037BA2DDEAA3152"
{
"SourcePath" = "8:..\\..\\..\\..\\bin\\app\\Release\\Qt5Widgets.dll"
script/deploy_windows.sh
+8 -4
View File
@@ -66,11 +66,15 @@ rm bin/app/data/projects/tutorial/tutorial.coatidb
rm -rf temp
mkdir -p temp
cd temp
echo -e "$INFO Please wait until Coati created the database for tictactoe. Close Coati to continue"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject
echo -e "$INFO Please wait until Coati created the database for tutorial. Close Coati to continue"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject
echo -e "$INFO saving license key"
../bin/app/Release/Coati.exe -z ../script/license.txt
echo -e "$INFO creating database for tictactie"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject -d
echo -e "$INFO creating database for tutorial"
../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject -d
cd ..
rm -rf temp
script/license.txt
+13
View File
@@ -0,0 +1,13 @@
-----BEGIN LICENSE-----
Malte Langkabel
Private/Academic Single User License
Coati 0
$9$AQAKVgXEpRqHfGMwWj/TA5YWrVmWWJrk5PmADbFYkewV7Ddvq+JV
nT+lDlImNpfRQDY4YTJDYc0B/IW5n8ccn21HqLkRvR5t8T5/GvUzRNZ
PnZfA/sE0tVBpS1IMEhUd5JIztHKXHFDdwcvIS7Z+y6vxn0knD0/VF4
RjvvgicxikAnfF9cNxTb3IYAaUSREFTPejX6JABSai0jJhZLR4P9upK
rj6OYFerGI2/+6D2UyBJhaAc2P3zcd2ivd01IRjJNeXlGA3r5mCcl5y
SuPtreW3Yyq/uafyP1rV6uASIb+3oV6Y+jTo1kFYqEh8tjmrxOHbJLu
3+wHyJgMu5fLhJFWAKyxPjVbY5A0nvQAb0F+ROSZZ5IiKKCYIcofcxt
HrBYDDdP0rJw==
-----END LICENSE-----
src/app/utility/commandline/CommandLineParser.cpp
+2
View File
@@ -8,6 +8,7 @@
#include "utility/messaging/type/MessageLoadProject.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/text/TextAccess.h"
#include "utility/utilityString.h"
#include "License.h"
#include "PublicKey.h"
@@ -67,6 +68,7 @@ CommandLineParser::CommandLineParser(int argc, char** argv, const std::string& v
if (vm.count("license"))
{
licensetext = utility::replace(licensetext, "\\n", "\n");
processLicense(m_license.loadFromString(licensetext));
}