Skip to content

Commit

Permalink
Remove GeoIP stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
MustaphaTR committed Mar 26, 2020
1 parent 920e348 commit 0d2f3b2
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 42 deletions.
13 changes: 4 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -302,26 +302,22 @@ cli-dependencies:
@ $(CP_R) thirdparty/download/*.dll .
@ $(CP_R) thirdparty/download/*.dll.config .

linux-dependencies: cli-dependencies geoip-dependencies linux-native-dependencies
linux-dependencies: cli-dependencies linux-native-dependencies

linux-native-dependencies:
@./thirdparty/configure-native-deps.sh

windows-dependencies: cli-dependencies geoip-dependencies
windows-dependencies: cli-dependencies
@./thirdparty/fetch-thirdparty-deps-windows.sh

osx-dependencies: cli-dependencies geoip-dependencies
osx-dependencies: cli-dependencies
@./thirdparty/fetch-thirdparty-deps-osx.sh
@ $(CP_R) thirdparty/download/osx/*.dylib .
@ $(CP_R) thirdparty/download/osx/*.dll.config .

geoip-dependencies:
@./thirdparty/fetch-geoip-db.sh
@ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .

dependencies: $(os-dependencies)

all-dependencies: cli-dependencies windows-dependencies osx-dependencies geoip-dependencies
all-dependencies: cli-dependencies windows-dependencies osx-dependencies

version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
@echo "$(VERSION)" > VERSION
Expand All @@ -343,7 +339,6 @@ install-engine:
@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"

@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
@$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
@$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
Expand Down
1 change: 0 additions & 1 deletion make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ function Dependencies-Command
cd thirdparty
./fetch-thirdparty-deps.ps1
cp download/*.dll ..
cp download/GeoLite2-Country.mmdb.gz ..
cp download/windows/*.dll ..
cd ..
echo "Dependencies copied."
Expand Down
2 changes: 0 additions & 2 deletions packaging/windows/OpenRA.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ Section "Game" GAME
File "${SRCDIR}\OpenAL-CS.dll"
File "${SRCDIR}\global mix database.dat"
File "${SRCDIR}\MaxMind.Db.dll"
File "${SRCDIR}\GeoLite2-Country.mmdb.gz"
File "${SRCDIR}\eluant.dll"
File "${SRCDIR}\rix0rrr.BeaconLib.dll"
File "${DEPSDIR}\soft_oal.dll"
Expand Down Expand Up @@ -242,7 +241,6 @@ Function ${UN}Clean
Delete $INSTDIR\Dune2000.ico
Delete "$INSTDIR\global mix database.dat"
Delete $INSTDIR\MaxMind.Db.dll
Delete $INSTDIR\GeoLite2-Country.mmdb.gz
Delete $INSTDIR\KopiLua.dll
Delete $INSTDIR\soft_oal.dll
Delete $INSTDIR\SDL2.dll
Expand Down
22 changes: 0 additions & 22 deletions thirdparty/fetch-geoip-db.sh

This file was deleted.

2 changes: 1 addition & 1 deletion thirdparty/fetch-thirdparty-deps-osx.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

LAUNCHER_TAG="osx-launcher-20171118"
LAUNCHER_TAG="osx-launcher-20181118"

download_dir="${0%/*}/download/osx"
mkdir -p "$download_dir"
Expand Down
7 changes: 0 additions & 7 deletions thirdparty/fetch-thirdparty-deps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,6 @@ if (!(Test-Path "rix0rrr.BeaconLib.dll"))
rmdir rix0rrr.BeaconLib -Recurse
}

if (!(Test-Path "GeoLite2-Country.mmdb.gz") -Or (((get-date) - (get-item "GeoLite2-Country.mmdb.gz").LastWriteTime) -gt (new-timespan -days 30)))
{
echo "Updating GeoIP country database from MaxMind."
$target = Join-Path $pwd.ToString() "GeoLite2-Country.mmdb.gz"
(New-Object System.Net.WebClient).DownloadFile("http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.mmdb.gz", $target)
}

[Net.ServicePointManager]::SecurityProtocol = 'Tls12'

if (!(Test-Path "SDL2-CS.dll"))
Expand Down

0 comments on commit 0d2f3b2

Please sign in to comment.