From 5d2254aeee54572612c70f53b6490a35ded7d7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Oct 2013 13:04:24 +0200 Subject: [PATCH 1/4] fixed md5sum file not found global mix database.dat --- packaging/linux/deb/buildpackage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh index 74d2e6bb4a..11c74eb2b6 100755 --- a/packaging/linux/deb/buildpackage.sh +++ b/packaging/linux/deb/buildpackage.sh @@ -43,7 +43,7 @@ sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" > roo pushd root # Calculate md5sums and clean up the /usr/ part of them -md5sum `find . -type f | grep -v '^[.]/DEBIAN/'` | sed 's/\.\/usr\//usr\//g' > DEBIAN/md5sums +md5sum "`find . -type f | grep -v '^[.]/DEBIAN/'` | sed 's/\.\/usr\//usr\//g'" > DEBIAN/md5sums chmod 0644 DEBIAN/md5sums # Replace any dashes in the version string with periods From af0f8d09d620b385c47f988c26e0836ddac4746e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Oct 2013 13:10:33 +0200 Subject: [PATCH 2/4] simplify RPM buildpackage script for the build server hard-code everything outside /usr/share/openra --- packaging/linux/rpm/buildpackage.sh | 27 ++------------------------- packaging/linux/rpm/openra.spec | 6 +++++- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh index b23705c6e3..b640d3fdde 100755 --- a/packaging/linux/rpm/buildpackage.sh +++ b/packaging/linux/rpm/buildpackage.sh @@ -13,32 +13,10 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec rootdir=`readlink -f $2` sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec -# List files to avoid owning standard dirs. -`find $rootdir/usr/bin -type f -print0` | xargs -0 -n 1 echo | while read x +for x in `find $rootdir/usr/share/openra -type d` do y="${x#$rootdir}" - sed -i "/%files/ a \"${y}\"" openra.spec -done - -`find $rootdir/usr/share/icons -type f -print0` | xargs -0 -n 1 echo | while read x -do - y="${x#$rootdir}" - sed -i "/%files/ a \"${y}\"" openra.spec -done - -`find $rootdir/usr/share/applications -type f -print0` | \ - xargs -0 -n 1 echo | \ - while read x -do - y="${x#$rootdir}" - sed -i "/%files/ a \"${y}\"" openra.spec -done - -# List directories only to avoid spam -`find $rootdir/usr/share/openra -type d -print0` | xargs -0 -n 1 echo | while read x -do - y="${x#$rootdir}" - sed -i "/%files/ a \"${y}\"" openra.spec + sed -i "/%files/ a ${y}" openra.spec done cp openra.spec "$3/SPECS/" @@ -52,4 +30,3 @@ 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 index 4167a08faa..4521f6b111 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -23,9 +23,13 @@ and includes Command & Conquer: Tiberian Dawn as an official mod. %install rm -rf $RPM_BUILD_ROOT -cp -r %{root} $RPM_BUILD_ROOT +cp -r %{root} $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files +/usr/bin/openra +/usr/bin/openra-editor +/usr/share/applications/*.desktop +/usr/share/icons/hicolor/*/apps/*.png \ No newline at end of file From 807dc8b392c17ef869c55e60e838e77ae976fff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Oct 2013 13:16:31 +0200 Subject: [PATCH 3/4] silenced curl --- packaging/package-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 87b55facee..2a227ac607 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -96,7 +96,7 @@ echo "Creating packages..." ) & ( - curl -L -o "$OUTPUTDIR/$TAG.tar.gz" "https://github.com/OpenRA/OpenRA/archive/$TAG.tar.gz" + curl -s -L -o "$OUTPUTDIR/$TAG.tar.gz" "https://github.com/OpenRA/OpenRA/archive/$TAG.tar.gz" if [ $? -ne 0 ]; then echo "source code package download failed." fi From 20837c3776563536e64a8fbc23f15bc68283e966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Oct 2013 13:16:44 +0200 Subject: [PATCH 4/4] cleaned packaging comments --- packaging/package-all.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 2a227ac607..f63e086f44 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -75,7 +75,7 @@ echo "Creating packages..." if [ $? -eq 0 ]; then mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe else - echo "Windows package build failed, refer to windows/package.log." + echo "Windows package build failed, refer to windows/package.log." fi ) & @@ -83,7 +83,7 @@ echo "Creating packages..." cd osx sh buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" &> package.log if [ $? -ne 0 ]; then - echo "OSX package build failed, refer to osx/package.log." + echo "OS X package build failed, refer to osx/package.log." fi ) & @@ -91,14 +91,15 @@ echo "Creating packages..." cd linux sh buildpackage.sh "$TAG" "$BUILTDIR" "$OUTPUTDIR" &> package.log if [ $? -ne 0 ]; then - echo "linux package build failed, refer to linux/package.log." + echo "Linux package build failed, refer to linux/package.log." fi ) & ( + echo "Downloading source code packages from GitHub." curl -s -L -o "$OUTPUTDIR/$TAG.tar.gz" "https://github.com/OpenRA/OpenRA/archive/$TAG.tar.gz" if [ $? -ne 0 ]; then - echo "source code package download failed." + echo "Source code package download failed." fi ) & wait