Merge pull request #6950 from pchote/retire-packaging

Closes #6480

.travis.yml

@@ -16,7 +16,7 @@ cache: apt
 # Run the build script
 # call RALint to check for YAML errors
 script:
- - make dependencies
+ - make cli-dependencies
  - make all
  - make test
 
@@ -43,12 +43,7 @@ notifications:
     skip_join: true
 
 before_deploy:
- - sudo apt-get install nsis markdown dpkg rpm libarchive-dev m4 fakeroot bsdtar
- - wget ftp://ftp.archlinux.org/other/pacman/pacman-4.0.3.tar.gz -O /tmp/pacman-4.0.3.tar.gz
- - pushd /tmp
- - tar -xzvf pacman-4.0.3.tar.gz
- - cd pacman-4.0.3 && ./configure --disable-doc --prefix=/usr && make && sudo make install
- - popd
+ - sudo apt-get install nsis markdown dpkg
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
@@ -61,8 +56,6 @@ deploy:
     - build/OpenRA-${TRAVIS_TAG}.exe
     - build/OpenRA-${TRAVIS_TAG}.zip
     - build/openra_${DOTVERSION}_all.deb
-    - build/openra-${DOTVERSION}-1-any.pkg.tar.gz
-    - build/openra-${DOTVERSION}-1.noarch.rpm
   skip_cleanup: true
   on:
     all_branches: true

Makefile

@@ -258,7 +258,7 @@ core: game renderers mods utility ralint
 
 tools: editor tsbuild gamemonitor
 
-package: dependencies core editor gamemonitor docs version
+package: cli-dependencies core editor gamemonitor docs version
 
 mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
 
@@ -270,11 +270,6 @@ clean:
 
 distclean: clean
 
-platformdeps = "linux"
-ifeq ($(shell uname),Darwin)
-	platformdeps = "osx"
-endif
-
 dependencies: cli-dependencies native-dependencies
 
 cli-dependencies:
@@ -282,7 +277,7 @@ cli-dependencies:
 	@ $(CP_R) thirdparty/*.dll.config .
 
 native-dependencies:
-	@ $(CP_R) thirdparty/${platformdeps}/* .
+	@./configure
 
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
 	@for i in $? ; do \

configure

@@ -21,4 +21,7 @@ if [ "$os" == 'Linux' ]; then
 		sed "s/@LIBLUA51@/${liblua51}/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
 		echo "Eluant.dll.config has been created successfully."
 	fi
+elif [ "$os" == 'Darwin' ]; then
+	cp thirdparty/osx/* .
+	echo "Copied Lua 5.1 and SDL2 libraries successfully."
 fi

packaging/linux/buildpackage.sh

@@ -1,16 +1,15 @@
 #!/bin/bash
 # OpenRA packaging master script for linux packages
 
-if [ $# -ne "4" ]; then
-	echo "Usage: `basename $0` tag files-dir platform-files-dir outputdir"
+if [ $# -ne "3" ]; then
+	echo "Usage: `basename $0` tag files-dir outputdir"
     exit 1
 fi
 
 TAG=$1
 VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
 BUILTDIR=$2
-DEPSDIR=$3
-PACKAGEDIR=$4
+PACKAGEDIR=$3
 ROOTDIR=root
 
 # Clean up
@@ -21,8 +20,6 @@ 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"
 
-cp $DEPSDIR/* $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/
-
 # Install startup scripts, desktop files and icons
 make install-linux-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
@@ -39,20 +36,3 @@ if [ $? -ne 0 ]; then
     echo "Debian package build failed."
 fi
 popd
-
-pushd pkgbuild
-echo "Building Arch-Linux package."
-bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
-if [ $? -ne 0 ]; then
-    echo "Arch-Linux package build failed."
-fi
-popd
-
-pushd rpm
-echo "Building RPM package."
-bash buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
-if [ $? -ne 0 ]; then
-    echo "RPM package build failed."
-fi
-popd
-

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-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri, xdg-utils, zenity
+Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-windows-forms4.0-cil, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri, xdg-utils, zenity, libsdl2 | libsdl2-2.0-0, liblua5.1-0
 Section: games
 Priority: extra
 Homepage: http://www.openra.net/

packaging/linux/deb/Eluant.dll.config

@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap os="linux" dll="lua51.dll" target="liblua5.1.so.0" />
+</configuration>

packaging/linux/deb/buildpackage.sh

@@ -21,6 +21,7 @@ VERSION="$DATE.$TYPE"
 mkdir "${DEB_BUILD_ROOT}"
 cp -R DEBIAN "${DEB_BUILD_ROOT}"
 cp -R "${LINUX_BUILD_ROOT}/usr" "${DEB_BUILD_ROOT}"
+cp -R Eluant.dll.config "${DEB_BUILD_ROOT}/${LIBDIR}/"
 
 # Binaries go in /usr/games
 mv "${DEB_BUILD_ROOT}/usr/bin/" "${DEB_BUILD_ROOT}/usr/games/"

packaging/linux/pkgbuild/PKGBUILD

@@ -1,26 +0,0 @@
-# Contributor: Matthew Bowra-Dean <matthew@ijw.co.nz>
-pkgname=openra
-pkgver={VERSION}
-pkgrel=1
-pkgdesc="Open Source rebuild of the Red Alert game engine using Mono/OpenGL."
-arch=('any')
-url="http://openra.net"
-license=('GPL3')
-groups=()
-depends=('mono' 'openal' 'mesa' 'freetype2' 'glibc' 'alsa-lib' 'xdg-utils' 'zenity')
-makedepends=('git' 'unzip' 'wget')
-optdepends=('gksu: Elevation for installing game packages on Gnome platforms'
-'kdesudo: Elevation for installing game packages on KDE platforms')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-source=()
-noextract=()
-md5sums=()
-
-build() {
-  cp -r {ROOT}/usr/ $pkgdir/
-}
-

packaging/linux/pkgbuild/buildpackage.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-E_BADARGS=85
-if [ $# -ne "3" ]
-then
-    echo "Usage: `basename $0` version root-dir outputdir"
-    exit $E_BADARGS
-fi
-
-# Replace any dashes in the version string with periods
-PKGVERSION=`echo $1 | sed "s/-/\\./g"`
-
-sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD
-rootdir=`readlink -f $2`
-sed -i "s|{ROOT}|$rootdir|" PKGBUILD
-
-makepkg --holdver --nodeps -p PKGBUILD
-if [ $? -ne 0 ]; then
-  exit 1
-fi
-
-mv openra-$PKGVERSION-1-any.pkg.tar.gz $3
-

packaging/linux/rpm/buildpackage.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-E_BADARGS=85
-if [ $# -ne "4" ]
-then
-    echo "Usage: `basename $0` version root-dir packaging-dir outputdir"
-    exit $E_BADARGS
-fi
-
-mkdir ~/rpmbuild/
-mkdir ~/rpmbuild/SPECS
-
-# Replace any dashes in the version string with periods
-PKGVERSION=`echo $1 | sed "s/-/\\./g"`
-
-sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
-rootdir=`readlink -f $2`
-sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
-
-cp openra.spec "$3/SPECS/"
-
-cd "$3"
-
-rpmbuild --target noarch --buildroot /tmp/openra/ -bb SPECS/openra.spec
-if [ $? -ne 0 ]; then
-  exit 1
-fi
-
-cd RPMS/noarch/
-mv openra-$PKGVERSION-1.noarch.rpm $4

packaging/linux/rpm/openra.spec

@@ -1,54 +0,0 @@
-%define name openra
-%define version {VERSION_FIELD}
-%define root {ROOT_DIR}
-%define _use_internal_dependency_generator 0
-%define __find_provides ""
-%define __find_requires ""
-Name: %{name}
-Version: %{version}
-Release: 1
-Summary: Open Source rebuild of the Red Alert game engine using Mono/OpenGL.
-License: GPL-3.0
-Url: http://openra.net
-Group: Amusements/Games
-Packager: Matthias Mailänder <matthias@mailaender.name>
-Requires: mono-core
-Requires: mono-winforms
-Requires: openal
-Requires: libfreetype.so.6
-Requires: libasound.so.2
-Requires: libc.so.6
-Requires: libdl.so.2
-Requires: libm.so.6
-Requires: libpthread.so.0
-Requires: librt.so.1
-Requires: xdg-utils
-Requires: zenity
-
-Prefix: /usr
-Source: %{name}-%{version}.tar.gz
-BuildRoot: /tmp/openra
-
-%description
-A reimplementation of the Command & Conquer: Red Alert game engine
-using .NET/Mono, OpenGL, OpenAL and SDL. It includes reimagninations
-of Command & Conquer: Red Alert, Command & Conquer: Tiberian Dawn
-as well as Dune 2000.
-
-%build
-
-%install
-rm -rf %{buildroot}
-cp -r %{root} %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-/usr/bin/openra
-/usr/bin/openra-editor
-/usr/lib/openra/
-/usr/share/applications/*.desktop
-/usr/share/doc/openra/*
-/usr/share/icons/hicolor/*/apps/*.png
-/usr/share/icons/hicolor/*/apps/*.svg

packaging/package-all.sh

@@ -94,7 +94,7 @@ popd
 
 pushd linux
 echo "Building Linux packages"
-bash buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
+bash buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR"
 if [ $? -ne 0 ]; then
     echo "Linux package build failed."
 fi

thirdparty/linux/Eluant.dll.config

@@ -1,4 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="lua51.dll" cpu="x86" target="liblua32.5.1.5.so" />
-  <dllmap os="linux" dll="lua51.dll" cpu="x86-64" target="liblua64.5.1.5.so" />
-</configuration>

thirdparty/linux/SDL2-CS.dll.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <dllmap os="linux" dll="SDL2.dll" cpu="x86" target="libSDL232.2.0.2.so" />
-  <dllmap os="linux" dll="SDL2.dll" cpu="x86-64" target="libSDL264.2.0.2.so" />
-
-  <dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
-
-  <dllmap dll="opengl32.dll">
-    <dllentry os="linux" dll="libGL.so.1" />
-  </dllmap>
-
-  <dllmap dll="glu32.dll">
-    <dllentry os="linux" dll="libGLU.so.1" />
-  </dllmap>
-</configuration>