Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #633 - Apply short style copyright and hopefully for the last time #741

Merged
merged 5 commits into from
Sep 4, 2024

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Sep 4, 2024

That's the kind of PRs I like:

image

@jmarrec jmarrec self-assigned this Sep 4, 2024
@jmarrec jmarrec force-pushed the 633_ShortStyleCopyright branch from 2c3fbd7 to ad6556e Compare September 4, 2024 09:30
@@ -524,6 +524,7 @@ set(QT_INSTALL_DIR "" CACHE PATH "Path to Qt Install")
set(QT_VERSION "6.5.2" CACHE STRING "Qt target version, defaults to 6.5.2")

# For AboutBox, but also validates that the version is valid
string(TIMESTAMP CURRENT_YEAR "%Y")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get current year by cmake

<h2>ModelEditor</h2> \
<p>Version: ${OPENSTUDIOAPPLICATION_LONG_VERSION}</p> \
<p>Compiler: ${ABOUT_COMPILER}</p> \
<p>openstudio SDK (core) version: ${openstudio_VERSION}</p> \
<p>Copyright &copy; 2008-2019, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.</p> \
<p>Copyright &copy; 2020-${CURRENT_YEAR}, OpenStudio Coalition and other contributors. All rights reserved.</p> \
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use that in AboutBox

@@ -5,10 +5,10 @@
<p>Version: ${OPENSTUDIOAPPLICATION_LONG_VERSION}</p> \
<p>Compiler: ${ABOUT_COMPILER}</p> \
<p><a href='https://openstudio.net'>OpenStudio SDK (core)</a> version: ${openstudio_VERSION}</p> \
<p>Copyright &copy; 2020-2023, OpenStudio Coalition and other contributors. All rights reserved.</p> \
<p>Copyright &copy; 2020-${CURRENT_YEAR}, OpenStudio Coalition and other contributors. All rights reserved.</p> \
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here

<p>OpenStudio is a cross-platform tool to support whole building energy and daylight modeling using <a href='http://apps1.eere.energy.gov/buildings/energyplus/'>EnergyPlus</a> and <a href='http://www.radiance-online.org/'>Radiance</a>.</p> \
<p>OpenStudio uses the following QT modules (version ${QT_VERSION}) that are dynamically linked using GNU Lesser General Public License (LGPL): \
<font size='2'>Qt6Core, Qt6Core5Compat Qt6Widgets, Qt6Network, Qt6Concurrent, Qt6PrintSupport, Qt6Gui, Qt6Quick, Qt6QuickWidgets, Qt6Qml, Qt6QmlModels, Qt6WebChannel, Qt6Positioning, Qt6WebEngine, Qt6WebEngineWidgets, QtWebEngineCore, Qt6DBus, Qt6Xml, Qt6Svg, Qt6OpenGL</font> </p> \
<font size='2'>Qt6Core, Qt6Core5Compat Qt6Widgets, Qt6Network, Qt6Concurrent, Qt6PrintSupport, Qt6Gui, Qt6Quick, Qt6QuickWidgets, Qt6Qml, Qt6QmlModels, Qt6WebChannel, Qt6Positioning, Qt6WebEngine, Qt6WebEngineWidgets, QtWebEngineCore, Qt6DBus, Qt6Xml, Qt6Svg, Qt6Charts, Qt6OpenGL, Qt6OpenGLWidgets</font> </p> \
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And add the new Qt deps here

Comment on lines +2 to +3
* OpenStudio(R), Copyright (c) OpenStudio Coalition and other contributors.
* See also https://openstudiocoalition.org/about/software_license/
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cpp example change

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what it's worth, that webpage points in turn to the root of the repo's LICENSE.md

https://openstudiocoalition.org/about/software_license/

Visit the BSD3 license web page for details on the terms of use.

Comment on lines +2 to +3
# OpenStudio(R), Copyright (c) OpenStudio Coalition and other contributors.
# See also https://openstudiocoalition.org/about/software_license/
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ruby example change

@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2020-2023, OpenStudio Coalition and other contributors. All rights reserved.
OpenStudio(R), Copyright (c) 2020-2024, OpenStudio Coalition and other contributors. All rights reserved.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the root LICENSE.md. This is the ONLY file we need to keep up to date now! 🎊

@jmarrec jmarrec merged commit 58ecf75 into develop Sep 4, 2024
10 checks passed
@jmarrec jmarrec deleted the 633_ShortStyleCopyright branch September 4, 2024 11:26
@github-actions github-actions bot locked and limited conversation to collaborators Sep 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Simplify license docstring in files
1 participant