mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Merge pull request #1926 from JayFoxRox/gpl
Add GPL license.txt and README.md to builds
This commit is contained in:
		
						commit
						0433e6cf0b
					
				
					 3 changed files with 10 additions and 4 deletions
				
			
		|  | @ -25,6 +25,10 @@ if [ "$TRAVIS_BRANCH" = "master" ]; then | ||||||
|         dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/" |         dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|  |     # Copy documentation | ||||||
|  |     cp license.txt "$REV_NAME" | ||||||
|  |     cp README.md "$REV_NAME" | ||||||
|  | 
 | ||||||
|     ARCHIVE_NAME="${REV_NAME}.tar.xz" |     ARCHIVE_NAME="${REV_NAME}.tar.xz" | ||||||
|     tar -cJvf "$ARCHIVE_NAME" "$REV_NAME" |     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'" |     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 | ### 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. | 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 | ### Building | ||||||
|  |  | ||||||
|  | @ -39,10 +39,10 @@ on_success: | ||||||
|             # Where are these spaces coming from? Regardless, let's remove them |             # Where are these spaces coming from? Regardless, let's remove them | ||||||
|             $BUILD_NAME = "citra-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ","" |             $BUILD_NAME = "citra-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ","" | ||||||
|             $BUILD_NAME_NOQT = "citra-noqt-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ","" |             $BUILD_NAME_NOQT = "citra-noqt-${GITDATE}-${GITREV}-windows-amd64.7z" -replace " ","" | ||||||
|             # Zip up the build folder |             # Zip up the build folder and documentation | ||||||
|             7z a $BUILD_NAME .\build\bin\release\* |             7z a $BUILD_NAME .\build\bin\release\* .\license.txt .\README.md | ||||||
|             # Do a second archive with only the binaries |             # Do a second archive with only the binaries (excludes dlls) and documentation | ||||||
|             7z a $BUILD_NAME_NOQT .\build\bin\release\*.exe |             7z a $BUILD_NAME_NOQT .\build\bin\release\*.exe .\license.txt .\README.md | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|             # Download WinSCP and upload to server |             # Download WinSCP and upload to server | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue