Merge branch 'master' into headertestfixes

AcademySoftwareFoundation · Jan 24, 2020 · 3c3e1b0 · 3c3e1b0
2 parents 64428ee + 8f43dd5
commit 3c3e1b0
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 17 deletions.
diff --git a/ASWF/tsc-meetings/2019-11-21.md b/ASWF/tsc-meetings/2019-11-21.md
@@ -0,0 +1,40 @@
+# 11/21/2019
+
+### Attending:
+
+* Cary Phillips
+* Christina Tempelaar-Lietz
+* Peter Hillman
+* Nick Porcino
+* Larry Gritz
+
+### Discussion:
+
+* The repo has moved. All seems to have gone smoothly.
+
+* Looks like azure pipeline needs to be set up in the new org. PR’s
+  are not currently triggering builds.
+
+* Larry asked about GitHub merge policy. “Allow squash merging” has
+  now been turned on.
+
+* Imath repo: Let’s begin with a very simple example of pybind11, then
+  add to it gradually.
+
+* Nick: We should remove ImathRandom from Imath, and rely on C++11
+  random. But this will require careful testing.
+
+* #484 - the “-x” option to limit memory usage: not worth the
+  complexity. We considered this back when we were questioning how to
+  deal with security vulnerabilities, but none of us feel that this is
+  a necessary feature, or one that adequately addresses a security
+  issue.
+
+* #591 - pthread support for mingw: PR needs serious cleanup, not
+  acceptable in its current form.
+
+* #215 - uninstall target: good enough idea, but we’d like a “dry run”
+   option.
+
+* #344 - new DwaCompressor setting. Should be a part of a performance
+  metric suite.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -105,24 +105,23 @@ can be merged.
 
 * If you are an individual writing the code on your own time and
   you're SURE you are the sole owner of any intellectual property you
-  contribute, you can [signing the CLA as an individual contributor](https://github.com/communitybridge/easycla/blob/master/docs/sign-a-cla-as-an-individual-contributor-to-github.md).
+  contribute, you can [sign the CLA as an individual contributor](https://github.com/communitybridge/easycla/blob/master/docs/sign-a-cla-as-an-individual-contributor-to-github.md).
 
 * If you are writing the code as part of your job, or if there is any
   possibility that your employers might think they own any
   intellectual property you create, then you should use the [Corporate
   Contributor Licence
   Agreement](https://github.com/communitybridge/easycla/blob/master/docs/contribute-to-a-github-company-project.md).
 
-The OpenEXR CLA's are the standard forms used by Linux Foundation
+The OpenEXR CLAs are the standard forms used by Linux Foundation
 projects and [recommended by the ASWF TAC](https://github.com/AcademySoftwareFoundation/tac/blob/master/process/contributing.md#contributor-license-agreement-cla).
 
 ### Commit Sign-Off
 
 Every commit must be signed off.  That is, every commit log message
 must include a “`Signed-off-by`” line (generated, for example, with
 “`git commit --signoff`”), indicating that the committer wrote the
-code and has the right to release it under the
-[Modified-BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
+code and has the right to release it under the [BSD-3-Clause](LICENSE.md)
 license. See https://github.com/AcademySoftwareFoundation/tac/blob/master/process/contributing.md#contribution-sign-off for more information on this requirement.
 
 ## Development Workflow

diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt
@@ -48,7 +48,11 @@ include(config/LibraryDefine.cmake)
 
 add_subdirectory( IlmImf )
 add_subdirectory( IlmImfUtil )
-add_subdirectory( IlmImfExamples )
+
+option(INSTALL_OPENEXR_EXAMPLES "Install OpenEXR examples" ON)
+if(INSTALL_OPENEXR_EXAMPLES)
+  add_subdirectory( IlmImfExamples )
+endif()
 
 ##########################
 # Tests
@@ -78,4 +82,7 @@ if(OPENEXR_BUILD_UTILS)
   add_subdirectory( exrmultipart )
 endif()
 
-add_subdirectory(doc)
+option(INSTALL_OPENEXR_DOCS "Install OpenEXR documentation" ON)
+if(INSTALL_OPENEXR_DOCS)
+  add_subdirectory(doc)
+endif()
diff --git a/OpenEXR/IlmImf/ImfCRgbaFile.h b/OpenEXR/IlmImf/ImfCRgbaFile.h
@@ -443,6 +443,7 @@ int	       	ImfTiledOutputLevelRoundingMode
 struct ImfInputFile;
 typedef struct ImfInputFile ImfInputFile;
 
+IMF_EXPORT
 ImfInputFile *		ImfOpenInputFile (const char name[]);
 
 IMF_EXPORT 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-[![License](https://img.shields.io/badge/License-BSD%203%20Clause-blue.svg)](LICENSE.md)
+[![License](https://img.shields.io/github/license/AcademySoftwareFoundation/openexr)](LICENSE.md)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2799/badge)](https://bestpractices.coreinfrastructure.org/projects/2799)
-[![Build Status](https://dev.azure.com/openexr/OpenEXR/_apis/build/status/openexr.openexr?branchName=master)](https://dev.azure.com/openexr/OpenEXR/_build/latest?definitionId=1&branchName=master)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=openexr_openexr&metric=alert_status)](https://sonarcloud.io/dashboard?id=openexr_openexr)
+[![Build Status](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_apis/build/status/academysoftwarefoundation.openexr)](https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_build?definitionId=4&_a=summary)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=AcademySoftwareFoundation_openexr&metric=alert_status)](https://sonarcloud.io/dashboard?id=AcademySoftwareFoundation_openexr)
 
 # OpenEXR
 
@@ -98,7 +98,7 @@ package.
 
 ### OpenEXR Project Goverance
 
-OpenEXR is governed by the Academy Software Foundation. See
+OpenEXR is hosted by the Academy Software Foundation. See
 [GOVERNANCE](GOVERNANCE.md) for more infomation about how the project
 operates.
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -22,6 +22,9 @@ schedules:
         - master
     always: true
 
+variables:
+  - group: sonar
+
 jobs:
 # ------------------------------------------------------------------------------
 # Linux

diff --git a/share/ci/templates/build_sonar.yml b/share/ci/templates/build_sonar.yml
@@ -25,7 +25,5 @@ steps:
 - bash: share/ci/scripts/linux/run_gcov.sh
   displayName: Generate code coverage report
 
-- bash: sonar-scanner -X -Dsonar.login=$SONAR_TOKEN
-  env:
-    SONAR_TOKEN: $(tokens.sonarCloud)
+- bash: sonar-scanner -X -Dsonar.login=$(SONAR_TOKEN)
   displayName: Run sonar-scanner
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -4,14 +4,14 @@
 sonar.host.url=https://sonarcloud.io
 
 # Required metadata
-sonar.organization=openexr-github
-sonar.projectKey=openexr_openexr
+sonar.organization=academysoftwarefoundation
+sonar.projectKey=AcademySoftwareFoundation_openexr
 sonar.projectName=OpenEXR
-sonar.projectVersion=2.3
+sonar.projectVersion=2.4
 
 # Project links
 sonar.links.homepage=http://openexr.com
-sonar.links.ci=https://dev.azure.com/OpenEXR/_build
+sonar.links.ci=https://dev.azure.com/academysoftwarefoundation/Academy%20Software%20Foundation/_build?definitionId=4&_a=summary
 sonar.links.scm=https://github.com/AcademySoftwareFoundation/openexr
 sonar.links.issue=https://github.com/AcademySoftwareFoundation/openexr/issues