From ffc2c08315596cdaf7d621034b3597ae34710fc1 Mon Sep 17 00:00:00 2001 From: dz Date: Sat, 1 Oct 2016 19:26:19 +0200 Subject: [PATCH 01/16] update --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 93dde8b..8500b67 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,25 @@ And this is the complete machine code: ![TetrOS - Machine code](https://github.com/daniel-e/mbr_tetris/blob/master/code.png) +## Running TetrOS + +There are two ways to run TetrOS. Either in an emulator like qemu or via a +the boot sector of a real disk, USB stick or some other media. + +### Running via qemu + +Simply run `make run`. This will execute qemu with the right parameters to +run TetrOS. + +### Running via an USB stick + +First, copy the image to an USB stick. For example, if your USB stick is +on /dev/sde use the following command to overwrite the first sector of the USB stick with the TetrOS image: + +`sudo dd if=tetros.img of=/dev/sde` + +After that you should be able to boot the stick to play TetrOS. + ## Features * Each brick shape has a unique color. * Blinking cursor is not visible. From 54b189b31a5c1e60bea844e919b6bda5635354b3 Mon Sep 17 00:00:00 2001 From: dz Date: Sat, 1 Oct 2016 19:30:55 +0200 Subject: [PATCH 02/16] update --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8500b67..d9f8c8b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # TetrOS -TetrOS is a small *feature rich* Tetris clone which is written in Assembly. -It fits completely into a 512 byte boot sector and is executed during the -boot sequence before any operating system is loaded. It does not need any -existing operating system. TetrOS is its own operating system, hence the suffix -OS in its name. +TetrOS is a small *feature rich* Tetris clone which is written in Assembly. It fits completely into a 512 byte boot sector as it requires only 446 bytes (which is the maximum allowed size of a boot loader for a valid master boot record (MBR)) and is executed during the boot sequence before any operating system is loaded. Actually, it does not need any existing operating system. TetrOS is its own operating system, hence the suffix OS in its name. This is how it looks like: @@ -26,7 +22,7 @@ run TetrOS. ### Running via an USB stick First, copy the image to an USB stick. For example, if your USB stick is -on /dev/sde use the following command to overwrite the first sector of the USB stick with the TetrOS image: +on /dev/sde use the following command to overwrite the first sector of the USB stick with the TetrOS image: `sudo dd if=tetros.img of=/dev/sde` From f970ea3d9d30003bc485eb064492b28f0a664e87 Mon Sep 17 00:00:00 2001 From: dz Date: Sat, 1 Oct 2016 19:34:49 +0200 Subject: [PATCH 03/16] update --- README.md | 4 ++-- code.png => screenshots/code.png | Bin .../tetros_tetris_screenshot.png | Bin 3 files changed, 2 insertions(+), 2 deletions(-) rename code.png => screenshots/code.png (100%) rename tetros_tetris_screenshot.png => screenshots/tetros_tetris_screenshot.png (100%) diff --git a/README.md b/README.md index d9f8c8b..b218419 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ TetrOS is a small *feature rich* Tetris clone which is written in Assembly. It f This is how it looks like: -![TetrOS - Tetris in 512 byte boot sector](https://github.com/daniel-e/mbr_tetris/blob/master/tetros_tetris_screenshot.png) +![TetrOS - Tetris in 512 byte boot sector](https://github.com/daniel-e/mbr_tetris/blob/master/screenshots/tetros_tetris_screenshot.png) And this is the complete machine code: -![TetrOS - Machine code](https://github.com/daniel-e/mbr_tetris/blob/master/code.png) +![TetrOS - Machine code](https://github.com/daniel-e/mbr_tetris/blob/master/screenshots/code.png) ## Running TetrOS diff --git a/code.png b/screenshots/code.png similarity index 100% rename from code.png rename to screenshots/code.png diff --git a/tetros_tetris_screenshot.png b/screenshots/tetros_tetris_screenshot.png similarity index 100% rename from tetros_tetris_screenshot.png rename to screenshots/tetros_tetris_screenshot.png From 9d7ba300d7f357f20d7f28faf2ee8d30ccf18564 Mon Sep 17 00:00:00 2001 From: de Date: Tue, 4 Oct 2016 09:26:28 +0200 Subject: [PATCH 04/16] update --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b218419..c93667a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # TetrOS -TetrOS is a small *feature rich* Tetris clone which is written in Assembly. It fits completely into a 512 byte boot sector as it requires only 446 bytes (which is the maximum allowed size of a boot loader for a valid master boot record (MBR)) and is executed during the boot sequence before any operating system is loaded. Actually, it does not need any existing operating system. TetrOS is its own operating system, hence the suffix OS in its name. +TetrOS is a small *feature rich* Tetris clone which is written in Assembly. It fits completely into a 512 byte boot sector as it requires only 446 bytes (which is the maximum allowed size of the first stage boot loader in the master boot record (MBR) of a drive) and is executed during the boot sequence before any operating system is loaded. Actually, it does not need any existing operating system. TetrOS *is* an operating system, hence the suffix OS in its name. This is how it looks like: @@ -11,18 +11,15 @@ And this is the complete machine code: ## Running TetrOS -There are two ways to run TetrOS. Either in an emulator like qemu or via a -the boot sector of a real disk, USB stick or some other media. +There are two options to run TetrOS. Either in an emulator like qemu or via an installation of TetrOS in the boot sector of a real disk, USB stick or some other media. ### Running via qemu -Simply run `make run`. This will execute qemu with the right parameters to -run TetrOS. +Simply run `make run`. This will execute qemu with the right parameters to run TetrOS. If you're using Ubuntu and qemu is not intalled on your system you can install it via `sudo apt-get install qemu`. ### Running via an USB stick -First, copy the image to an USB stick. For example, if your USB stick is -on /dev/sde use the following command to overwrite the first sector of the USB stick with the TetrOS image: +First, copy the image to an USB stick. For example, if your USB stick is on `/dev/sde` use the following command to overwrite the first sector of the USB stick with the TetrOS image: `sudo dd if=tetros.img of=/dev/sde` @@ -36,7 +33,7 @@ After that you should be able to boot the stick to play TetrOS. * Down arrow to drop a brick. * Game over detection. It stops if a new brick could not be placed. * Selects the next brick at random via a linear congruential generator. -* Shows a nice playing field. +* Nice playing field. ## Features missing due to size limits * Scores and highscores. From c747c7920009aecea2275fa9264f037b0979a7c5 Mon Sep 17 00:00:00 2001 From: Hayden Davies Date: Tue, 4 Oct 2016 20:15:28 +0100 Subject: [PATCH 05/16] Renamed loop and dd as they're already used by NASM --- tetros.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tetros.asm b/tetros.asm index 9dfbaef..d2117be 100644 --- a/tetros.asm +++ b/tetros.asm @@ -90,7 +90,7 @@ new_brick: mov byte [delay], 100 ; 3 * 100 = 300ms select_brick ; returns the selected brick in AL mov dx, start_row_col ; start at row 4 and col 38 -loop: +lp: call check_collision jne $ ; collision -> game over call print_brick @@ -154,7 +154,7 @@ no_key: call clear_brick inc dh ; increase row call check_collision - je loop ; no collision + je lp ; no collision dec dh call print_brick call check_filled @@ -253,7 +253,7 @@ check_collision_main: ; DI = 1 -> check, 0 -> print cc: push cx mov cl, 4 -dd: +zz: test ah, 10000000b jz is_zero @@ -278,7 +278,7 @@ is_zero_a: is_zero: shl ax, 1 ; move to next bit in brick mask inc dx ; move to next column - loop dd + loop zz sub dl, 4 ; reset column inc dh ; move to next row pop cx From cca5ebab39aa14987e5733d398e02c323f992f02 Mon Sep 17 00:00:00 2001 From: dz Date: Tue, 4 Oct 2016 21:21:46 +0200 Subject: [PATCH 06/16] replaced reserved keywords --- tetros.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tetros.asm b/tetros.asm index 9dfbaef..ca80a2d 100644 --- a/tetros.asm +++ b/tetros.asm @@ -90,7 +90,7 @@ new_brick: mov byte [delay], 100 ; 3 * 100 = 300ms select_brick ; returns the selected brick in AL mov dx, start_row_col ; start at row 4 and col 38 -loop: +mloop: call check_collision jne $ ; collision -> game over call print_brick @@ -154,7 +154,7 @@ no_key: call clear_brick inc dh ; increase row call check_collision - je loop ; no collision + je mloop ; no collision dec dh call print_brick call check_filled @@ -253,7 +253,7 @@ check_collision_main: ; DI = 1 -> check, 0 -> print cc: push cx mov cl, 4 -dd: +ddx: test ah, 10000000b jz is_zero @@ -278,7 +278,7 @@ is_zero_a: is_zero: shl ax, 1 ; move to next bit in brick mask inc dx ; move to next column - loop dd + loop ddx sub dl, 4 ; reset column inc dh ; move to next row pop cx From 8626eb1b74b87be5aaabba27c117dcf5f787c820 Mon Sep 17 00:00:00 2001 From: dz Date: Tue, 4 Oct 2016 21:59:03 +0200 Subject: [PATCH 07/16] compiling section --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index c93667a..2ece5b6 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,14 @@ After that you should be able to boot the stick to play TetrOS. * Show next brick. * Increase speed. +## Compiling the sources + +The repository already contains an image which you can use for testing. However, if you want to compile the image from the sources you need nasm, a general prupose x86 assembler to be installed on your system. On Ubuntu you can can install it via the command `sudo apt-get install nasm`. + +If `nasm` is installed you can compile the sources by executing `make`. This will create the image `tetros.img`. After that you can run the image via qemu or you can copy the image via `dd` on an USB disk or a disk (see above). + +I have tested it with nasm 2.11.08 on Ubuntu 16.04. + ## Similar projects * https://github.com/dbittman/bootris * https://github.com/Shikhin/tetranglix From bc2fd57d089ffb360bb2137ff989cbb8d1ce7156 Mon Sep 17 00:00:00 2001 From: dz Date: Tue, 4 Oct 2016 22:19:44 +0200 Subject: [PATCH 08/16] added video --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2ece5b6..d383930 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ This is how it looks like: ![TetrOS - Tetris in 512 byte boot sector](https://github.com/daniel-e/mbr_tetris/blob/master/screenshots/tetros_tetris_screenshot.png) +In action: + +[![TetrOS - Teris in 512 byte boot sector](http://img.youtube.com/vi/Hl7M7f-Hh78/0.jpg)](https://youtu.be/Hl7M7f-Hh78) + And this is the complete machine code: ![TetrOS - Machine code](https://github.com/daniel-e/mbr_tetris/blob/master/screenshots/code.png) From 5b87a4496f4a7b90dc7a5919f49a5b0a8e97f6df Mon Sep 17 00:00:00 2001 From: dz Date: Tue, 4 Oct 2016 22:20:57 +0200 Subject: [PATCH 09/16] added video --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d383930..5140761 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is how it looks like: ![TetrOS - Tetris in 512 byte boot sector](https://github.com/daniel-e/mbr_tetris/blob/master/screenshots/tetros_tetris_screenshot.png) -In action: +Video that shows TetrOS in action: [![TetrOS - Teris in 512 byte boot sector](http://img.youtube.com/vi/Hl7M7f-Hh78/0.jpg)](https://youtu.be/Hl7M7f-Hh78) From b8cad2222cedabba9f1a780dd2c03f6ef614425e Mon Sep 17 00:00:00 2001 From: dz Date: Tue, 4 Oct 2016 22:21:54 +0200 Subject: [PATCH 10/16] replaced screenshot by video --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 5140761..1b92cfe 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ # TetrOS TetrOS is a small *feature rich* Tetris clone which is written in Assembly. It fits completely into a 512 byte boot sector as it requires only 446 bytes (which is the maximum allowed size of the first stage boot loader in the master boot record (MBR) of a drive) and is executed during the boot sequence before any operating system is loaded. Actually, it does not need any existing operating system. TetrOS *is* an operating system, hence the suffix OS in its name. -This is how it looks like: - -![TetrOS - Tetris in 512 byte boot sector](https://github.com/daniel-e/mbr_tetris/blob/master/screenshots/tetros_tetris_screenshot.png) - Video that shows TetrOS in action: [![TetrOS - Teris in 512 byte boot sector](http://img.youtube.com/vi/Hl7M7f-Hh78/0.jpg)](https://youtu.be/Hl7M7f-Hh78) From 3f539d2e1f8f368c89a5f448649079e80fc433b2 Mon Sep 17 00:00:00 2001 From: dz Date: Wed, 5 Oct 2016 18:55:56 +0200 Subject: [PATCH 11/16] additional link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1b92cfe..dd7253d 100644 --- a/README.md +++ b/README.md @@ -54,3 +54,4 @@ I have tested it with nasm 2.11.08 on Ubuntu 16.04. * https://github.com/dbittman/bootris * https://github.com/Shikhin/tetranglix * http://olivier.poudade.free.fr/src/BootChess.asm +* https://github.com/programble/tetrasm - Tetris for x86 in NASM but which does not fit into the boot sector. From 97769b5025d2505e7e1af25f5ca5dd0721b5b90b Mon Sep 17 00:00:00 2001 From: Noah Rosamilia Date: Wed, 5 Oct 2016 23:59:00 -0400 Subject: [PATCH 12/16] Add macOS support --- Makefile | 11 +++++++++-- README.md | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a8cce14..f2f3742 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,16 @@ +UNAME := $(shell uname) +ifeq ($(UNAME), Darwin) + STAT := gstat +else + STAT := stat +endif + all: tetros.img tetros.img: tetros.asm Makefile nasm -d DEBUG -f bin tetros.asm -o tetros.img - @echo "size is" `stat -c "%s" tetros.img` - @if [ `stat -c "%s" tetros.img` -gt 446 ]; then \ + @echo "size is" `$(STAT) -c "%s" tetros.img` + @if [ `$(STAT) -c "%s" tetros.img` -gt 446 ]; then \ bash -c 'echo -e "\e[91mOutput exceeded size of 446 bytes.\e[0m"'; \ rm -f tetros.img; exit 1; fi nasm -f bin tetros.asm -o tetros.img diff --git a/README.md b/README.md index dd7253d..5b8878f 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ After that you should be able to boot the stick to play TetrOS. ## Compiling the sources -The repository already contains an image which you can use for testing. However, if you want to compile the image from the sources you need nasm, a general prupose x86 assembler to be installed on your system. On Ubuntu you can can install it via the command `sudo apt-get install nasm`. +The repository already contains an image which you can use for testing. However, if you want to compile the image from the sources you need nasm, a general prupose x86 assembler to be installed on your system. On Ubuntu you can can install it via the command `sudo apt-get install nasm`. On macOS you will need [homebrew](http://brew.sh/) to install `nasm` and `binutils`. If `nasm` is installed you can compile the sources by executing `make`. This will create the image `tetros.img`. After that you can run the image via qemu or you can copy the image via `dd` on an USB disk or a disk (see above). From bc4d8352632ffd5d6eef40dbfeb5c3c2421b6a7f Mon Sep 17 00:00:00 2001 From: de Date: Fri, 7 Oct 2016 09:33:11 +0200 Subject: [PATCH 13/16] ack --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 5b8878f..5cd45b0 100644 --- a/README.md +++ b/README.md @@ -55,3 +55,8 @@ I have tested it with nasm 2.11.08 on Ubuntu 16.04. * https://github.com/Shikhin/tetranglix * http://olivier.poudade.free.fr/src/BootChess.asm * https://github.com/programble/tetrasm - Tetris for x86 in NASM but which does not fit into the boot sector. + +## Acknowledgements +I would like to thank the following persons for contributing to TetrOS. +* [DraftYeti5608](https://github.com/DraftYeti5608) +* [Ivoah](https://github.com/Ivoah) From 13d309060b511909491ef118088b4e14b02bcb6f Mon Sep 17 00:00:00 2001 From: daniel-e Date: Sat, 17 Dec 2016 13:46:56 +0100 Subject: [PATCH 14/16] Create LICENSE.md --- LICENSE.md | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..8dada3e --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 403cebca7271cbdd05a0ca6ab36857a060b4681f Mon Sep 17 00:00:00 2001 From: daniel-e Date: Sun, 18 Dec 2016 14:31:44 +0100 Subject: [PATCH 15/16] Delete LICENSE.md --- LICENSE.md | 201 ----------------------------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 8dada3e..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. From 924f0d7132076df0d41e7fa3589441e829ec22a9 Mon Sep 17 00:00:00 2001 From: daniel-e Date: Sun, 18 Dec 2016 14:32:27 +0100 Subject: [PATCH 16/16] Create LICENSE.md --- LICENSE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..a8fc851 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.