From 611a2da69770601798efd6db107c0ce351968f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 19 Oct 2013 13:59:16 +0200
Subject: [PATCH 1/4] remove xbuild as it does not work properly

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 94284b83a6..827a05bb60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,11 @@ before_install:
 install:
  - sudo apt-get install mono-gmcs cli-common-dev libsdl1.2debian libgl1-mesa-glx libopenal1 libfreetype6
 
-# Run the build script which will automatically call RALint and ensure that the IDE project files are still valid.
+# Run the build script and call RALint to check for YAML errors
 script:
  - make all
+after_script:
  - make test
- - xbuild
 
 # Only watch the development branch.
 branches:
@@ -29,4 +29,4 @@ notifications:
     channels:
       - "irc.freenode.net#openra"
     use_notice: true
-    skip_join: true
\ No newline at end of file
+    skip_join: true

From 3d3b2f8dc4ec268734d841e4f26008bb37e42e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 19 Oct 2013 14:03:01 +0200
Subject: [PATCH 2/4] test run packaging/package-all.sh

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 827a05bb60..5e36738615 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,15 @@ language: c
 before_install:
  - sudo apt-get update
 install:
- - sudo apt-get install mono-gmcs cli-common-dev libsdl1.2debian libgl1-mesa-glx libopenal1 libfreetype6
+ - sudo apt-get install mono-gmcs cli-common-dev libsdl1.2debian libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown
 
-# Run the build script and call RALint to check for YAML errors
+# Run the build script
+# call RALint to check for YAML errors
+# Test run the packaging scripts for all platforms
 script:
  - make all
-after_script:
  - make test
+ - cd packaging && mkdir temp &&./package-all.sh travis-build temp
 
 # Only watch the development branch.
 branches:

From da27860d822f7adc8568bf37b332bb02181894b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 19 Oct 2013 15:53:42 +0200
Subject: [PATCH 3/4] move source download from package-all.sh for Travis

---
 packaging/checkout-and-build.sh | 6 ++++++
 packaging/package-all.sh        | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packaging/checkout-and-build.sh b/packaging/checkout-and-build.sh
index eadc4a88df..30fa0c5334 100755
--- a/packaging/checkout-and-build.sh
+++ b/packaging/checkout-and-build.sh
@@ -61,6 +61,12 @@ fi
 
 ./package-all.sh $TAG ~/openra-package/packages/
 
+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."
+fi
+
 ./upload-all.sh $TAG ~/openra-package/packages
 
 ./update-wiki.sh
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index a115b5546c..cd6df0f1fe 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -98,13 +98,6 @@ echo "Creating packages..."
     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."
-    fi
-) &
 wait
 echo "Package build done."
 

From 9226073eb012055e2744f785139ddbeffb99e658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Nov 2013 12:11:16 +0100
Subject: [PATCH 4/4] don't mount packages for make docs

---
 OpenRA.Utility/Command.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs
index 757355245f..0e6db9e29d 100644
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -338,7 +338,11 @@ namespace OpenRA.Utility
 		public static void ExtractTraitDocs(string[] args)
 		{
 			Game.modData = new ModData(args[1]);
-			FileSystem.LoadFromManifest(Game.modData.Manifest);
+
+			FileSystem.UnmountAll();
+			foreach (var dir in Game.modData.Manifest.Folders)
+				FileSystem.Mount(dir);
+
 			Rules.LoadRules(Game.modData.Manifest, new Map());
 
 			Console.WriteLine("## Documentation");