diff --git a/.travis.yml b/.travis.yml index bc4b4b8f04..1d9d2612f0 100644 --- a/.travis.yml +++ b/.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 diff --git a/Makefile b/Makefile index de56436cef..384e550d12 100644 --- a/Makefile +++ b/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 \ diff --git a/configure b/configure index 0b9115a4e7..56314d9d51 100755 --- a/configure +++ b/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 \ No newline at end of file diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 32dea3f898..112a0380cf 100755 --- a/packaging/linux/buildpackage.sh +++ b/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 - diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index b68226179d..2590547d54 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -3,7 +3,7 @@ Version: {VERSION} Architecture: all Maintainer: Chris Forbes 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/ diff --git a/packaging/linux/deb/Eluant.dll.config b/packaging/linux/deb/Eluant.dll.config new file mode 100644 index 0000000000..e1edf62646 --- /dev/null +++ b/packaging/linux/deb/Eluant.dll.config @@ -0,0 +1,3 @@ + + + diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh index 3c996297ae..a843c0fff2 100755 --- a/packaging/linux/deb/buildpackage.sh +++ b/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/" diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD deleted file mode 100644 index dee32b3df8..0000000000 --- a/packaging/linux/pkgbuild/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Matthew Bowra-Dean -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/ -} - diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh deleted file mode 100755 index d7ef8f92c8..0000000000 --- a/packaging/linux/pkgbuild/buildpackage.sh +++ /dev/null @@ -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 - diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh deleted file mode 100755 index d678b24a12..0000000000 --- a/packaging/linux/rpm/buildpackage.sh +++ /dev/null @@ -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 diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec deleted file mode 100644 index d7ad7261f7..0000000000 --- a/packaging/linux/rpm/openra.spec +++ /dev/null @@ -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 -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 diff --git a/packaging/package-all.sh b/packaging/package-all.sh index cc8319e9e8..ba5833bd5f 100755 --- a/packaging/package-all.sh +++ b/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 diff --git a/thirdparty/linux/Eluant.dll.config b/thirdparty/linux/Eluant.dll.config deleted file mode 100644 index 5e2566f319..0000000000 --- a/thirdparty/linux/Eluant.dll.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/thirdparty/linux/SDL2-CS.dll.config b/thirdparty/linux/SDL2-CS.dll.config deleted file mode 100644 index 85bfbbec94..0000000000 --- a/thirdparty/linux/SDL2-CS.dll.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/thirdparty/linux/libSDL232.2.0.2.so b/thirdparty/linux/libSDL232.2.0.2.so deleted file mode 100755 index bc1b543bf4..0000000000 Binary files a/thirdparty/linux/libSDL232.2.0.2.so and /dev/null differ diff --git a/thirdparty/linux/libSDL264.2.0.2.so b/thirdparty/linux/libSDL264.2.0.2.so deleted file mode 100755 index 50e49f85d6..0000000000 Binary files a/thirdparty/linux/libSDL264.2.0.2.so and /dev/null differ diff --git a/thirdparty/linux/liblua32.5.1.5.so b/thirdparty/linux/liblua32.5.1.5.so deleted file mode 100644 index 89f88a4051..0000000000 Binary files a/thirdparty/linux/liblua32.5.1.5.so and /dev/null differ diff --git a/thirdparty/linux/liblua64.5.1.5.so b/thirdparty/linux/liblua64.5.1.5.so deleted file mode 100644 index cc94bfac38..0000000000 Binary files a/thirdparty/linux/liblua64.5.1.5.so and /dev/null differ