From 6b8952fda1b28dcb18323d65ec49e13b860efe05 Mon Sep 17 00:00:00 2001 From: tbeu Date: Wed, 30 Mar 2016 09:47:44 +0200 Subject: [PATCH] Reflect the company name change from ITI GmbH to ESI ITI GmbH --- LICENSE | 23 ++++++++++--------- Modelica_ResultCompare/Program.cs | 19 +++++++-------- .../Properties/AssemblyInfo.cs | 4 ++-- deploy.sh | 2 +- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/LICENSE b/LICENSE index 411c04e..0bc724e 100644 --- a/LICENSE +++ b/LICENSE @@ -4,15 +4,16 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -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. +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -Neither the name of the ITI GmbH nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. +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 its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -28,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. -* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * The Result Compare uses the Commandline Parser that has been published under the MIT @@ -36,7 +37,7 @@ License: The MIT License (MIT) -Copyright (c) 2005 - 2012 Giacomo Stelluti Scala +Copyright (c) 2005-2012, Giacomo Stelluti Scala Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -55,4 +56,4 @@ 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. \ No newline at end of file +DEALINGS IN THE SOFTWARE. diff --git a/Modelica_ResultCompare/Program.cs b/Modelica_ResultCompare/Program.cs index 3a8edbe..c3c5942 100644 --- a/Modelica_ResultCompare/Program.cs +++ b/Modelica_ResultCompare/Program.cs @@ -4,15 +4,16 @@ /// Redistribution and use in source and binary forms, with or without /// modification, are permitted provided that the following conditions are met: /// -/// Redistributions of source code must retain the above copyright notice, -/// this list of conditions and the following disclaimer. -/// 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. +/// 1. Redistributions of source code must retain the above copyright notice, +/// this list of conditions and the following disclaimer. /// -/// Neither the name of the ITI GmbH nor the names of its contributors may be -/// used to endorse or promote products derived from this software without -/// specific prior written permission. +/// 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 its contributors +/// may be used to endorse or promote products derived from this software without +/// specific prior written permission. /// /// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" /// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -412,4 +413,4 @@ private static bool RunFMUChecker(Options options, DirectoryInfo dirCompare, ref return bRet; } } -} \ No newline at end of file +} diff --git a/Modelica_ResultCompare/Properties/AssemblyInfo.cs b/Modelica_ResultCompare/Properties/AssemblyInfo.cs index c665ba4..4b3fd48 100644 --- a/Modelica_ResultCompare/Properties/AssemblyInfo.cs +++ b/Modelica_ResultCompare/Properties/AssemblyInfo.cs @@ -10,9 +10,9 @@ [assembly: AssemblyTitle("CSV File Comparison Tool")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("ITI GmbH")] +[assembly: AssemblyCompany("ESI ITI GmbH")] [assembly: AssemblyProduct("compare")] -[assembly: AssemblyCopyright("Copyright © 2015-2016 - ITI GmbH")] +[assembly: AssemblyCopyright("Copyright © 2015-2016 - ESI ITI GmbH")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: AssemblyInformationalVersionAttribute("2.0.0.1")] diff --git a/deploy.sh b/deploy.sh index c16cd51..fa64d8f 100644 --- a/deploy.sh +++ b/deploy.sh @@ -19,7 +19,7 @@ then echo file version set to $fileversion sed -i 's/\(AssemblyInformationalVersionAttribute\)(.*/\1("'$version'")]/' $output echo informational version set to $version - sed -i 's/\(AssemblyCopyright\).*/AssemblyCopyright("Copyright © '$dt' ITI GmbH")]/' $output + sed -i 's/\(AssemblyCopyright\).*/AssemblyCopyright("Copyright © '$dt' ESI ITI GmbH")]/' $output else echo "No template found @"$input! exit 1