Fincer
/
openra-tibsunra2
mirror of https://github.com/Fincer/openra-tibsunra2
1
0
Fork 0
Code Issues 0 Projects 0 Releases 0 Wiki Activity
Provides automatic installation scripts for OpenRA with Tiberian Sun & Red Alert 2 + Dune 2 (Windows, Linux)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1 Commit
1 Branch
66 MiB
Tree: 05776ee78b
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '05776ee78b'
${ noResults }
openra-tibsunra2/windows/data/openra-srcpatch.patch

257 lines
11 KiB
Raw Normal View History

First Commit
8 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. --- a/Makefile
  2. +++ b/Makefile

  3. @@ -42,7 +42,7 @@

  4.  
  5.  ############################## TOOLCHAIN ###############################
  6.  #
  7. -CSC         = mcs -sdk:4.0

  8. +CSC         = mcs

  9.  CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
  10.  DEFINE      = TRACE
  11.  COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
  12.  
  13. --- a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj

  14. +++ b/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj

  15. @@ -1,33 +1,74 @@

  16.  <?xml version="1.0" encoding="utf-8"?>
  17. -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">

  18. +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  19.    <PropertyGroup>
  20. -    <ProjectGuid>{7E1263D2-BA04-48D0-85DB-26C68B782608}</ProjectGuid>

  21.      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  22.      <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
  23. +    <ProductVersion>10.0.0</ProductVersion>

  24. +    <SchemaVersion>2.0</SchemaVersion>

  25. +    <ProjectGuid>{7E1263D2-BA04-48D0-85DB-26C68B782608}</ProjectGuid>

  26.      <OutputType>Library</OutputType>
  27.      <RootNamespace>OpenRA.Mods.RA2</RootNamespace>
  28.      <AssemblyName>OpenRA.Mods.RA2</AssemblyName>
  29. -    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

  30. -    <OutputPath>..</OutputPath>

  31.    </PropertyGroup>
  32. -  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">

  33. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

  34. +    <DebugSymbols>true</DebugSymbols>

  35. +    <OutputPath>bin\Debug\</OutputPath>

  36. +    <DefineConstants>TRACE;DEBUG</DefineConstants>

  37.      <PlatformTarget>x86</PlatformTarget>
  38. +    <ErrorReport>prompt</ErrorReport>

  39. +    <CustomCommands>

  40. +      <CustomCommands>

  41. +        <Command type="AfterBuild" command="cp ${TargetFile} ../mods/ra2" workingdir="${ProjectDir}" />

  42. +        <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />

  43. +      </CustomCommands>

  44. +    </CustomCommands>

  45. +    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

  46. +    <DebugType>full</DebugType>

  47. +    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

  48.    </PropertyGroup>
  49. -  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

  50. -    <DebugSymbols>True</DebugSymbols>

  51. -    <DebugType>Full</DebugType>

  52. -    <Optimize>False</Optimize>

  53. -    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>

  54. -    <DefineConstants>DEBUG;TRACE</DefineConstants>

  55. -  </PropertyGroup>

  56. -  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

  57. -    <DebugSymbols>False</DebugSymbols>

  58. -    <DebugType>None</DebugType>

  59. -    <Optimize>True</Optimize>

  60. -    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

  61. +  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">

  62. +    <DebugSymbols>true</DebugSymbols>

  63. +    <OutputPath>bin\Release\</OutputPath>

  64.      <DefineConstants>TRACE</DefineConstants>
  65. +    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

  66. +    <DebugType>pdbonly</DebugType>

  67. +    <PlatformTarget>x86</PlatformTarget>

  68. +    <ErrorReport>prompt</ErrorReport>

  69. +    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

  70. +    <Optimize>true</Optimize>

  71. +    <CustomCommands>

  72. +      <CustomCommands>

  73. +        <Command type="AfterBuild" command="cp ${TargetFile} ../mods/ra2" workingdir="${ProjectDir}" />

  74. +        <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />

  75. +      </CustomCommands>

  76. +    </CustomCommands>

  77.    </PropertyGroup>
  78.    <ItemGroup>
  79. +    <Reference Include="System" />

  80. +    <Reference Include="System.Core" />

  81. +    <Reference Include="System.Drawing" />

  82. +    <Reference Include="Eluant">

  83. +      <HintPath>..\thirdparty\download\Eluant.dll</HintPath>

  84. +      <Private>False</Private>

  85. +    </Reference>

  86. +  </ItemGroup>

  87. +  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

  88. +  <ItemGroup>

  89. +    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

  90. +      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>

  91. +      <Name>OpenRA.Game</Name>

  92. +      <Private>False</Private>

  93. +    </ProjectReference>

  94. +    <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">

  95. +      <Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>

  96. +      <Name>OpenRA.Mods.Common</Name>

  97. +      <Private>False</Private>

  98. +    </ProjectReference>

  99. +  </ItemGroup>

  100. +  <ItemGroup>

  101. +    <Compile Include="Stub.cs" />

  102. +  </ItemGroup>

  103. +  <ItemGroup>

  104.      <Reference Include="Microsoft.CSharp">
  105.        <RequiredTargetFramework>4.0</RequiredTargetFramework>
  106.      </Reference>
  107. @@ -52,8 +93,9 @@

  108.        <RequiredTargetFramework>3.5</RequiredTargetFramework>
  109.      </Reference>
  110.    </ItemGroup>
  111. -  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  112. -  <ItemGroup>

  113. -    <Compile Include="Stub.cs" />

  114. -  </ItemGroup>

  115. -</Project>

  116. +  <PropertyGroup>

  117. +    <PostBuildEvent>mkdir "$(SolutionDir)mods/ra2/"

  118. +copy "$(TargetPath)" "$(SolutionDir)mods/ra2/"

  119. +cd "$(SolutionDir)"</PostBuildEvent>

  120. +  </PropertyGroup>

  121. +</Project>

  122. \ No newline at end of file
  123. 

  124. --- a/Makefile

  125. +++ b/Makefile

  126. @@ -187,6 +187,15 @@

  127.  PROGRAMS += mod_ts
  128.  mod_ts: $(mod_ts_TARGET)
  129.  
  130. +# Red Alert 2

  131. +mod_ra2_SRCS := $(shell find OpenRA.Mods.RA2/ -iname '*.cs')

  132. +mod_ra2_TARGET = mods/ra2/OpenRA.Mods.RA2.dll

  133. +mod_ra2_KIND = library

  134. +mod_ra2_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)

  135. +mod_ra2_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)

  136. +PROGRAMS += mod_ra2

  137. +mod_ra2: $(mod_ra2_TARGET)

  138. +

  139.  check-scripts:
  140.  	@echo
  141.  	@echo "Checking for Lua syntax errors..."
  142. @@ -222,6 +231,9 @@

  143.  	@echo "Checking for code style violations in OpenRA.Mods.TS..."
  144.  	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
  145.  	@echo
  146. +	@echo "Checking for code style violations in OpenRA.Mods.RA2..."

  147. +	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA2

  148. +	@echo

  149.  	@echo "Checking for code style violations in OpenRA.Utility..."
  150.  	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
  151.  	@echo
  152. @@ -255,6 +267,9 @@

  153.  	@echo "Testing Tiberian Sun mod MiniYAML..."
  154.  	@mono --debug OpenRA.Utility.exe ts --check-yaml
  155.  	@echo
  156. +	@echo "Testing Red Alert 2 mod MiniYAML..."

  157. +	@mono --debug OpenRA.Utility.exe ra2 --check-yaml

  158. +	@echo

  159.  	@echo "Testing Dune 2000 mod MiniYAML..."
  160.  	@mono --debug OpenRA.Utility.exe d2k --check-yaml
  161.  	@echo
  162. @@ -320,7 +335,7 @@

  163.  
  164.  package: all-dependencies core tools docs version
  165.  
  166. -mods: mod_common mod_ra mod_cnc mod_d2k mod_ts

  167. +mods: mod_common mod_ra mod_cnc mod_d2k mod_ts mod_ra2

  168.  
  169.  all: dependencies core tools
  170.  
  171. @@ -389,6 +404,10 @@

  172.  	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
  173.  	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
  174.  	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
  175. +	@$(CP_R) mods/ts "$(DATA_INSTALL_DIR)/mods/"

  176. +	@$(INSTALL_PROGRAM) $(mod_ts_TARGET) "$(DATA_INSTALL_DIR)/mods/ts"

  177. +	@$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/"

  178. +	@$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2"

  179.  
  180.  	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
  181.  	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
  182. 

  183. --- a/make.ps1

  184. +++ b/make.ps1

  185. @@ -136,6 +136,8 @@

  186.  		echo "Testing mods..."
  187.  		echo "Testing Tiberian Sun mod MiniYAML..."
  188.  		./OpenRA.Utility.exe ts --check-yaml
  189. +		echo "Testing Red Alert 2 mod MiniYAML..."

  190. +		./OpenRA.Utility.exe ra2 --check-yaml

  191.  		echo "Testing Dune 2000 mod MiniYAML..."
  192.  		./OpenRA.Utility.exe d2k --check-yaml
  193.  		echo "Testing Tiberian Dawn mod MiniYAML..."
  194. @@ -170,6 +172,8 @@

  195.  		./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k
  196.  		echo "Checking for code style violations in OpenRA.Mods.TS..."
  197.  		./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.TS
  198. +		echo "Checking for code style violations in OpenRA.Mods.RA2..."

  199. +		./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.RA2

  200.  		echo "Checking for code style violations in OpenRA.Utility..."
  201.  		./OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility
  202.  		echo "Checking for code style violations in OpenRA.Test..."
  203. 

  204. --- a/mods/all/mod.yaml

  205. +++ b/mods/all/mod.yaml

  206. @@ -20,6 +20,7 @@

  207.  	d2k:OpenRA.Mods.D2k.dll
  208.  	./mods/cnc/OpenRA.Mods.Cnc.dll
  209.  	./mods/ts/OpenRA.Mods.TS.dll
  210. +	./mods/ts/OpenRA.Mods.RA2.dll

  211.  
  212.  ChromeLayout:
  213.  
  214. --- a/mods/ra2/mod.yaml

  215. +++ b/mods/ra2mod.yaml

  216. @@ -5,7 +5,7 @@

  217.  	Author: RA2 team
  218.  
  219.  RequiresMods:
  220. -	modchooser: {DEV_VERSION}

  221. +

  222.  
  223.  Folders:
  224.  	.
  225. --- a/OpenRA.sln

  226. +++ b/OpenRA.sln

  227. @@ -17,6 +17,8 @@

  228.  EndProject
  229.  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.TS", "OpenRA.Mods.TS\OpenRA.Mods.TS.csproj", "{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}"
  230.  EndProject
  231. +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA2", "OpenRA.Mods.RA2\OpenRA.Mods.RA2.csproj", "{7E1263D2-BA04-48D0-85DB-26C68B782608}"

  232. +EndProject

  233.  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Platforms.Default", "OpenRA.Platforms.Default\OpenRA.Platforms.Default.csproj", "{33D03738-C154-4028-8EA8-63A3C488A651}"
  234.  EndProject
  235.  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Common", "OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
  236. @@ -139,6 +141,10 @@

  237.  		{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.Build.0 = Debug|x86
  238.  		{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.ActiveCfg = Release|x86
  239.  		{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.Build.0 = Release|x86
  240. +		{7E1263D2-BA04-48D0-85DB-26C68B782608}.Debug|x86.ActiveCfg = Debug|x86

  241. +		{7E1263D2-BA04-48D0-85DB-26C68B782608}.Debug|x86.Build.0 = Debug|x86

  242. +		{7E1263D2-BA04-48D0-85DB-26C68B782608}.Release|x86.ActiveCfg = Release|x86

  243. +		{7E1263D2-BA04-48D0-85DB-26C68B782608}.Release|x86.Build.0 = Release|x86

  244.  		{33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.ActiveCfg = Debug|x86
  245.  		{33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.Build.0 = Debug|x86
  246.  		{33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.ActiveCfg = Release|x86
  247. 

  248. --- a/utility.cmd

  249. +++ b/utility.cmd

  250. @@ -16,6 +16,7 @@

  251.  if /I "%mod%" EQU "ra" (goto help)
  252.  if /I "%mod%" EQU "cnc" (goto help)
  253.  if /I "%mod%" EQU "ts" (goto help)
  254. +if /I "%mod%" EQU "ra2" (goto help)

  255.  if /I "%mod%" EQU "d2k" (goto help)
  256.  echo.
  257.  echo Unknown mod: %mod%