Dec 13 LAGraph meeting: fix copyright, remove LG_init.h

DrTimothyAldenDavis · Dec 13, 2023 · 4d35c08 · 4d35c08
1 parent 050a892
commit 4d35c08
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 40 deletions.
diff --git a/LAGraph/Acknowledgments.txt b/LAGraph/Acknowledgments.txt
@@ -16,7 +16,7 @@ THIS WORK IS FUNDED IN PART BY:
 THIS WORK BUILDS UPON THE FOLLOWING PRIOR WORKS:
 1.  SuiteSparse:GraphBLAS, 
     (http://faculty.cse.tamu.edu/davis/GraphBLAS.html) 
-    Copyright 2017-2022  Timothy A. Davis (Author), AldenMath.com.
+    Copyright 2017-2023  Timothy A. Davis (Author), AldenMath.com.
     By Tim Davis, Texas A&M University. Note that while SuiteSparse:GraphBLAS
     is itself under the Apache 2 license, any contributions derived from
     SuiteSparse:GraphBLAS and incorporated by the Author into LAGraph are

diff --git a/LAGraph/config/LAGraph.pc.in b/LAGraph/config/LAGraph.pc.in
@@ -1,5 +1,4 @@
-# LAGraph, Copyright (c) 2019-2023, Timothy A. Davis.
-# All Rights Reserved.
+# LAGraph, Copyright (c) 2019-2023, LAGraph Contributors. All Rights Reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
 prefix=@prefix@

diff --git a/LAGraph/config/LAGraphConfig.cmake.in b/LAGraph/config/LAGraphConfig.cmake.in
@@ -4,7 +4,8 @@
 
 # The following copyright and license applies to just this file only, not to
 # the library itself:
-# LAGraphConfig.cmake, Copyright (c) 2023, Timothy A. Davis.  All Rights Reserved.
+# LAGraphConfig.cmake, Copyright (c) 2019-2023, LAGraph Contributors. All
+# Rights Reserved.
 # SPDX-License-Identifier: BSD-3-clause
 
 #-------------------------------------------------------------------------------

diff --git a/LAGraph/src/test/test_Xinit.c b/LAGraph/src/test/test_Xinit.c
@@ -17,7 +17,10 @@
 
 #include "LAGraph_test.h"
 #include "LAGraphX.h"
-#include "LG_init.h"
+
+// functions defined in LAGr_Init.c:
+LAGRAPH_PUBLIC void LG_set_LAGr_Init_has_been_called (bool setting) ;
+LAGRAPH_PUBLIC bool LG_get_LAGr_Init_has_been_called (void) ;
 
 //------------------------------------------------------------------------------
 // global variables

diff --git a/LAGraph/src/utility/LAGr_Init.c b/LAGraph/src/utility/LAGr_Init.c
@@ -31,10 +31,12 @@
 
 static bool LG_LAGr_Init_has_been_called = false ;
 
-// LG_LAGr_Init_has_been_called is only modified or accessed by these two
-// routines (even in this file):
+// LG_LAGr_Init_has_been_called is only modified or accessed by the following
+// two routines (even in this file).  The two functions are made accessible via
+// LAGRAPH_PUBLIC, only for testing purposes by src/test/test_Xinit.c.
 
-#include "LG_init.h"
+LAGRAPH_PUBLIC void LG_set_LAGr_Init_has_been_called (bool setting) ;
+LAGRAPH_PUBLIC bool LG_get_LAGr_Init_has_been_called (void) ;
 
 LAGRAPH_PUBLIC
 void LG_set_LAGr_Init_has_been_called (bool setting)

diff --git a/LAGraph/src/utility/LG_init.h b/LAGraph/src/utility/LG_init.h