From e8dc5c03babbc787666e0e7d9cf6eec6ec0ccd3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 12 Nov 2013 23:24:21 +0100 Subject: [PATCH 1/7] add .travis.yml for Travis CI support --- .travis.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..a8521f17 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +language: cpp +before_install: + - which $CXX + - $CXX --version + - getconf _NPROCESSORS_ONLN +install: + - sudo mkdir -p /etc/apt/sources.list.d/ + - sudo touch /etc/apt/sources.list.d/llvm.list + - sudo chmod a+rw /etc/apt/sources.list.d/llvm.list + - echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" > /etc/apt/sources.list.d/llvm.list + - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa + - sudo add-apt-repository -y ppa:boost-latest/ppa + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update + - sudo apt-get install libboost1.54-all-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev libsdl-ttf2.0-dev pastebinit + - if [ "$CXX" = "clang++" ]; then sudo apt-get install clang-3.4; fi + - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq qtbase5-dev qtdeclarative5-dev qt5-default qt5-qmake qtbase5-dev-tools qtmultimedia5-dev g++-4.8; fi +before_script: + - if [ "$CXX" = "clang++" ]; then export CXX="/usr/bin/clang++" CC="/usr/bin/clang"; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi + - which $CXX + - $CXX --version + - export ENABLE_QT_PARTS=$(if [ "$CXX" = "g++" ]; then echo ON; else echo OFF ; fi) + - echo $ENABLE_QT_PARTS +script: + - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_LAUNCHER=$ENABLE_QT_PARTS -DENABLE_TEST=ON -DENABLE_EDITOR=$ENABLE_QT_PARTS . + - make -j 4 +after_script: + - pastebinit compile_commands.json +compiler: + - clang + - gcc-4.8 From b8557360914675efe80b14e5ff58d6281898766c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 13 Nov 2013 02:17:23 +0100 Subject: [PATCH 2/7] reorder commands for travis, fix README file to use markdown --- .travis.yml | 4 ++-- README | 51 +++++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8521f17..6cbf62d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,12 @@ install: - if [ "$CXX" = "clang++" ]; then sudo apt-get install clang-3.4; fi - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq qtbase5-dev qtdeclarative5-dev qt5-default qt5-qmake qtbase5-dev-tools qtmultimedia5-dev g++-4.8; fi before_script: + - export ENABLE_QT_PARTS=$(if [ "$CXX" = "g++" ]; then echo ON; else echo OFF ; fi) + - echo $ENABLE_QT_PARTS - if [ "$CXX" = "clang++" ]; then export CXX="/usr/bin/clang++" CC="/usr/bin/clang"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - which $CXX - $CXX --version - - export ENABLE_QT_PARTS=$(if [ "$CXX" = "g++" ]; then echo ON; else echo OFF ; fi) - - echo $ENABLE_QT_PARTS script: - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_LAUNCHER=$ENABLE_QT_PARTS -DENABLE_TEST=ON -DENABLE_EDITOR=$ENABLE_QT_PARTS . - make -j 4 diff --git a/README b/README index 7ab16a04..14883102 100644 --- a/README +++ b/README @@ -1,22 +1,29 @@ - VCMI Project - Copyright (C) 2007-2013 VCMI Team (check AUTHORS file for the contributors list) - - VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, - giving it new and extended possibilities. - Wiki: http://wiki.vcmi.eu - Forums: http://forum.vcmi.eu - Bugtracker: http://bugs.vcmi.eu/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 (included in the license.txt) - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \ No newline at end of file +[![Build Status](https://travis-ci.org/janisozaur/vcmi.png)](https://travis-ci.org/janisozaur/vcmi) + + VCMI Project + ============ + Copyright (C) 2007-2013 VCMI Team (check [AUTHORS](AUTHORS) file for the contributors list) + + VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, + giving it new and extended possibilities. + * Wiki: http://wiki.vcmi.eu + * Forums: http://forum.vcmi.eu + * Bugtracker: http://bugs.vcmi.eu/ + + License + ------- + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 (included in the license.txt) + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + A copy of license is attached in [COPYING](COPYING) file. From 3057aa0271be000820b85a29e6c99b9040056ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 13 Nov 2013 02:19:08 +0100 Subject: [PATCH 3/7] rename README file --- README | 29 ----------------------------- README.md | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 14883102..00000000 --- a/README +++ /dev/null @@ -1,29 +0,0 @@ -[![Build Status](https://travis-ci.org/janisozaur/vcmi.png)](https://travis-ci.org/janisozaur/vcmi) - - VCMI Project - ============ - Copyright (C) 2007-2013 VCMI Team (check [AUTHORS](AUTHORS) file for the contributors list) - - VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, - giving it new and extended possibilities. - * Wiki: http://wiki.vcmi.eu - * Forums: http://forum.vcmi.eu - * Bugtracker: http://bugs.vcmi.eu/ - - License - ------- - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 (included in the license.txt) - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - A copy of license is attached in [COPYING](COPYING) file. diff --git a/README.md b/README.md new file mode 100644 index 00000000..680120b8 --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +[![Build Status](https://travis-ci.org/janisozaur/vcmi.png)](https://travis-ci.org/janisozaur/vcmi) + +VCMI Project +============ +Copyright (C) 2007-2013 VCMI Team (check [AUTHORS](AUTHORS) file for the contributors list) + +VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, +giving it new and extended possibilities. +* Wiki: http://wiki.vcmi.eu +* Forums: http://forum.vcmi.eu +* Bugtracker: http://bugs.vcmi.eu/ + +License +------- +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 (included in the [license.txt](license.txt)) +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. From 27ce9bd2b31c1eb38cbcfca3e27808931d09b954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 13 Nov 2013 08:36:55 +0100 Subject: [PATCH 4/7] convert AUTHORS' file encoding to utf8 --- AUTHORS | 94 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/AUTHORS b/AUTHORS index cf4142fe..e58fcceb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,47 +1,47 @@ -VCMI PROJECT CODE CONTRIBUTORS: - -Micha� Urba�czyk aka Tow, - * project originator; programming, making releases, website -maintenance, reverse engineering, general support. - -Mateusz B. aka Tow dragon, - * general suport, battle support, support for many Heroes 3 config files, reverse engineering, ERM/VERM parser and interpreter - -Stefan Pavlov aka Ste, - * minor fixes in pregame - -Yifeng Sun aka phoebus118, - * a part of .snd handling, minor fixes and updates - -Andrea Palmate aka afxgroup, - * GCC/AmigaOS4 compatibility updates and makefile - -Vadim Glazunov aka neweagle, - * minor GCC/Linux compatibility changes - -Rafal R. aka ambtrip, - * GeniusAI (battles) - -Lukasz Wychrystenko aka tezeriusz, - * minor GCC/Linux compatibility changes, code review - -Xiaomin Ding, - * smack videos player - -Tom Zielinski aka Warmonger, - * game objects, mechanics - -Frank Zago aka ubuntux, <> - * GCC/Linux compatibility changes, sound/music support, video support on Linux - -Trevor Standley aka tstandley, <> - * adventure map part of Genius AI - -Rickard Westerlund aka Onion Knight, - * battle functionality and general support - -Ivan Savenko, - * GCC/Linux support, client development, general support - -Benjamin Gentner aka beegee, <> - * battle support, programming +VCMI PROJECT CODE CONTRIBUTORS: + +Michał Urbańczyk aka Tow, + * project originator; programming, making releases, website +maintenance, reverse engineering, general support. + +Mateusz B. aka Tow dragon, + * general suport, battle support, support for many Heroes 3 config files, reverse engineering, ERM/VERM parser and interpreter + +Stefan Pavlov aka Ste, + * minor fixes in pregame + +Yifeng Sun aka phoebus118, + * a part of .snd handling, minor fixes and updates + +Andrea Palmate aka afxgroup, + * GCC/AmigaOS4 compatibility updates and makefile + +Vadim Glazunov aka neweagle, + * minor GCC/Linux compatibility changes + +Rafal R. aka ambtrip, + * GeniusAI (battles) + +Lukasz Wychrystenko aka tezeriusz, + * minor GCC/Linux compatibility changes, code review + +Xiaomin Ding, + * smack videos player + +Tom Zielinski aka Warmonger, + * game objects, mechanics + +Frank Zago aka ubuntux, <> + * GCC/Linux compatibility changes, sound/music support, video support on Linux + +Trevor Standley aka tstandley, <> + * adventure map part of Genius AI + +Rickard Westerlund aka Onion Knight, + * battle functionality and general support + +Ivan Savenko, + * GCC/Linux support, client development, general support + +Benjamin Gentner aka beegee, <> + * battle support, programming From ec99e0b9d40e69ba4ada6993ad292cba3cfc3e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 13 Nov 2013 08:39:38 +0100 Subject: [PATCH 5/7] Use markdown-ified license file. Taken from https://github.com/nevir/readable-licenses/blob/master/markdown/GPLv2-LICENSE.md [ci skip] --- README.md | 2 +- license.md | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++ license.txt | 280 ---------------------------------------------------- 3 files changed, 275 insertions(+), 281 deletions(-) create mode 100644 license.md delete mode 100644 license.txt diff --git a/README.md b/README.md index 680120b8..9a808954 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ License ------- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 (included in the [license.txt](license.txt)) +the Free Software Foundation; either version 2 (included in the [license.md](license.md)) of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --git a/license.md b/license.md new file mode 100644 index 00000000..ee9d6dff --- /dev/null +++ b/license.md @@ -0,0 +1,274 @@ +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ + +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 59 Temple Place, Suite 330 +> Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + + +Preamble +-------- + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- +0. This License applies to any program or other work which contains a notice + placed by the copyright holder saying it may be distributed under the terms + of this General Public License. The "Program", below, refers to any such + program or work, and a "work based on the Program" means either the Program + or any derivative work under copyright law: that is to say, a work + containing the Program or a portion of it, either verbatim or with + modifications and/or translated into another language. (Hereinafter, + translation is included without limitation in the term "modification".) + Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of running the + Program is not restricted, and the output from the Program is covered only + if its contents constitute a work based on the Program (independent of + having been made by running the Program). Whether that is true depends on + what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as + you receive it, in any medium, provided that you conspicuously and + appropriately publish on each copy an appropriate copyright notice and + disclaimer of warranty; keep intact all the notices that refer to this + License and to the absence of any warranty; and give any other recipients + of the Program a copy of this License along with the Program. + + You may charge a fee for the physical act of transferring a copy, and you + may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, + thus forming a work based on the Program, and copy and distribute such + modifications or work under the terms of Section 1 above, provided that you + also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, + to be licensed as a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may + redistribute the program under these conditions, and telling the user + how to view a copy of this License. (Exception: if the Program itself + is interactive but does not normally print such an announcement, your + work based on the Program is not required to print an announcement.) + + These requirements apply to the modified work as a whole. If identifiable + sections of that work are not derived from the Program, and can be + reasonably considered independent and separate works in themselves, then + this License, and its terms, do not apply to those sections when you + distribute them as separate works. But when you distribute the same + sections as part of a whole which is a work based on the Program, the + distribution of the whole must be on the terms of this License, whose + permissions for other licensees extend to the entire whole, and thus to + each and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or contest your + rights to work written entirely by you; rather, the intent is to exercise + the right to control the distribution of derivative or collective works + based on the Program. + + In addition, mere aggregation of another work not based on the Program with + the Program (or with a work based on the Program) on a volume of a storage + or distribution medium does not bring the other work under the scope of + this License. + +3. You may copy and distribute the Program (or a work based on it, under + Section 2) in object code or executable form under the terms of Sections 1 + and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 + above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Sections 1 and 2 above on a medium customarily used for software + interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + + The source code for a work means the preferred form of the work for making + modifications to it. For an executable work, complete source code means all + the source code for all modules it contains, plus any associated interface + definition files, plus the scripts used to control compilation and + installation of the executable. However, as a special exception, the source + code distributed need not include anything that is normally distributed (in + either source or binary form) with the major components (compiler, kernel, + and so on) of the operating system on which the executable runs, unless + that component itself accompanies the executable. + + If distribution of executable or object code is made by offering access to + copy from a designated place, then offering equivalent access to copy the + source code from the same place counts as distribution of the source code, + even though third parties are not compelled to copy the source along with + the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as + expressly provided under this License. Any attempt otherwise to copy, + modify, sublicense or distribute the Program is void, and will + automatically terminate your rights under this License. However, parties + who have received copies, or rights, from you under this License will not + have their licenses terminated so long as such parties remain in full + compliance. + +5. You are not required to accept this License, since you have not signed it. + However, nothing else grants you permission to modify or distribute the + Program or its derivative works. These actions are prohibited by law if you + do not accept this License. Therefore, by modifying or distributing the + Program (or any work based on the Program), you indicate your acceptance of + this License to do so, and all its terms and conditions for copying, + distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), + the recipient automatically receives a license from the original licensor + to copy, distribute or modify the Program subject to these terms and + conditions. You may not impose any further restrictions on the recipients' + exercise of the rights granted herein. You are not responsible for + enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot distribute so + as to satisfy simultaneously your obligations under this License and any + other pertinent obligations, then as a consequence you may not distribute + the Program at all. For example, if a patent license would not permit + royalty-free redistribution of the Program by all those who receive copies + directly or indirectly through you, then the only way you could satisfy + both it and this License would be to refrain entirely from distribution of + the Program. + + If any portion of this section is held invalid or unenforceable under any + particular circumstance, the balance of the section is intended to apply + and the section as a whole is intended to apply in other circumstances. + + It is not the purpose of this section to induce you to infringe any patents + or other property right claims or to contest validity of any such claims; + this section has the sole purpose of protecting the integrity of the free + software distribution system, which is implemented by public license + practices. Many people have made generous contributions to the wide range + of software distributed through that system in reliance on consistent + application of that system; it is up to the author/donor to decide if he or + she is willing to distribute software through any other system and a + licensee cannot impose that choice. + + This section is intended to make thoroughly clear what is believed to be a + consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain + countries either by patents or by copyrighted interfaces, the original + copyright holder who places the Program under this License may add an + explicit geographical distribution limitation excluding those countries, so + that distribution is permitted only in or among countries not thus excluded. + In such case, this License incorporates the limitation as if written in + the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the + General Public License from time to time. Such new versions will be similar + in spirit to the present version, but may differ in detail to address new + problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and conditions + either of that version or of any later version published by the Free + Software Foundation. If the Program does not specify a version number of + this License, you may choose any version ever published by the Free + Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs + whose distribution conditions are different, write to the author to ask for + permission. For software which is copyrighted by the Free Software + Foundation, write to the Free Software Foundation; we sometimes make + exceptions for this. Our decision will be guided by the two goals of + preserving the free status of all derivatives of our free software and of + promoting the sharing and reuse of software generally. + + +No Warranty +----------- + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR + THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES + PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO + THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM + PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR + CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL + ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE + THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY + GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE + USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), + EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF + SUCH DAMAGES. diff --git a/license.txt b/license.txt deleted file mode 100644 index 8efb3634..00000000 --- a/license.txt +++ /dev/null @@ -1,280 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS \ No newline at end of file From dd67b2a778c550e5e62f5227b6f980f3cff68a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 1 Dec 2013 02:23:15 +0100 Subject: [PATCH 6/7] update travis build file for latest travis changes --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cbf62d9..93361d06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,22 +5,22 @@ before_install: - getconf _NPROCESSORS_ONLN install: - sudo mkdir -p /etc/apt/sources.list.d/ - - sudo touch /etc/apt/sources.list.d/llvm.list - - sudo chmod a+rw /etc/apt/sources.list.d/llvm.list - - echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" > /etc/apt/sources.list.d/llvm.list - - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - +# - sudo touch /etc/apt/sources.list.d/llvm.list +# - sudo chmod a+rw /etc/apt/sources.list.d/llvm.list +# - echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" > /etc/apt/sources.list.d/llvm.list +# - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa - sudo add-apt-repository -y ppa:boost-latest/ppa - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update - - sudo apt-get install libboost1.54-all-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev libsdl-ttf2.0-dev pastebinit - - if [ "$CXX" = "clang++" ]; then sudo apt-get install clang-3.4; fi - - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq qtbase5-dev qtdeclarative5-dev qt5-default qt5-qmake qtbase5-dev-tools qtmultimedia5-dev g++-4.8; fi + - sudo apt-get install libboost1.54-all-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev libsdl-ttf2.0-dev pastebinit iwyu +# - if [ "$CXX" = "clang++" ]; then sudo apt-get install clang-3.4; fi +# - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq qtbase5-dev qtdeclarative5-dev qt5-default qt5-qmake qtbase5-dev-tools qtmultimedia5-dev g++-4.8; fi before_script: - export ENABLE_QT_PARTS=$(if [ "$CXX" = "g++" ]; then echo ON; else echo OFF ; fi) - echo $ENABLE_QT_PARTS - if [ "$CXX" = "clang++" ]; then export CXX="/usr/bin/clang++" CC="/usr/bin/clang"; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi +# - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - which $CXX - $CXX --version script: @@ -29,5 +29,5 @@ script: after_script: - pastebinit compile_commands.json compiler: + - clang-3.3 - clang - - gcc-4.8 From c5044525eeb6106e35fe852dd9aa19c9d51e208d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 1 Dec 2013 02:26:26 +0100 Subject: [PATCH 7/7] update travis build file for latest travis-ci changes --- .travis.yml | 21 +++++++++++++++++---- Global.h | 3 --- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93361d06..d55edd5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: cpp before_install: + - lsb_release -a - which $CXX - $CXX --version - getconf _NPROCESSORS_ONLN @@ -13,21 +14,33 @@ install: - sudo add-apt-repository -y ppa:boost-latest/ppa - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update - - sudo apt-get install libboost1.54-all-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev libsdl-ttf2.0-dev pastebinit iwyu + - sudo apt-get install libboost1.54-all-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-sound1.2-dev libsdl1.2-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev libsdl-ttf2.0-dev pastebinit + - wget http://launchpadlibrarian.net/155807880/iwyu_3.3-3_amd64.deb + - sudo dpkg --force-all -i iwyu_3.3-3_amd64.deb + - dpkg -L iwyu + - dpkg -L iwyu | pastebinit + - wget https://gist.github.com/janisozaur/7727632/raw/5d33cf38956cf6dba4feebf6d01aad98e689e90c/iwyu-wrapper + - chmod a+x iwyu-wrapper + - export CXX=$(pwd)/iwyu-wrapper # - if [ "$CXX" = "clang++" ]; then sudo apt-get install clang-3.4; fi # - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq qtbase5-dev qtdeclarative5-dev qt5-default qt5-qmake qtbase5-dev-tools qtmultimedia5-dev g++-4.8; fi before_script: + - dpkg -l | pastebinit - export ENABLE_QT_PARTS=$(if [ "$CXX" = "g++" ]; then echo ON; else echo OFF ; fi) - echo $ENABLE_QT_PARTS - - if [ "$CXX" = "clang++" ]; then export CXX="/usr/bin/clang++" CC="/usr/bin/clang"; fi +# - if [ "$CXX" = "clang++" ]; then export CXX="/usr/bin/clang++" CC="/usr/bin/clang"; fi # - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - which $CXX - $CXX --version script: - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_LAUNCHER=$ENABLE_QT_PARTS -DENABLE_TEST=ON -DENABLE_EDITOR=$ENABLE_QT_PARTS . - - make -j 4 + - make -j 6 after_script: - pastebinit compile_commands.json + - find . -name '*iwyu.txt' -print0 | xargs -0 tar cf iwyu.tar + - xz -9ev iwyu.tar + - ls -l iwyu.tar.xz + - ls -lh iwyu.tar.xz + - base64 iwyu.tar.xz | pastebinit compiler: - - clang-3.3 - clang diff --git a/Global.h b/Global.h index adb41f62..ab3da031 100644 --- a/Global.h +++ b/Global.h @@ -60,9 +60,6 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size."); #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _USE_MATH_DEFINES -#include -#include - #include #include #include