Skip to content

Commit f4d3ccc

Browse files
pchotereaperrr
authored andcommitted
Fix newlines in misc other files.
1 parent 670e153 commit f4d3ccc

10 files changed

+504
-504
lines changed

.gitignore

+87-87
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
# Visual Studio
2-
Release
3-
bin
4-
obj
5-
*.ncb
6-
*.vcproj*
7-
*.suo
8-
*.user
9-
*.sln.cache
10-
*.manifest
11-
*.CodeAnalysisLog.xml
12-
*.lastcodeanalysissucceeded
13-
_ReSharper.*/
14-
/.vs
15-
16-
# movies
17-
*.vqa
18-
19-
# archives
20-
*.mix
21-
22-
# binaries
23-
mods/*/*.dll
24-
mods/*/*.mdb
25-
mods/*/*.pdb
26-
/*.dll
27-
/*.dll.config
28-
/*.so
29-
/*.dylib
30-
/*.pdb
31-
/*.mdb
32-
/*.exe
33-
thirdparty/download/*
34-
*.mmdb.gz
35-
36-
# backup files by various editors
37-
*~
38-
*.orig
39-
\#*
40-
.*.sw?
41-
42-
# Monodevelop
43-
*.pidb
44-
*.userprefs
45-
46-
# Mac OS X
47-
.DS_Store
48-
49-
# XCode
50-
packaging/osx/launcher/build/
51-
packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
52-
packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
53-
packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
54-
temp.c
55-
temp.o
56-
temp.s
57-
OpenRA.Launcher.Mac/build/
58-
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
59-
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
60-
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
61-
*.resources
62-
63-
# auto-generated documentation
64-
DOCUMENTATION.md
65-
WEAPONS.md
66-
Lua-API.md
67-
Settings.md
68-
*.html
69-
openra.6
70-
update.log
71-
72-
# StyleCop
73-
*.Cache
74-
StyleCopViolations.xml
75-
76-
# SublimeText
77-
*.sublime-project
78-
*.sublime-workspace
79-
80-
# NUnit
81-
/TestResult.xml
82-
/lib/
83-
84-
# Support directory
85-
/Support
86-
87-
# IntelliJ files
1+
# Visual Studio
2+
Release
3+
bin
4+
obj
5+
*.ncb
6+
*.vcproj*
7+
*.suo
8+
*.user
9+
*.sln.cache
10+
*.manifest
11+
*.CodeAnalysisLog.xml
12+
*.lastcodeanalysissucceeded
13+
_ReSharper.*/
14+
/.vs
15+
16+
# movies
17+
*.vqa
18+
19+
# archives
20+
*.mix
21+
22+
# binaries
23+
mods/*/*.dll
24+
mods/*/*.mdb
25+
mods/*/*.pdb
26+
/*.dll
27+
/*.dll.config
28+
/*.so
29+
/*.dylib
30+
/*.pdb
31+
/*.mdb
32+
/*.exe
33+
thirdparty/download/*
34+
*.mmdb.gz
35+
36+
# backup files by various editors
37+
*~
38+
*.orig
39+
\#*
40+
.*.sw?
41+
42+
# Monodevelop
43+
*.pidb
44+
*.userprefs
45+
46+
# Mac OS X
47+
.DS_Store
48+
49+
# XCode
50+
packaging/osx/launcher/build/
51+
packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
52+
packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
53+
packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
54+
temp.c
55+
temp.o
56+
temp.s
57+
OpenRA.Launcher.Mac/build/
58+
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
59+
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
60+
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
61+
*.resources
62+
63+
# auto-generated documentation
64+
DOCUMENTATION.md
65+
WEAPONS.md
66+
Lua-API.md
67+
Settings.md
68+
*.html
69+
openra.6
70+
update.log
71+
72+
# StyleCop
73+
*.Cache
74+
StyleCopViolations.xml
75+
76+
# SublimeText
77+
*.sublime-project
78+
*.sublime-workspace
79+
80+
# NUnit
81+
/TestResult.xml
82+
/lib/
83+
84+
# Support directory
85+
/Support
86+
87+
# IntelliJ files
8888
.idea

AUTHORS

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Also thanks to:
4444
* Chris Grant (Unit158)
4545
* clem
4646
* Cody Brittain (Generalcamo)
47-
* Constantin Helmig (CH4Code)
47+
* Constantin Helmig (CH4Code)
4848
* D2k Sardaukar
4949
* D'Arcy Rush (r34ch)
5050
* Daniel Derejvanik (Harisson)

OpenRA.Game.exe.config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<configuration>
3-
<runtime>
4-
<loadFromRemoteSources enabled="true" />
5-
</runtime>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<runtime>
4+
<loadFromRemoteSources enabled="true" />
5+
</runtime>
66
</configuration>

OpenRA.Test/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

OpenRA.Utility.exe.config

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="12.0.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="12.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
1111
</configuration>

OpenRA.sln.DotSettings

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
22
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
33
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
44
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>

appveyor.yml

+77-77
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
version: 1.0.{build}
2-
3-
environment:
4-
CoverityProjectToken:
5-
secure: BYP5qnptMazSCwTwgiFHlfqZd7BM3bwTRq2Cbs++ofg=
6-
CoverityNotificationEmail:
7-
secure: 0kyu0t8QwQYUQzqguVJP3N+VpEDfET2ArP+JNnOsUELJQvH8qbeQzPTM0ga0ek5G
8-
9-
install:
10-
11-
cache:
12-
- thirdparty\download -> thirdparty\fetch-thirdparty-deps.ps1
13-
14-
before_build:
15-
- make dependencies
16-
17-
build:
18-
project: OpenRA.sln
19-
verbosity: minimal
20-
21-
after_build:
22-
- ps: |
23-
if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True")
24-
{
25-
cov-build.exe --dir cov-int make all
26-
nuget.exe install PublishCoverity -ExcludeVersion
27-
PublishCoverity\tools\PublishCoverity.exe compress -o coverity.zip -i cov-int
28-
$version = Get-Date -format s
29-
PublishCoverity\tools\PublishCoverity.exe publish `
30-
-t "$env:CoverityProjectToken" `
31-
-e "$env:CoverityNotificationEmail" `
32-
-r "$env:APPVEYOR_REPO_NAME" `
33-
-z coverity.zip `
34-
-d "AppVeyor scheduled build ($env:APPVEYOR_BUILD_VERSION)." `
35-
--codeVersion "$version"
36-
}
37-
38-
before_test:
39-
- ps: |
40-
if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True")
41-
{
42-
choco install resharper-clt -y
43-
dupFinder /output=dupReport.xml /show-text OpenRA.sln
44-
choco install xmlstarlet -y
45-
xml transform dupFinder.xslt dupReport.xml > dupReport.html
46-
choco install pandoc -y
47-
}
48-
49-
test_script:
50-
- nunit3-console OpenRA.Test.dll --result=myresults.xml;format=AppVeyor
51-
52-
after_test:
53-
- appveyor DownloadFile "https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md" -FileName Changelog.md
54-
- make docs
55-
- ps: dir *.md | % {gc $_ -Raw | .\ConvertFrom-Markdown.ps1 | Out-File -FilePath "$($_.Name.TrimEnd(".md")).html"}
56-
- ps: (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs.in").replace('DISPLAY_NAME', 'Red Alert').replace('MOD_ID', 'ra').replace('FAQ_URL', 'http://wiki.openra.net/FAQ') | Set-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs"
57-
- ps: csc.exe /noconfig /platform:x86 /reference:System.dll /reference:System.Core.dll /reference:System.Drawing.dll /reference:System.Windows.Forms.dll /reference:"${env:APPVEYOR_BUILD_FOLDER}\OpenRA.Game.exe" /out:"${env:APPVEYOR_BUILD_FOLDER}\RedAlert.exe" /win32icon:"${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\RedAlert.ico" /target:winexe ${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs
58-
- ps: (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs.in").replace('DISPLAY_NAME', 'Tiberian Dawn').replace('MOD_ID', 'cnc').replace('FAQ_URL', 'http://wiki.openra.net/FAQ') | Set-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs"
59-
- ps: csc.exe /noconfig /platform:x86 /reference:System.dll /reference:System.Core.dll /reference:System.Drawing.dll /reference:System.Windows.Forms.dll /reference:"${env:APPVEYOR_BUILD_FOLDER}\OpenRA.Game.exe" /out:"${env:APPVEYOR_BUILD_FOLDER}\TiberianDawn.exe" /win32icon:"${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\TiberianDawn.ico" /target:winexe ${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs
60-
- ps: (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs.in").replace('DISPLAY_NAME', 'Dune 2000').replace('MOD_ID', 'd2k').replace('FAQ_URL', 'http://wiki.openra.net/FAQ') | Set-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs"
61-
- ps: csc.exe /noconfig /platform:x86 /reference:System.dll /reference:System.Core.dll /reference:System.Drawing.dll /reference:System.Windows.Forms.dll /reference:"${env:APPVEYOR_BUILD_FOLDER}\OpenRA.Game.exe" /out:"${env:APPVEYOR_BUILD_FOLDER}\Dune2000.exe" /win32icon:"${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\Dune2000.ico" /target:winexe ${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs
62-
- ps: cp packaging\windows\OpenRA.ico .
63-
- ps: cp packaging\windows\RedAlert.ico .
64-
- ps: cp packaging\windows\TiberianDawn.ico .
65-
- ps: cp packaging\windows\Dune2000.ico .
66-
- if defined APPVEYOR_REPO_TAG_NAME set VERSION=%APPVEYOR_REPO_TAG_NAME%
67-
- if not defined APPVEYOR_REPO_TAG_NAME set VERSION=%APPVEYOR_REPO_COMMIT:~0,7%
68-
- '"C:\Program Files (x86)\NSIS\makensis.exe" /DSRCDIR="%APPVEYOR_BUILD_FOLDER%" /DDEPSDIR="%APPVEYOR_BUILD_FOLDER%\thirdparty\download\windows" /DTAG="git-%VERSION%" /DSUFFIX=" (dev)" /V3 packaging/windows/OpenRA.nsi'
69-
- move /Y %APPVEYOR_BUILD_FOLDER%\packaging\windows\OpenRA.Setup.exe %APPVEYOR_BUILD_FOLDER%\OpenRA-%VERSION%.exe
70-
71-
artifacts:
72-
- path: OpenRA-$(VERSION).exe
73-
name: Installer
74-
- path: coverity.zip
75-
name: Coverity Build
76-
- path: dupReport.html
77-
name: dupFinder Report
1+
version: 1.0.{build}
2+
3+
environment:
4+
CoverityProjectToken:
5+
secure: BYP5qnptMazSCwTwgiFHlfqZd7BM3bwTRq2Cbs++ofg=
6+
CoverityNotificationEmail:
7+
secure: 0kyu0t8QwQYUQzqguVJP3N+VpEDfET2ArP+JNnOsUELJQvH8qbeQzPTM0ga0ek5G
8+
9+
install:
10+
11+
cache:
12+
- thirdparty\download -> thirdparty\fetch-thirdparty-deps.ps1
13+
14+
before_build:
15+
- make dependencies
16+
17+
build:
18+
project: OpenRA.sln
19+
verbosity: minimal
20+
21+
after_build:
22+
- ps: |
23+
if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True")
24+
{
25+
cov-build.exe --dir cov-int make all
26+
nuget.exe install PublishCoverity -ExcludeVersion
27+
PublishCoverity\tools\PublishCoverity.exe compress -o coverity.zip -i cov-int
28+
$version = Get-Date -format s
29+
PublishCoverity\tools\PublishCoverity.exe publish `
30+
-t "$env:CoverityProjectToken" `
31+
-e "$env:CoverityNotificationEmail" `
32+
-r "$env:APPVEYOR_REPO_NAME" `
33+
-z coverity.zip `
34+
-d "AppVeyor scheduled build ($env:APPVEYOR_BUILD_VERSION)." `
35+
--codeVersion "$version"
36+
}
37+
38+
before_test:
39+
- ps: |
40+
if ($env:APPVEYOR_SCHEDULED_BUILD -eq "True")
41+
{
42+
choco install resharper-clt -y
43+
dupFinder /output=dupReport.xml /show-text OpenRA.sln
44+
choco install xmlstarlet -y
45+
xml transform dupFinder.xslt dupReport.xml > dupReport.html
46+
choco install pandoc -y
47+
}
48+
49+
test_script:
50+
- nunit3-console OpenRA.Test.dll --result=myresults.xml;format=AppVeyor
51+
52+
after_test:
53+
- appveyor DownloadFile "https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md" -FileName Changelog.md
54+
- make docs
55+
- ps: dir *.md | % {gc $_ -Raw | .\ConvertFrom-Markdown.ps1 | Out-File -FilePath "$($_.Name.TrimEnd(".md")).html"}
56+
- ps: (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs.in").replace('DISPLAY_NAME', 'Red Alert').replace('MOD_ID', 'ra').replace('FAQ_URL', 'http://wiki.openra.net/FAQ') | Set-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs"
57+
- ps: csc.exe /noconfig /platform:x86 /reference:System.dll /reference:System.Core.dll /reference:System.Drawing.dll /reference:System.Windows.Forms.dll /reference:"${env:APPVEYOR_BUILD_FOLDER}\OpenRA.Game.exe" /out:"${env:APPVEYOR_BUILD_FOLDER}\RedAlert.exe" /win32icon:"${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\RedAlert.ico" /target:winexe ${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs
58+
- ps: (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs.in").replace('DISPLAY_NAME', 'Tiberian Dawn').replace('MOD_ID', 'cnc').replace('FAQ_URL', 'http://wiki.openra.net/FAQ') | Set-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs"
59+
- ps: csc.exe /noconfig /platform:x86 /reference:System.dll /reference:System.Core.dll /reference:System.Drawing.dll /reference:System.Windows.Forms.dll /reference:"${env:APPVEYOR_BUILD_FOLDER}\OpenRA.Game.exe" /out:"${env:APPVEYOR_BUILD_FOLDER}\TiberianDawn.exe" /win32icon:"${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\TiberianDawn.ico" /target:winexe ${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs
60+
- ps: (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs.in").replace('DISPLAY_NAME', 'Dune 2000').replace('MOD_ID', 'd2k').replace('FAQ_URL', 'http://wiki.openra.net/FAQ') | Set-Content "${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs"
61+
- ps: csc.exe /noconfig /platform:x86 /reference:System.dll /reference:System.Core.dll /reference:System.Drawing.dll /reference:System.Windows.Forms.dll /reference:"${env:APPVEYOR_BUILD_FOLDER}\OpenRA.Game.exe" /out:"${env:APPVEYOR_BUILD_FOLDER}\Dune2000.exe" /win32icon:"${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\Dune2000.ico" /target:winexe ${env:APPVEYOR_BUILD_FOLDER}\packaging\windows\WindowsLauncher.cs
62+
- ps: cp packaging\windows\OpenRA.ico .
63+
- ps: cp packaging\windows\RedAlert.ico .
64+
- ps: cp packaging\windows\TiberianDawn.ico .
65+
- ps: cp packaging\windows\Dune2000.ico .
66+
- if defined APPVEYOR_REPO_TAG_NAME set VERSION=%APPVEYOR_REPO_TAG_NAME%
67+
- if not defined APPVEYOR_REPO_TAG_NAME set VERSION=%APPVEYOR_REPO_COMMIT:~0,7%
68+
- '"C:\Program Files (x86)\NSIS\makensis.exe" /DSRCDIR="%APPVEYOR_BUILD_FOLDER%" /DDEPSDIR="%APPVEYOR_BUILD_FOLDER%\thirdparty\download\windows" /DTAG="git-%VERSION%" /DSUFFIX=" (dev)" /V3 packaging/windows/OpenRA.nsi'
69+
- move /Y %APPVEYOR_BUILD_FOLDER%\packaging\windows\OpenRA.Setup.exe %APPVEYOR_BUILD_FOLDER%\OpenRA-%VERSION%.exe
70+
71+
artifacts:
72+
- path: OpenRA-$(VERSION).exe
73+
name: Installer
74+
- path: coverity.zip
75+
name: Coverity Build
76+
- path: dupReport.html
77+
name: dupFinder Report

0 commit comments

Comments
 (0)