Merge pull request #4910 from NREL/4909_new_license

Fix #4909 - Update license to new format

.git-blame-ignore-revs

@@ -146,3 +146,5 @@ e68712c411aed305d984fc20758eebd6c69b44ee
 # chore: update copyrights to 2023 [Alex Swindler, 2023-04-07]
 529c169a2327d59b201cf8f60be11e612b2a1a8f
 
+# [chore] Update copyrights (maybe for the last time?) [Julien Marrec, 2023-06-06]
+c12880d0ee6696d0270e4ea4de8c9d4ae76223fd

LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 following conditions are met:
@@ -9,12 +9,19 @@ disclaimer.
 (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
 disclaimer in the documentation and/or other materials provided with the distribution.
 
-(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
+(3) Redistribution of this software, without modification, must refer to the software by the same designation.
+Redistribution of a modified version of this software (i) may not refer to the modified version by the same designation,
+or by any confusingly similar designation, and (ii) must refer to the underlying software originally provided by
+Alliance as “OpenStudio(R)”. Except to comply with the foregoing, the term “OpenStudio(R)”, or any confusingly similar
+designation may not be used to refer to any modified version of this software or any modified version of the underlying
+software originally provided by Alliance without the prior written consent of Alliance.
+
+Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
 derived from this software without specific prior written permission from the respective party.
 
-(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
-may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
-written permission from Alliance for Sustainable Energy, LLC.
+(4) The name of the copyright holder(s), any contributors, the United States Government, the United States Department
+of Energy, or any of their employees may not be used to endorse or promote products derived from this software without
+specific prior written permission from the respective party.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

copyright.txt

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 following conditions are met:
@@ -9,12 +9,19 @@ disclaimer.
 (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
 disclaimer in the documentation and/or other materials provided with the distribution.
 
-(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
+(3) Redistribution of this software, without modification, must refer to the software by the same designation.
+Redistribution of a modified version of this software (i) may not refer to the modified version by the same designation,
+or by any confusingly similar designation, and (ii) must refer to the underlying software originally provided by
+Alliance as “OpenStudio(R)”. Except to comply with the foregoing, the term “OpenStudio(R)”, or any confusingly similar
+designation may not be used to refer to any modified version of this software or any modified version of the underlying
+software originally provided by Alliance without the prior written consent of Alliance.
+
+Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
 derived from this software without specific prior written permission from the respective party.
 
-(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
-may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
-written permission from Alliance for Sustainable Energy, LLC.
+(4) The name of the copyright holder(s), any contributors, the United States Government, the United States Department
+of Energy, or any of their employees may not be used to endorse or promote products derived from this software without
+specific prior written permission from the respective party.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,10 +33,9 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-
 *** OTHER CREDITS AND ATTRIBUTION *********************************************
 
-The following third-party software is included in the Software and additional terms may apply for use of the third-party 
+The following third-party software is included in the Software and additional terms may apply for use of the third-party
 software:
 
 
@@ -60,9 +66,7 @@ DEALINGS IN THE SOFTWARE.
 
 
 *** EnergyPlus ****************************************************************
-EnergyPlus, Copyright (c) 1996-2016, The Board of Trustees of the University of Illinois and The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
-
-If you have questions about your rights to use or distribute this software, please contact Berkeley Lab's Innovation & Partnerships Office at IPO@lbl.gov.
+EnergyPlus, Copyright (c) 1996-2023, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
 
 NOTICE: This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit others to do so.
 
@@ -74,7 +78,7 @@ Redistribution and use in source and binary forms, with or without modification,
 
 (3) Neither the name of the University of California, Lawrence Berkeley National Laboratory, the University of Illinois, U.S. Dept. of Energy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-(4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in stand-alone form without changes from the version obtained under this License, or (ii) Licensee makes a reference solely to the software portion of its product, Licensee must refer to the software as "EnergyPlus version X" software, where "X" is the version number Licensee obtained under this License and may not use a different name for the software. Except as specifically required in this Section (4), Licensee shall not use in a company name, a product name, in advertising, publicity, or other promotional activities any name, trade name, trademark, logo, or other designation of "EnergyPlus", "E+", "e+" or confusingly similar designation, without Lawrence Berkeley National Laboratory's prior written consent.
+(4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in stand-alone form without changes from the version obtained under this License, or (ii) Licensee makes a reference solely to the software portion of its product, Licensee must refer to the software as "EnergyPlus version X" software, where "X" is the version number Licensee obtained under this License and may not use a different name for the software. Except as specifically required in this Section (4), Licensee shall not use in a company name, a product name, in advertising, publicity, or other promotional activities any name, trade name, trademark, logo, or other designation of "EnergyPlus", "E+", "e+" or confusingly similar designation, without the U.S. Department of Energy's prior written consent.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
@@ -181,7 +185,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -236,21 +240,21 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -265,10 +269,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -280,14 +284,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
- 
- 
+
+
 *** PolyPartition  ************************************************************
 Copyright (C) 2011 by Ivan Fratric
 
@@ -311,7 +315,7 @@ THE SOFTWARE.
 
 
 *** Strawberry Perl ***********************************************************
-Some distributions of OpenStudio include Strawberry Perl. 
+Some distributions of OpenStudio include Strawberry Perl.
 
 Please see Strawberry Perl’s licenses subdirectory for license information.
 
@@ -790,7 +794,7 @@ As an additional permission to the GNU Lesser General Public License version
 2.1, the object code form of a "work that uses the Library" may incorporate
 material from a header file that is part of the Library.  You may distribute
 such object code under terms of your choice, provided that:
-    (i)   the header files of the Library have not been modified; and 
+    (i)   the header files of the Library have not been modified; and
     (ii)  the incorporated material is limited to numerical parameters, data
           structure layouts, accessors, macros, inline functions and
           templates; and
@@ -921,7 +925,7 @@ You can redistribute it and/or modify it under either the terms of the
      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
      PURPOSE.
-     
+
 *** Spider gbXML Tools ********************************************************
 
 MIT License

csharp/CSharpAPI.hpp

@@ -1,14 +1,19 @@
+/***********************************************************************************************************************
+*  OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+*  See also https://openstudio.net/license
+***********************************************************************************************************************/
+
 #ifndef CSHARPAPI_HPP
 #define CSHARPAPI_HPP
 
-  #if (_WIN32 || _MSC_VER)
-    #ifdef openstudio_csharp_EXPORTS
-      #define CSHARP_API __declspec(dllexport)
-    #else
-      #define CSHARP_API __declspec(dllimport)
-    #endif
-  #else
-    #define CSHARP_API
-  #endif
+#if (_WIN32 || _MSC_VER)
+#  ifdef openstudio_csharp_EXPORTS
+#    define CSHARP_API __declspec(dllexport)
+#  else
+#    define CSHARP_API __declspec(dllimport)
+#  endif
+#else
+#  define CSHARP_API
+#endif
 
 #endif

csharp/openstudio_csharp.cpp

@@ -1,11 +1,12 @@
-#include "openstudio_csharp.hpp"
-
-extern "C" {
-
+/***********************************************************************************************************************
+*  OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+*  See also https://openstudio.net/license
+***********************************************************************************************************************/
 
-void Init_openstudio_csharp(void) {
+#include "openstudio_csharp.hpp"
 
-}
+extern "C"
+{
 
+  void Init_openstudio_csharp(void) {}
 }
-

csharp/openstudio_csharp.hpp

@@ -1,7 +1,12 @@
+/***********************************************************************************************************************
+*  OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+*  See also https://openstudio.net/license
+***********************************************************************************************************************/
+
 #include "CSharpAPI.hpp"
 
-extern "C" {
+extern "C"
+{
 
   CSHARP_API void Init_openstudio_csharp(void);
-
 }

developer/ruby/ApplyCopyright.rb

@@ -1,34 +1,34 @@
-# Inserts copyright at beginning of each
-#
-# Inputs:
-#   ARGV[0] - path to top level cmake source directory (one level above 'src' directory)
+# Inserts copyright at beginning of each ruby/
 
 require 'pathname'
 require 'rubygems'
 require 'fileutils'
 
 include FileUtils
 
-# check that called from command line directly
-if not ($0 == __FILE__)
-  puts "#{__FILE__} called from external script"
-  exit
-end
 
-basepath = ARGV[0].gsub("\\", "/")
+ROOT_DIR = File.absolute_path(File.join(File.dirname(__FILE__), "../../"))
+LICENSE_PATH = File.join(ROOT_DIR, 'LICENSE.md')
+
+
+license_lines = File.readlines(LICENSE_PATH)
+# Now with short version
+license_lines = [
+  "OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.\n",
+  "See also https://openstudio.net/license\n"
+]
+
 
 copyright = "/***********************************************************************************************************************\n"
 ruby_copyright = "########################################################################################################################\n"
-File.open(basepath + "/../LICENSE.md") do |file|
-  while (line = file.gets)
-    if line.strip.empty?
-      copyright +=  "*" + line
-      ruby_copyright += "#" + line
-
-    else
-      copyright += "*  " + line
-      ruby_copyright += "#  " + line
-    end
+license_lines.each do |line|
+  if line.strip.empty?
+    copyright +=  "*" + line
+    ruby_copyright += "#" + line
+
+  else
+    copyright += "*  " + line
+    ruby_copyright += "#  " + line
   end
 end
 copyright += "***********************************************************************************************************************/\n\n"
@@ -37,25 +37,18 @@
 # first do c++
 
 # exceptions are files that are not part of OpenStudio
-exceptions = [basepath + "/src/geographic_lib/",
-              basepath + "/src/google_test/",
-              basepath + "/src/jsoncpp/",
-              basepath + "/src/nano/",
-              basepath + "/src/polypartition/",
-              basepath + "/src/pugixml/",
-              basepath + "/src/qtwinmigrate/",
-              basepath + "/src/qwt/",
-              basepath + "/src/sqlite/",
-              basepath + "/src/zlib/",
-              basepath + "/src/utilities/sql/Sqlite3.c",
-              basepath + "/src/utilities/sql/Sqlite3.h",
-              "mainpage.hpp"]
+exceptions = [
+  File.join(ROOT_DIR, "ci"),
+  File.join(ROOT_DIR, "developer"),
+  File.join(ROOT_DIR, "src/nano/"),
+  File.join(ROOT_DIR, "src/polypartition/"),
+  "mainpage.hpp",
+  "empty.hpp"
+]
 
 # glob for hpp and cpp
-files = Dir.glob(basepath + "/src/**/*.[ch]pp")
-files.concat Dir.glob(basepath + "/ruby/**/*.[ch]pp")
-files.concat Dir.glob(basepath + "/src/**/*.cxx.in")
-files.concat Dir.glob(basepath + "/src/**/*.tmp")
+files = Dir.glob(File.join(ROOT_DIR, "**/*.[ch]pp"))
+files += Dir.glob(File.join(ROOT_DIR, "**/*.[ch]xx.in"))
 
 # reject exceptions
 files.reject! do |p|
@@ -106,8 +99,9 @@
 # exceptions are files that are not part of OpenStudio
 exceptions = []
 
-# glob for rb
-files = Dir.glob(basepath + "/ruby/**/*.rb")
+# glob for rb and py
+files = Dir.glob(File.join(ROOT_DIR, "ruby/**/*.rb"))
+files += Dir.glob(File.join(ROOT_DIR, "python/**/*.py"))
 
 # reject exceptions
 files.reject! do |p|