diff --git a/.travis.yml b/.travis.yml
index 755df06a7a..90a7b94a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ addons:
- lua5.1
- dpkg
- zsync
- - markdown
- imagemagick
# Environment variables
diff --git a/ConvertFrom-Markdown.ps1 b/ConvertFrom-Markdown.ps1
deleted file mode 100644
index 38a8ed9b90..0000000000
--- a/ConvertFrom-Markdown.ps1
+++ /dev/null
@@ -1,65 +0,0 @@
-<#
-.SYNOPSIS
- Converts Markdown formatted text to HTML.
-.DESCRIPTION
- Converts Markdown formatted text to HTML using the Github API. Output is "flavored" depending on
- the chosen mode. The default output flavor is 'Markdown' and includes Syntax highlighting and
- Github stylesheets.
-
- Based on the Ruby version by Brett Terpstra:
- http://brettterpstra.com/easy-command-line-github-flavored-markdown/
-
- About Markdown: http://daringfireball.net/projects/markdown/
-#>
-function ConvertFrom-Markdown {
- [CmdletBinding()]
- Param
- (
- [Parameter(Mandatory=$true, ValueFromPipeline=$true, Position=0)]
- [PSObject[]]$InputObject
- )
-
- Begin
- {
- $URL = "https://api.github.com/markdown"
- }
-
- Process
- {
- Foreach ($item in $InputObject)
- {
- $object = New-Object -TypeName psobject
- $object | Add-Member -MemberType NoteProperty -Name 'text' -Value ($item | Out-String)
- $object | Add-Member -MemberType NoteProperty -Name 'mode' -Value 'markdown'
-
- $response = Invoke-WebRequest -Method Post -Uri $url -Body ($object | ConvertTo-Json)
-
- if ($response.StatusCode -eq "200")
- {
- $HtmlOutput =
- @"
-
-
-
-
-
-
-
-
- $($response.Content)
-
-
-
-"@
-
- Write-Output $HtmlOutput
- }
- else
- {
- "Error: $($response.StatusCode)"
- }
- }
- }
-}
diff --git a/appveyor.yml b/appveyor.yml
index e26422c500..bf0dbc40bc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,9 +17,6 @@ test_script:
after_test:
- appveyor DownloadFile "https://download.ip2location.com/lite/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP" -FileName IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
- - appveyor DownloadFile "https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md" -FileName Changelog.md
- - make docs
- - ps: dir *.md | % {gc $_ -Raw | .\ConvertFrom-Markdown.ps1 | Out-File -FilePath "$($_.Name.TrimEnd(".md")).html"}
- pip install Pillow
- python -c "from PIL import Image; i = Image.open('packaging/artwork/ra_256x256.png'); i.save('ra.ico')"
- python -c "from PIL import Image; i = Image.open('packaging/artwork/cnc_256x256.png'); i.save('cnc.ico')"
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 4e3ab64872..0faa932f72 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -140,9 +140,6 @@ Section "Game" GAME
File "${SRCDIR}\VERSION"
File "${SRCDIR}\AUTHORS"
File "${SRCDIR}\COPYING"
- File "${SRCDIR}\README.html"
- File "${SRCDIR}\CHANGELOG.html"
- File "${SRCDIR}\CONTRIBUTING.html"
File "${SRCDIR}\ra.ico"
File "${SRCDIR}\cnc.ico"
File "${SRCDIR}\d2k.ico"
@@ -230,7 +227,6 @@ Section "-Uninstaller"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "DisplayIcon" "$INSTDIR\ra.ico"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "Publisher" "OpenRA developers"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "URLInfoAbout" "http://openra.net"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "Readme" "$INSTDIR\README.html"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "DisplayVersion" "${TAG}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "NoModify" "1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA${SUFFIX}" "NoRepair" "1"
@@ -260,9 +256,6 @@ Function ${UN}Clean
Delete $INSTDIR\VERSION
Delete $INSTDIR\AUTHORS
Delete $INSTDIR\COPYING
- Delete $INSTDIR\README.html
- Delete $INSTDIR\CHANGELOG.html
- Delete $INSTDIR\CONTRIBUTING.html
Delete $INSTDIR\ra.ico
Delete $INSTDIR\cnc.ico
Delete $INSTDIR\d2k.ico
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index a1f48bee55..683341e304 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -1,7 +1,6 @@
#!/bin/bash
command -v curl >/dev/null 2>&1 || { echo >&2 "Windows packaging requires curl."; exit 1; }
-command -v markdown >/dev/null 2>&1 || { echo >&2 "Windows packaging requires markdown."; exit 1; }
command -v makensis >/dev/null 2>&1 || { echo >&2 "Windows packaging requires makensis."; exit 1; }
command -v convert >/dev/null 2>&1 || { echo >&2 "Windows packaging requires ImageMagick."; exit 1; }
@@ -81,13 +80,6 @@ function build_platform()
makelauncher "Dune2000.exe" "Dune 2000" "d2k" ${PLATFORM}
cp "${SRCDIR}/OpenRA.Game.exe.config" "${BUILTDIR}"
- curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md
- markdown Changelog.md > "${BUILTDIR}/CHANGELOG.html"
- rm Changelog.md
-
- markdown "${SRCDIR}/README.md" > "${BUILTDIR}/README.html"
- markdown "${SRCDIR}/CONTRIBUTING.md" > "${BUILTDIR}/CONTRIBUTING.html"
-
echo "Building Windows setup.exe ($1)"
makensis -V2 -DSRCDIR="${BUILTDIR}" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" ${USE_PROGRAMFILES32} OpenRA.nsi
if [ $? -eq 0 ]; then