Permalink
Browse files

One more license thing.

[ci skip]
  • Loading branch information...
1 parent bab980e commit 287aadaee8b9f3747fc9b8b7611cee23e56816d8 @navv1234 navv1234 committed Sep 13, 2016
Showing with 33 additions and 7 deletions.
  1. +21 −0 LICENSE.BOOST
  2. +11 −6 README.md
  3. +1 −1 qt/osx_release.sh
View
@@ -0,0 +1,21 @@
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
View
@@ -72,19 +72,24 @@ This program uses the following external libraries.
RapidJSON (http://rapidjson.org)
Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-MIT License (see LICENSE.MIT for more information)
+MIT License (see LICENSE.MIT for more information).
RapidXML (http://rapidxml.sourceforge.net/index.htm)
Copyright (c) 2006, 2007 Marcin Kalicinski. All rights reserved.
-MIT License (see LICENSE.MIT for more information)
+MIT License (see LICENSE.MIT for more information).
The MSInttypes r29 (https://code.google.com/p/msinttypes/)
-Copyright (c) Alexander Chemeris. All rights reserved
-BSD 3-Clause License (see LICENSE.BSD for more information)
+Copyright (c) Alexander Chemeris. All rights reserved.
+BSD 3-Clause License (see LICENSE.BSD for more information).
The Qt Toolkit (http://qt.io)
-Copyright (c) 2016 The Qt Company Ltd. and other contributors.
-GNU Lesser General Public License, version 3 (see LICENSE.LGPL for more information)
+Copyright (c) 2016 The Qt Company Ltd. and other contributors. All rights reserved.
+GNU Lesser General Public License, version 3 (see LICENSE.LGPL for more information).
+
+UTF-8 CPP (http://utfcpp.sourceforge.net)
+
+Copyright (c) 2006 Nemanja Trifunovic. All rights reserved.
+Boost Software License, Version 1.0 (see LICENSE.BOOST for more information).
View
@@ -13,7 +13,7 @@ if [ -d $DEPLOY_DIR ]; then
sed -i -e "s/GIT-REV-PARSE-HERE/$REVISION/" $DEPLOY_DIR/SimulationCraft.app/Contents/Info.plist
sed -i -e "s/VERSION-PARSE-HERE/$MAJOR_VERSION\.$MINOR_VERSION/" $DEPLOY_DIR/SimulationCraft.app/Contents/Info.plist
- hdiutil create -srcfolder $DEPLOY_DIR/.Trash -srcfolder $DEPLOY_DIR/SimulationCraft.app -srcfolder profiles -srcfolder COPYING -srcfolder LICENSE.BSD -srcfolder LICENSE.MIT -srcfolder LICENSE.LGPL -srcfolder README.md -srcfolder "simc" -nospotlight -format UDBZ -stretch 1g -volname "Simulationcraft v`defaults read $DEPLOY_DIR/SimulationCraft.app/Contents/Info CFBundleVersion`" -ov simc-$MAJOR_VERSION-$MINOR_VERSION-osx-x86.dmg
+ hdiutil create -srcfolder $DEPLOY_DIR/.Trash -srcfolder $DEPLOY_DIR/SimulationCraft.app -srcfolder profiles -srcfolder COPYING -srcfolder LICENSE.BOOST -srcfolder LICENSE.BSD -srcfolder LICENSE.MIT -srcfolder LICENSE.LGPL -srcfolder README.md -srcfolder "simc" -nospotlight -format UDBZ -stretch 1g -volname "Simulationcraft v`defaults read $DEPLOY_DIR/SimulationCraft.app/Contents/Info CFBundleVersion`" -ov simc-$MAJOR_VERSION-$MINOR_VERSION-osx-x86.dmg
rm -rf $DEPLOY_DIR
fi

0 comments on commit 287aada

Please sign in to comment.