Remove old Lua/LuaInterface installation/packaging

AUTHORS

@@ -69,9 +69,6 @@ Also thanks to:
 Using GeoLite data created by MaxMind and
 distributed under the CC BY-SA 3.0 license.
 
-Using MonoBoxedLua created by Sparklin Labs
-and distributed under the MIT license.
-
 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic
 games which OpenRA aims to reimagine.

Makefile

@@ -65,7 +65,7 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = fileformats rcg rgl rsdl rnull game utility geoip irc lua
+CORE = fileformats rcg rgl rsdl rnull game utility geoip irc
 TOOLS = editor tsbuild ralint
 
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
@@ -107,14 +107,6 @@ irc_LIBS			= $(COMMON_LIBS) $(irc_DEPS)
 PROGRAMS			+= irc
 irc: $(irc_TARGET)
 
-lua_SRCS			:= $(shell find LuaInterface/ -name '*.cs')
-lua_TARGET			= LuaInterface.dll
-lua_KIND			= library
-lua_DEPS			= $(fileformats_TARGET)
-lua_LIBS			= $(COMMON_LIBS) $(lua_DEPS)
-PROGRAMS			+= lua
-lua: $(lua_TARGET)
-
 # Renderer dlls
 rsdl_SRCS			:= $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
 rsdl_TARGET			= OpenRA.Renderer.SdlCommon.dll
@@ -159,8 +151,8 @@ STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
 mod_ra_SRCS			:= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
 mod_ra_TARGET			= mods/ra/OpenRA.Mods.RA.dll
 mod_ra_KIND			= library
-mod_ra_DEPS			= $(STD_MOD_DEPS) $(geoip_TARGET) $(irc_TARGET) $(lua_TARGET)
+mod_ra_DEPS			= $(STD_MOD_DEPS) $(geoip_TARGET) $(irc_TARGET)
-mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS) $(geoip_TARGET) $(irc_TARGET) $(lua_TARGET)
+mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS) $(geoip_TARGET) $(irc_TARGET)
 PROGRAMS 			+= mod_ra
 mod_ra: $(mod_ra_TARGET)
 
@@ -303,8 +295,6 @@ distclean: clean
 
 dependencies:
 	@ $(CP_R) thirdparty/*.dl* .
-	@ $(CP_R) thirdparty/*.dylib .
-	@ $(CP_R) thirdparty/*.so .
 	@ $(CP_R) thirdparty/Tao/* .
 
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml
@@ -348,10 +338,6 @@ install-core: default
 	@$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)"
 	@$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll "$(DATA_INSTALL_DIR)"
-	@$(CP) thirdparty/LuaInterface.dll.config "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/liblua-linux32.so "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/liblua-linux64.so "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) thirdparty/liblua-osx.dylib "$(DATA_INSTALL_DIR)"
 
 	@echo "#!/bin/sh" 				>  openra
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra

packaging/linux/buildpackage.sh

@@ -25,9 +25,6 @@ cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3
 # Icons and .desktop files
 make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
-# Remove Mac OS X libaries
-rm -rf "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/liblua-osx.dylib" || exit 3
-
 cd packaging/linux
 
 (

packaging/osx/buildpackage.sh

@@ -21,10 +21,6 @@ cp -rv $2/* "OpenRA.app/Contents/Resources/" || exit 3
 rm OpenRA.app/Contents/Resources/OpenRA.ico
 rm OpenRA.app/Contents/Resources/OpenRA.Editor.exe
 
-# Install the stripped down Lua library
-cp ../../liblua-osx.dylib OpenRA.app/Contents/Resources/
-cp ../../LuaInterface.dll.config OpenRA.app/Contents/Resources/
-
 # SDL2 is the only supported renderer
 rm -rf OpenRA.app/Contents/Resources/cg
 rm OpenRA.app/Contents/Resources/OpenRA.Renderer.Cg.dll

packaging/package-all.sh

@@ -32,7 +32,7 @@ FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
 'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \
 'AUTHORS' 'CHANGELOG' 'COPYING' \
 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \
-'global mix database.dat' 'GeoIP.dll' 'GeoIP.dat' 'LuaInterface.dll')
+'global mix database.dat' 'GeoIP.dll' 'GeoIP.dat')
 
 echo "Copying files..."
 for i in "${FILES[@]}"; do

packaging/windows/OpenRA.nsi

@@ -83,8 +83,6 @@ Section "Game" GAME
 	File "${SRCDIR}\global mix database.dat"
 	File "${SRCDIR}\GeoIP.dll"
 	File "${SRCDIR}\GeoIP.dat"
-	File "${SRCDIR}\LuaInterface.dll"
-	File lua51.dll
 	File OpenAL32.dll
 	File SDL.dll
 	File freetype6.dll
@@ -203,8 +201,6 @@ Function ${UN}Clean
 	Delete "$INSTDIR\global mix database.dat"
 	Delete $INSTDIR\GeoIP.dat
 	Delete $INSTDIR\GeoIP.dll
-	Delete $INSTDIR\LuaInterface.dll
-	Delete $INSTDIR\lua51.dll
 	Delete $INSTDIR\OpenAL32.dll
 	Delete $INSTDIR\SDL.dll
 	Delete $INSTDIR\freetype6.dll

thirdparty/LuaInterface.dll.config

@@ -1,5 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="lua51.dll" target="liblua-linux32.so" cpu="x86" />
-  <dllmap os="linux" dll="lua51.dll" target="liblua-linux64.so" cpu="x86-64" />
-  <dllmap os="osx" dll="lua51.dll" target="liblua-osx.dylib" />
-</configuration>