Fix travis, fix .dll.config races in Monodevelop

Librelancer · Jan 2, 2019 · c9f8f3e · c9f8f3e
1 parent 141db6b
commit c9f8f3e
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,6 @@ addons:
 script:
  - ./build.sh --target=LinuxDaily
 deploy:
-    edge:
-        branch: v1.8.47
     provider: pages
     skip-cleanup: true
     github-token: $GITHUB_TOKEN

diff --git a/src/Editor/LancerEdit/LancerEdit.csproj b/src/Editor/LancerEdit/LancerEdit.csproj
@@ -98,10 +98,6 @@
       <Project>{6967FE1C-5953-4416-889C-FF10AE1F7DD1}</Project>
       <Name>LibreLancer.ImageLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\extern\SharpFont\Source\SharpFont\SharpFont.csproj">
-      <Project>{C293DB32-FA42-486D-B128-5A12522FAE4E}</Project>
-      <Name>SharpFont</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\extern\Collada141\Collada141.csproj">
       <Project>{7895D6CA-28F4-47D0-8C57-03B4D05DF9F6}</Project>
       <Name>Collada141</Name>

diff --git a/src/Launcher/Launcher.csproj b/src/Launcher/Launcher.csproj
@@ -103,9 +103,6 @@
       <Link>x64\SDL2.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="SharpFont.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <Compile Include="..\CommonVersion.cs">
       <Link>Properties\CommonVersion.cs</Link>
     </Compile>

diff --git a/src/LibreLancer.Base/LibreLancer.Base.csproj b/src/LibreLancer.Base/LibreLancer.Base.csproj
@@ -199,19 +199,16 @@
   -->
   <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\..\extern\SharpFont\Source\SharpFont\SharpFont.csproj">
-      <Project>{C293DB32-FA42-486D-B128-5A12522FAE4E}</Project>
-      <Name>SharpFont</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\extern\FontConfigSharp\FontConfigSharp\FontConfigSharp.csproj">
       <Project>{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85}</Project>
       <Name>FontConfigSharp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SharpFont.BuildNoConfig\SharpFont.csproj">
+      <Project>{C293DB32-FA42-486D-B128-5A12522FAE4E}</Project>
+      <Name>SharpFont</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="LibreLancer.Base.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="SSE\multiply_matrix_x86.S" />
     <None Include="SSE\multiply_matrix_windows.S" />
     <None Include="SSE\multiply_matrix_unix.S" />

diff --git a/src/LibreLancer.Media/LibreLancer.Media.csproj b/src/LibreLancer.Media/LibreLancer.Media.csproj
@@ -270,9 +270,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="LibreLancer.Media.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/src/LibreLancer.sln b/src/LibreLancer.sln
@@ -15,7 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreLancer", "LibreLancer\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreLancer.Base", "LibreLancer.Base\LibreLancer.Base.csproj", "{C7A37830-B878-4008-A988-D7294D47F44D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C293DB32-FA42-486D-B128-5A12522FAE4E} = {C293DB32-FA42-486D-B128-5A12522FAE4E}
 		{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85} = {CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85}
 	EndProjectSection
 EndProject
@@ -64,7 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LancerEdit", "Editor\Lancer
 		{C1D53477-0117-48EF-A13D-A0225F0F50CA} = {C1D53477-0117-48EF-A13D-A0225F0F50CA}
 		{38F87B47-C903-477A-A9A3-6AD1A2CE1C09} = {38F87B47-C903-477A-A9A3-6AD1A2CE1C09}
 		{6967FE1C-5953-4416-889C-FF10AE1F7DD1} = {6967FE1C-5953-4416-889C-FF10AE1F7DD1}
-		{C293DB32-FA42-486D-B128-5A12522FAE4E} = {C293DB32-FA42-486D-B128-5A12522FAE4E}
 		{7895D6CA-28F4-47D0-8C57-03B4D05DF9F6} = {7895D6CA-28F4-47D0-8C57-03B4D05DF9F6}
 		{81A8703E-031C-422C-804B-34B3BAF834A6} = {81A8703E-031C-422C-804B-34B3BAF834A6}
 	EndProjectSection
@@ -95,8 +93,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Collada141", "..\extern\Col
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontConfigSharp", "..\extern\FontConfigSharp\FontConfigSharp\FontConfigSharp.csproj", "{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpFont", "..\extern\SharpFont\Source\SharpFont\SharpFont.csproj", "{C293DB32-FA42-486D-B128-5A12522FAE4E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\extern\lidgren-network-gen3\Lidgren.Network\Lidgren.Network.csproj", "{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BulletSharp", "..\extern\BulletSharpPInvoke\BulletSharp\BulletSharp.csproj", "{76FDED5B-2C12-453E-B499-CB669E55AD5B}"
@@ -121,6 +117,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lancer", "lancer\lancer.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "thorn2lua", "thorn2lua\thorn2lua.csproj", "{D7F08E5D-94FF-4027-8430-DAE17199B568}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpFont", "SharpFont.BuildNoConfig\SharpFont.csproj", "{C293DB32-FA42-486D-B128-5A12522FAE4E}"
+EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -190,10 +188,6 @@ Global
 		{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -210,6 +204,10 @@ Global
 		{D7F08E5D-94FF-4027-8430-DAE17199B568}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7F08E5D-94FF-4027-8430-DAE17199B568}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7F08E5D-94FF-4027-8430-DAE17199B568}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C293DB32-FA42-486D-B128-5A12522FAE4E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{38B159EB-CF44-4A4F-948A-E238D7FAE28E} = {953F895D-0AAD-4427-B912-71215C04BEFD}
@@ -218,8 +216,8 @@ Global
 		{D24DBB87-1E3D-4080-ABFB-B21CBDDACD87} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
 		{7895D6CA-28F4-47D0-8C57-03B4D05DF9F6} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
 		{CBBDC35F-DCA3-453C-A9E3-29EE7E43DE85} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
-		{C293DB32-FA42-486D-B128-5A12522FAE4E} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
 		{76FDED5B-2C12-453E-B499-CB669E55AD5B} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
+		{C293DB32-FA42-486D-B128-5A12522FAE4E} = {6CED24D8-885B-4ACC-8EC2-71A5629CB0C9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/SharpFont.BuildNoConfig/SharpFont.csproj b/src/SharpFont.BuildNoConfig/SharpFont.csproj
@@ -0,0 +1,53 @@
+<?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)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C293DB32-FA42-486D-B128-5A12522FAE4E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SharpFont</RootNamespace>
+    <AssemblyName>SharpFont</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\bin\Debug</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\SharpFont.xml</DocumentationFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\bin\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\SharpFont.xml</DocumentationFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="..\..\extern\SharpFont\Source\SharpFontShared\SharpFontShared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/...reLancer.Base/LibreLancer.Base.dll.config → src/lancer/LibreLancer.Base.dll.config b/...reLancer.Base/LibreLancer.Base.dll.config → src/lancer/LibreLancer.Base.dll.config
diff --git a/...Lancer.Media/LibreLancer.Media.dll.config → src/lancer/LibreLancer.Media.dll.config b/...Lancer.Media/LibreLancer.Media.dll.config → src/lancer/LibreLancer.Media.dll.config
diff --git a/src/Launcher/SharpFont.dll.config → src/lancer/SharpFont.dll.config b/src/Launcher/SharpFont.dll.config → src/lancer/SharpFont.dll.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<dllmap dll="freetype6" os="linux" target="libfreetype.so.6" />
 	<dllmap dll="freetype6" os="osx" target="/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib" />

diff --git a/src/lancer/lancer.csproj b/src/lancer/lancer.csproj
@@ -48,5 +48,16 @@
       <Name>LibreLancer.Base</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="LibreLancer.Base.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="LibreLancer.Media.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SharpFont.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>