summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-06-24 04:11:11 +0200
committerGitHub <noreply@github.com>2016-06-24 04:11:11 +0200
commit0433e6cf0b9753d30f62cdf9993c54735b2ae2c6 (patch)
tree384fa89eb5e50dd44341e221ee27e3c9d4ffebbc
parentMerge pull request #1923 from yuriks/fix-recursive (diff)
parentAdd GPL license.txt and README.md to builds (diff)
downloadyuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.tar
yuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.tar.gz
yuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.tar.bz2
yuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.tar.lz
yuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.tar.xz
yuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.tar.zst
yuzu-0433e6cf0b9753d30f62cdf9993c54735b2ae2c6.zip
-rwxr-xr-x.travis-upload.sh4
-rw-r--r--README.md2
-rw-r--r--appveyor.yml8
3 files changed, 10 insertions, 4 deletions
diff --git a/.travis-upload.sh b/.travis-upload.sh
index d86775cb9..1ad8f5e5e 100755
--- a/.travis-upload.sh
+++ b/.travis-upload.sh
@@ -25,6 +25,10 @@ if [ "$TRAVIS_BRANCH" = "master" ]; then
dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
fi
+ # Copy documentation
+ cp license.txt "$REV_NAME"
+ cp README.md "$REV_NAME"
+
ARCHIVE_NAME="${REV_NAME}.tar.xz"
tar -cJvf "$ARCHIVE_NAME" "$REV_NAME"
lftp -c "open -u citra-builds,$BUILD_PASSWORD sftp://builds.citra-emu.org; set sftp:auto-confirm yes; put -O '$UPLOAD_DIR' '$ARCHIVE_NAME'"
diff --git a/README.md b/README.md
index a27acbc15..5463763ad 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ For development discussion, please join us @ #citra on freenode.
### Development
+Most of the development happens on GitHub. It's also where [our central repository](https://github.com/citra-emu/citra) is hosted.
+
If you want to contribute please take a look at the [Contributor's Guide](CONTRIBUTING.md), [TODO list](https://docs.google.com/document/d/1SWIop0uBI9IW8VGg97TAtoT_CHNoP42FzYmvG1F4QDA) and [Developer Information](https://github.com/citra-emu/citra/wiki/Developer-Information). You should as well contact any of the developers in the forum in order to know about the current state of the emulator.
### Building
diff --git a/appveyor.yml b/appveyor.yml
index 55beb7820..e82bdf0cf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,10 +39,10 @@ on_success:
# Where are these spaces coming from? Regardless, let's remove them
$BUILD_NAME = "citra-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ",""
$BUILD_NAME_NOQT = "citra-noqt-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ",""
- # Zip up the build folder
- 7z a $BUILD_NAME .\build\bin\release\*
- # Do a second archive with only the binaries
- 7z a $BUILD_NAME_NOQT .\build\bin\release\*.exe
+ # Zip up the build folder and documentation
+ 7z a $BUILD_NAME .\build\bin\release\* .\license.txt .\README.md
+ # Do a second archive with only the binaries (excludes dlls) and documentation
+ 7z a $BUILD_NAME_NOQT .\build\bin\release\*.exe .\license.txt .\README.md
# Download WinSCP and upload to server