Merge pull request #1926 from JayFoxRox/gpl
Add GPL license.txt and README.md to builds
This commit is contained in:
		| @@ -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'" | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user