Skip to content

Commit

Permalink
Reflect the company name change from ITI GmbH to ESI ITI GmbH
Browse files Browse the repository at this point in the history
  • Loading branch information
tbeu committed Mar 30, 2016
1 parent fe0c756 commit 6b8952f
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
23 changes: 12 additions & 11 deletions LICENSE
Expand Up @@ -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
Expand All @@ -28,15 +29,15 @@ POSSIBILITY OF SUCH DAMAGE.

<http://opensource.org/licenses/BSD-3-Clause>

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

The Result Compare uses the Commandline Parser
<http://commandline.codeplex.com/> that has been published under the MIT
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"),
Expand All @@ -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.
DEALINGS IN THE SOFTWARE.
19 changes: 10 additions & 9 deletions Modelica_ResultCompare/Program.cs
Expand Up @@ -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
Expand Down Expand Up @@ -412,4 +413,4 @@ private static bool RunFMUChecker(Options options, DirectoryInfo dirCompare, ref
return bRet;
}
}
}
}
4 changes: 2 additions & 2 deletions Modelica_ResultCompare/Properties/AssemblyInfo.cs
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion deploy.sh
Expand Up @@ -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
Expand Down

0 comments on commit 6b8952f

Please sign in to comment.