diff --git a/.travis.yml b/.travis.yml index 94284b83a6..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 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 \ No newline at end of file + skip_join: true 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"); 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."