Merge pull request #3961 from Mailaender/travis-package

Test the packaging scripts with Travis

.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 which will automatically call RALint and ensure that the IDE project files are still valid.
+# Run the build script
+# call RALint to check for YAML errors
+# Test run the packaging scripts for all platforms
 script:
  - make all
  - make test
- - xbuild
+ - cd packaging && mkdir temp &&./package-all.sh travis-build temp
 
 # Only watch the development branch.
 branches:
@@ -29,4 +31,4 @@ notifications:
     channels:
       - "irc.freenode.net#openra"
     use_notice: true
-    skip_join: true
+    skip_join: true

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");

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

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."