From 537f8deeec40c1745f355a1004c006eb0d72fc8e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 14 Jan 2016 13:22:59 -0800 Subject: [PATCH] update to new license in root and installer --- LICENSE | 25 ++++++++++++------------- cmake/installer/InstallerLicense.txt | 12 ------------ cmake/macros/GenerateInstallers.cmake | 2 +- 3 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 cmake/installer/InstallerLicense.txt diff --git a/LICENSE b/LICENSE index 93c9a953d4..53c5ccf39a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,12 @@ -Copyright 2014 High Fidelity, Inc. - -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. \ No newline at end of file +Copyright (c) 2013-2016, High Fidelity, Inc. +All rights reserved. +licensing@highfidelity.io + +Licensed under the Apache License version 2.0 (the "License"); +You may not use this software except in compliance with the License. +You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0 + +This software includes third-party software. +Please see each individual software license for additional details. + +This software is distributed "as-is" without any warranties, conditions, or representations whether express or implied, including without limitation the implied warranties and conditions of merchantability, merchantable quality, fitness for a particular purpose, performance, durability, title, non-infringement, and those arising from statute or from custom or usage of trade or course of dealing. diff --git a/cmake/installer/InstallerLicense.txt b/cmake/installer/InstallerLicense.txt deleted file mode 100644 index 9f69dbd942..0000000000 --- a/cmake/installer/InstallerLicense.txt +++ /dev/null @@ -1,12 +0,0 @@ -Copyright (c) 2013-2016, High Fidelity, Inc. -All rights reserved. -licensing@highfidelity.io - -Licensed under the Apache License version 2.0 (the "License"); -You may not use this software except in compliance with the License. -You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0 - -This software includes third-party software. -Please see each individual software license for additional details. - -THIS SOFTWARE IS DISTRIBUTED "AS-IS" WITHOUT ANY WARRANTIES, CONDITIONS AND REPRESENTATIONS WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY, FITNESS FOR A PARTICULAR PURPOSE, PERFORMANCE, DURABILITY, TITLE, NON-INFRINGEMENT, AND THOSE ARISING BY STATUTE OR FROM CUSTOM OR USAGE OF TRADE OR COURSE OF DEALING. diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index a8b4cf16eb..d5f2f21558 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/cmake/macros/GenerateInstallers.cmake @@ -25,7 +25,7 @@ macro(GENERATE_INSTALLERS) set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME}) set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/Installer.ico") - set(CPACK_RESOURCE_FILE_LICENSE "${HF_CMAKE_DIR}/installer/InstallerLicense.txt") + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") # configure a cpack properties file for custom variables in NSIS template set(CPACK_CONFIGURED_PROP_FILE "${CMAKE_CURRENT_BINARY_DIR}/CPackCustomProperties.cmake")