Merge pull request #5190 from pchote/new-lua

New Lua API.

packaging/linux/buildpackage.sh

@@ -1,24 +1,29 @@
 #!/bin/bash
 # OpenRA packaging master script for linux packages
 
-if [ $# -ne "3" ]; then
-	echo "Usage: `basename $0` version files-dir outputdir"
+if [ $# -ne "4" ]; then
+	echo "Usage: `basename $0` tag files-dir platform-files-dir outputdir"
     exit 1
 fi
 
 TAG=$1
 VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
 BUILTDIR=$2
-PACKAGEDIR=$3
+DEPSDIR=$3
+PACKAGEDIR=$4
 ROOTDIR=root
 
 # Clean up
 rm -rf $ROOTDIR
 
 cd ../..
+
 # Copy files for OpenRA.Game.exe and OpenRA.Editor.exe as well as all dependencies.
 make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
+# Native library dependencies
+cp "$DEPSDIR"/* "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3
+
 # Launch scripts (executed by Desura)
 cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3
 

packaging/linux/deb/DEBIAN/control

@@ -3,7 +3,7 @@ Version: {VERSION}
 Architecture: all
 Maintainer: Chris Forbes <chrisf@ijw.co.nz>
 Installed-Size: {SIZE}
-Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri
+Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri
 Section: games
 Priority: extra
 Homepage: http://www.open-ra.org/

packaging/osx/buildpackage.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 # OpenRA packaging script for Mac OSX
 
-if [ $# -ne "3" ]; then
-	echo "Usage: `basename $0` tag files-dir outputdir"
+if [ $# -ne "4" ]; then
+	echo "Usage: `basename $0` tag files-dir platform-files-dir outputdir"
     exit 1
 fi
 
@@ -13,9 +13,8 @@ if [ -e "OpenRA.app" ]; then
 fi
 
 # Copy the template to build the game package
-# Assumes it is layed out with the correct directory structure
 cp -rv template.app OpenRA.app
-cp -rv $2/* "OpenRA.app/Contents/Resources/" || exit 3
+cp -rv $2/* $3/* "OpenRA.app/Contents/Resources/" || exit 3
 
 # Icon isn't used, and editor doesn't work.
 rm OpenRA.app/Contents/Resources/OpenRA.ico
@@ -34,5 +33,5 @@ rm temp
 
 # Package app bundle into a zip and clean up
 zip OpenRA-$1 -r -9 OpenRA.app
-mv OpenRA-$1.zip $3
+mv OpenRA-$1.zip $4
 rm -rf OpenRA.app

packaging/package-all.sh

@@ -30,7 +30,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html
 # List of files that are packaged on all platforms
 FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
 'OpenRA.Renderer.SdlCommon.dll' 'OpenRA.Renderer.Sdl2.dll' 'OpenRA.Renderer.Cg.dll' 'OpenRA.Renderer.Gl.dll' 'OpenRA.Renderer.Null.dll' 'OpenRA.Irc.dll' \
-'FreeSans.ttf' 'FreeSansBold.ttf' \
+'FreeSans.ttf' 'FreeSansBold.ttf' 'lua' \
 'cg' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \
 'AUTHORS' 'COPYING' \
 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \
@@ -59,10 +59,13 @@ cp thirdparty/SDL2-CS* packaging/built
 # Mono.NAT for UPnP support
 cp thirdparty/Mono.Nat.dll packaging/built
 
-# Lua
+# (legacy) Lua
 cp thirdparty/KopiLua.dll packaging/built
 cp thirdparty/NLua.dll packaging/built
 
+# Eluant (new lua)
+cp thirdparty/Eluant* packaging/built
+
 # GeoIP database access
 cp thirdparty/MaxMind.Db.dll packaging/built
 cp thirdparty/MaxMind.GeoIP2.dll packaging/built
@@ -81,7 +84,7 @@ echo "Creating packages..."
 
 (
     cd windows
-    makensis -DSRCDIR="$BUILTDIR" OpenRA.nsi &> package.log
+    makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi &> package.log
     if [ $? -eq 0 ]; then
         mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
     else
@@ -91,7 +94,7 @@ echo "Creating packages..."
 
 (
     cd osx
-    sh buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" &> package.log
+    sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR" &> package.log
     if [ $? -ne 0 ]; then
         echo "OS X package build failed, refer to osx/package.log."
     fi
@@ -99,7 +102,7 @@ echo "Creating packages..."
 
 (
     cd linux
-    sh buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" &> package.log
+    sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR" &> package.log
     if [ $? -ne 0 ]; then
         echo "Linux package build failed, refer to linux/package.log."
     fi

packaging/update-wiki.sh

@@ -2,7 +2,14 @@ echo "Updating https://github.com/OpenRA/OpenRA/wiki/Traits"
 rm -rf openra-wiki
 git clone git@github.com:OpenRA/OpenRA.wiki.git openra-wiki
 cp -fr ../DOCUMENTATION.md openra-wiki/Traits.md
+
+pushd .. &> /dev/null
+# d2k depends on all mod libraries
+mono --debug OpenRA.Utility.exe --lua-docs d2k > packaging/openra-wiki/New-Lua-API.md
+popd &> /dev/null
+
 cd openra-wiki
 git add Traits.md
-git commit -m "Update trait documentation"
+git add New-Lua-API.md
+git commit -m "Update trait and scripting documentation"
 git push origin master

packaging/windows/OpenRA.nsi

@@ -92,10 +92,14 @@ Section "Game" GAME
 	File "${SRCDIR}\GeoLite2-Country.mmdb"
 	File "${SRCDIR}\KopiLua.dll"
 	File "${SRCDIR}\NLua.dll"
-	File OpenAL32.dll
-	File SDL.dll
-	File freetype6.dll
-	File zlib1.dll
+	File "${SRCDIR}\eluant.dll"
+	File "${DEPSDIR}\OpenAL32.dll"
+	File "${DEPSDIR}\SDL.dll"
+	File "${DEPSDIR}\freetype6.dll"
+	File "${DEPSDIR}\zlib1.dll"
+	File "${DEPSDIR}\lua51.dll"
+	SetOutPath "$INSTDIR\lua"
+	File "${SRCDIR}\lua\*.lua"
 
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
@@ -182,6 +186,7 @@ Function ${UN}Clean
 	RMDir /r $INSTDIR\maps
 	RMDir /r $INSTDIR\cg
 	RMDir /r $INSTDIR\glsl
+	RMDir /r $INSTDIR\lua
 	Delete $INSTDIR\OpenRA.Launcher.exe
 	Delete $INSTDIR\OpenRA.Game.exe
 	Delete $INSTDIR\OpenRA.Utility.exe
@@ -214,6 +219,8 @@ Function ${UN}Clean
 	Delete $INSTDIR\NLua.dll
 	Delete $INSTDIR\OpenAL32.dll
 	Delete $INSTDIR\SDL.dll
+	Delete $INSTDIR\lua51.dll
+	Delete $INSTDIR\eluant.dll
 	Delete $INSTDIR\freetype6.dll
 	Delete $INSTDIR\zlib1.dll
 	RMDir /r $INSTDIR\Support