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

build: offer windows 64 bit build (issue #300)

Browse Source 
* update to clang/llvm to 3.9
* update to qt 5.8
* fixed windows javapathdetector for 64 bit java.
* added LibGui as dependency to tests
* fixed legacy Java 6 install necessary on MacOS
* fixed setting of user path for 64 bit build
* added missing pngs to windows installer
* renamed graph zoom button images
* reverted moving of setupLogging call to fix crash on deployed exe

fortune cookie message = An old acquaintance will enter your life.
This commit is contained in:
malte_langkabel
2017-02-03 14:31:43 +01:00
parent 8c0f9f2de4
commit 7f2db69995
250 changed files with 1173 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/CustomActions/CustomActions.VC.db
BIN
View File
Binary file not shown.
deployment/windows/wixSetup/CustomActions/CustomActions.sln
+7 -11
View File
@@ -1,34 +1,30 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetupAppSettings", "SetupAppSettings\SetupAppSettings.csproj", "{A3901962-55C5-457B-873D-5842F2B3B2BE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UninstallRemoveLogFolder", "UninstallRemoveLogFolder\UninstallRemoveLogFolder.csproj", "{7B853830-9077-4803-8ADF-12D7B2886958}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|Any CPU.ActiveCfg = Release|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|Any CPU.Build.0 = Release|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|x86.ActiveCfg = Debug|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|x86.Build.0 = Debug|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|Any CPU.ActiveCfg = Release|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|Any CPU.Build.0 = Release|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|x86.ActiveCfg = Release|x86
{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|x86.Build.0 = Release|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|Any CPU.ActiveCfg = Release|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|Any CPU.Build.0 = Release|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x64.ActiveCfg = Debug|x64
{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x64.Build.0 = Debug|x64
{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x86.ActiveCfg = Debug|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x86.Build.0 = Debug|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Release|Any CPU.ActiveCfg = Release|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Release|Any CPU.Build.0 = Release|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x64.ActiveCfg = Release|x64
{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x64.Build.0 = Release|x64
{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x86.ActiveCfg = Release|x86
{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x86.Build.0 = Release|x86
EndGlobalSection
deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.config
-32
View File
@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<!--
Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
the custom action should run on. If no versions are specified, the chosen version of the runtime
will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
only the version(s) of the .NET Framework runtime that you have tested against.
Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies
by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-->
<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727"/>
</startup>
<!--
Add additional configuration settings here. For more information on application config files,
see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-->
</configuration>
deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.cs
-59
View File
@@ -1,59 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using Microsoft.Deployment.WindowsInstaller;
using System.Xml;
namespace SetupAppSettings
{
public class CustomActions
{
[CustomAction]
public static ActionResult Main(Session session)
{
session.Log("Configuring AppSettings");
try
{
SetupAppSettings();
}
catch(Exception e)
{
session.Log("Failed to configure AppSettings.");
session.Log("Exception: " + e.ToString());
return ActionResult.NotExecuted;
}
session.Log("Done configuring AppSettings");
return ActionResult.Success;
}
private static void SetupAppSettings()
{
string appDataCoatiPath = Environment.GetEnvironmentVariable("APPDATA") + "\\..\\local\\Coati Software\\Coati\\";
string appSettingsPath = appDataCoatiPath + "ApplicationSettings.xml";
string projectsPath = appDataCoatiPath + "projects\\";
XmlDocument appSettings = new XmlDocument();
appSettings.Load(@appSettingsPath);
XmlNode recentProjects = appSettings.SelectSingleNode("config/user/recent_projects");
recentProjects.RemoveAll();
XmlNode tutorial = appSettings.CreateElement("recent_project");
tutorial.InnerText = projectsPath + "tutorial\\tutorial.coatiproject";
recentProjects.AppendChild(tutorial);
XmlNode tictactoe = appSettings.CreateElement("recent_project");
tictactoe.InnerText = projectsPath + "tictactoe\\tictactoe.coatiproject";
recentProjects.AppendChild(tictactoe);
XmlNode javaparser = appSettings.CreateElement("recent_project");
javaparser.InnerText = projectsPath + "javaparser\\javaparser.coatiproject";
recentProjects.AppendChild(javaparser);
appSettings.Save(appSettingsPath);
}
}
}
deployment/windows/wixSetup/CustomActions/SetupAppSettings/Properties/AssemblyInfo.cs
-35
View File
@@ -1,35 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("FooAction")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FooAction")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a3901962-55c5-457b-873d-5842f2b3b2be")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
deployment/windows/wixSetup/CustomActions/SetupAppSettings/SetupAppSettings.csproj
-52
View File
@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A3901962-55C5-457B-873D-5842F2B3B2BE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SetupAppSettings</RootNamespace>
<AssemblyName>SetupAppSettings</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\build\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\build\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.Deployment.WindowsInstaller">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CustomAction.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="CustomAction.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(WixCATargetsPath)" />
</Project>
deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/UninstallRemoveLogFolder.csproj
+19 -1
View File
@@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>..\..\build\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -32,6 +32,24 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\build\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\build\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />