From 1bf721588bd55064901cd18930790fae4a629840 Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Wed, 20 Apr 2016 18:18:10 +0200 Subject: [PATCH] build: windows installer dlls * removed redistributable as prerequisit from installer * added merge module for these dlls to the installer * added "my_next_step.h" for the tutorial project to the installer * renamed visual studio plugin * updated deploy_windows script to use vs14 to build the installers --- .../CoatiSetup/CoatiSetup.vdproj | 72 ++++++++++++------ .../CoatiSetup/CoatiSetup.vdproj | 66 +++++++++++----- .../{vs_plugin.vsix => coati_plugin_vs.vsix} | Bin script/deploy_windows.sh | 12 +-- 4 files changed, 99 insertions(+), 51 deletions(-) rename ide_plugins/vs/{vs_plugin.vsix => coati_plugin_vs.vsix} (100%) diff --git a/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj b/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj index f2424281..e8257e5d 100644 --- a/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj +++ b/deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj @@ -69,6 +69,12 @@ } "Entry" { + "MsmKey" = "8:_0D141FC6540C4E97B58C2BFF93CD62CF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0EE1E4EA6AA24123A12B7D29D9EAD5BD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -615,6 +621,12 @@ } "Entry" { + "MsmKey" = "8:_CD77DA0B0E314841A0A3EEBF7D13127D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CEC5B9A68AC84CBCAE248C80FE14B372" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -772,7 +784,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83" + "OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -784,7 +796,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83" "MsmSig" = "8:_UNDEFINED" } } @@ -819,16 +831,6 @@ "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" "ProductCode" = "8:.NETFramework,Version=v4.5" } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86" - } } } } @@ -861,16 +863,6 @@ "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" "ProductCode" = "8:.NETFramework,Version=v4.5" } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86" - } } } } @@ -3058,6 +3050,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD77DA0B0E314841A0A3EEBF7D13127D" + { + "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\my_next_step.h" + "TargetName" = "8:my_next_step.h" + "Tag" = "8:" + "Folder" = "8:_A38746A96F3F43108F3B9C1A88E43FD0" + "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}:_CEC5B9A68AC84CBCAE248C80FE14B372" { "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\undoredo_view\\images\\arrow_left.png" @@ -3907,7 +3919,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Coati" "ProductCode" = "8:{E6343DF1-6651-4487-BACE-59068B169BA0}" - "PackageCode" = "8:{B8A47176-2277-4FF3-A8A8-50A77366DB07}" + "PackageCode" = "8:{039E56E8-CF44-4CFA-AA27-AC0853CF07BC}" "UpgradeCode" = "8:{CFF09D53-87AF-4241-960D-98C21ED9D358}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -4856,6 +4868,20 @@ } "MergeModule" { + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0D141FC6540C4E97B58C2BFF93CD62CF" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge Modules\\Microsoft_VC140_CRT_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { diff --git a/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj b/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj index 3ca74557..025e7ac2 100644 --- a/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj +++ b/deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj @@ -315,6 +315,12 @@ } "Entry" { + "MsmKey" = "8:_6D88AADBCCFC4136A684D8D001001F8B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_72682FB1EB5042B8BA59A2EB76A9F847" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -429,6 +435,12 @@ } "Entry" { + "MsmKey" = "8:_916B59949F5C458DB6C2E8D1BE5B369A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_927AA2450359400398EC6015571C4680" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -831,16 +843,6 @@ "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" "ProductCode" = "8:.NETFramework,Version=v4.5" } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86" - } } } } @@ -873,16 +875,6 @@ "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)" "ProductCode" = "8:.NETFramework,Version=v4.5" } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86" - { - "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)" - "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86" - } } } } @@ -2090,6 +2082,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6D88AADBCCFC4136A684D8D001001F8B" + { + "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\projects\\tutorial\\src\\my_next_step.h" + "TargetName" = "8:my_next_step.h" + "Tag" = "8:" + "Folder" = "8:_A38746A96F3F43108F3B9C1A88E43FD0" + "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}:_72682FB1EB5042B8BA59A2EB76A9F847" { "SourcePath" = "8:..\\..\\..\\..\\bin\\app\\data\\gui\\undoredo_view\\undoredo_view.css" @@ -4885,6 +4897,20 @@ } "MergeModule" { + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_916B59949F5C458DB6C2E8D1BE5B369A" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge Modules\\Microsoft_VC140_CRT_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { diff --git a/ide_plugins/vs/vs_plugin.vsix b/ide_plugins/vs/coati_plugin_vs.vsix similarity index 100% rename from ide_plugins/vs/vs_plugin.vsix rename to ide_plugins/vs/coati_plugin_vs.vsix diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh index bf7e5598..7982c050 100644 --- a/script/deploy_windows.sh +++ b/script/deploy_windows.sh @@ -91,10 +91,10 @@ fi # BUILDING THE INSTALLERS echo -e "$INFO building the installer (app)" -"D:/programme/Microsoft Visual Studio 12/Common7/IDE/devenv.com" deployment/windows/CoatiAppSetup/CoatiAppSetup.sln //build Release //project deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj +"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" deployment/windows/CoatiAppSetup/CoatiAppSetup.sln //build Release //project deployment/windows/CoatiAppSetup/CoatiSetup/CoatiSetup.vdproj echo -e "$INFO building the installer (trail)" -"D:/programme/Microsoft Visual Studio 12/Common7/IDE/devenv.com" deployment/windows/CoatiTrialSetup/CoatiTrialSetup.sln //build Release //project deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj +"D:/programme/Microsoft Visual Studio14/Common7/IDE/devenv.com" deployment/windows/CoatiTrialSetup/CoatiTrialSetup.sln //build Release //project deployment/windows/CoatiTrialSetup/CoatiSetup/CoatiSetup.vdproj # EDIT THE INSTALLERS @@ -120,9 +120,7 @@ cp -u -r deployment/windows/CoatiAppSetup/CoatiSetup/Release/Coati.msi $APP_PACK cp -u -r deployment/windows/CoatiAppSetup/CoatiSetup/Release/setup.exe $APP_PACKAGE_DIR/ mkdir -p $APP_PACKAGE_DIR/plugins/visual_studio/ -cp -u -r ide_plugins/vs/coati_plugin_vs_2012.vsix $APP_PACKAGE_DIR/plugins/visual_studio/ -cp -u -r ide_plugins/vs/coati_plugin_vs_2013.vsix $APP_PACKAGE_DIR/plugins/visual_studio/ -cp -u -r ide_plugins/vs/coati_plugin_vs_2015.vsix $APP_PACKAGE_DIR/plugins/visual_studio/ +cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $APP_PACKAGE_DIR/plugins/visual_studio/ mkdir -p $APP_PACKAGE_DIR/plugins/sublime_text/ cp -u -r ide_plugins/sublime_text/* $APP_PACKAGE_DIR/plugins/sublime_text/ @@ -152,9 +150,7 @@ cp -u -r deployment/windows/CoatiTrialSetup/CoatiSetup/Release/CoatiTrial.msi $T cp -u -r deployment/windows/CoatiTrialSetup/CoatiSetup/Release/setup.exe $TRIAL_PACKAGE_DIR/ mkdir -p $TRIAL_PACKAGE_DIR/plugins/visual_studio/ -cp -u -r ide_plugins/vs/coati_plugin_vs_2012.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/ -cp -u -r ide_plugins/vs/coati_plugin_vs_2013.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/ -cp -u -r ide_plugins/vs/coati_plugin_vs_2015.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/ +cp -u -r ide_plugins/vs/coati_plugin_vs.vsix $TRIAL_PACKAGE_DIR/plugins/visual_studio/ mkdir -p $TRIAL_PACKAGE_DIR/plugins/sublime_text/ cp -u -r ide_plugins/sublime_text/* $TRIAL_PACKAGE_DIR/plugins/sublime_text/