Revision: 75347
http://sourceforge.net/p/brlcad/code/75347
Author: starseeker
Date: 2020-04-10 21:20:48 +0000 (Fri, 10 Apr 2020)
Log Message:
-----------
checkpoint
Modified Paths:
--------------
brlcad/trunk/doc/legal/embedded/CMakeLists.txt
brlcad/trunk/doc/legal/embedded/fnmatch.txt
brlcad/trunk/doc/legal/embedded/humanize.txt
brlcad/trunk/doc/legal/embedded/sha1.txt
brlcad/trunk/regress/licenses/licenses_check.cpp
brlcad/trunk/src/conv/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/doc/legal/embedded/shapelib.txt
Modified: brlcad/trunk/doc/legal/embedded/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/CMakeLists.txt 2020-04-10 21:16:49 UTC
(rev 75346)
+++ brlcad/trunk/doc/legal/embedded/CMakeLists.txt 2020-04-10 21:20:48 UTC
(rev 75347)
@@ -40,6 +40,7 @@
RTree.txt
search.txt
sha1.txt
+ shapelib.txt
sh_wood.txt
sobolseq.txt
SPSR.txt
Modified: brlcad/trunk/doc/legal/embedded/fnmatch.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/fnmatch.txt 2020-04-10 21:16:49 UTC (rev
75346)
+++ brlcad/trunk/doc/legal/embedded/fnmatch.txt 2020-04-10 21:20:48 UTC (rev
75347)
@@ -31,3 +31,7 @@
SUCH DAMAGE.
file:src/libbu/fnmatch.c
+
+Public domain, 2008, Todd C. Miller <[email protected]>
+
+file:src/libbu/charclass.h
Modified: brlcad/trunk/doc/legal/embedded/humanize.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/humanize.txt 2020-04-10 21:16:49 UTC
(rev 75346)
+++ brlcad/trunk/doc/legal/embedded/humanize.txt 2020-04-10 21:20:48 UTC
(rev 75347)
@@ -31,3 +31,30 @@
POSSIBILITY OF SUCH DAMAGE.
file:src/libbu/units_humanize.c
+
+Copyright 2012 Clifton Royston
+Copyright 2013 John-Mark Gurney
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+file:src/libbu/tests/humanize_number.c
Modified: brlcad/trunk/doc/legal/embedded/sha1.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/sha1.txt 2020-04-10 21:16:49 UTC (rev
75346)
+++ brlcad/trunk/doc/legal/embedded/sha1.txt 2020-04-10 21:20:48 UTC (rev
75347)
@@ -7,3 +7,4 @@
https://github.com/clibs/sha1
file:src/libbu/sha1.c
+file:src/libbu/sha1.h
Added: brlcad/trunk/doc/legal/embedded/shapelib.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/shapelib.txt
(rev 0)
+++ brlcad/trunk/doc/legal/embedded/shapelib.txt 2020-04-10 21:20:48 UTC
(rev 75347)
@@ -0,0 +1,38 @@
+The shapelib distribution has an LGPL COPYING file (see
+https://github.com/OSGeo/shapelib) but checking the sources the default license
+is actually an MIT style license with the option to use the LGPL if a project
+so chooses. Since the MIT style is simpler for BRL-CAD to use it is the one we
+opt for, and the default license terms are reproduced below:
+
+NOTE: the presence of the LICENSE.LGPL file in our source tree is for reference
+does not indicate that BRL-CAD has opted for LGPL rather than MIT licensing for
+our use of shapelib.
+
+Copyright (c) 1999, Frank Warmerdam
+
+This software is available under the following "MIT Style" license, or at the
+option of the licensee under the LGPL (see LICENSE.LGPL). This option is
+discussed in more detail in shapelib.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+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.
+
+file:src/conv/shp/shapelib/safileio.c
+file:src/conv/shp/shapelib/shapefil.h
+file:src/conv/shp/shapelib/shpopen.c
+
Property changes on: brlcad/trunk/doc/legal/embedded/shapelib.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/trunk/regress/licenses/licenses_check.cpp
===================================================================
--- brlcad/trunk/regress/licenses/licenses_check.cpp 2020-04-10 21:16:49 UTC
(rev 75346)
+++ brlcad/trunk/regress/licenses/licenses_check.cpp 2020-04-10 21:20:48 UTC
(rev 75347)
@@ -91,12 +91,13 @@
if (gov_copyright && public_domain) {
- std::cout << "Note: " << f << " has both gov copyright and public
domain references\n";
+ if (file_to_license.find(f) == file_to_license.end()) {
+ std::cerr << "FILE " << f << " has no associated reference in a
license file! (gov copyright + public domain references)\n";
+ }
return 0;
}
if (gov_copyright && other_copyright) {
if (file_to_license.find(f) == file_to_license.end()) {
- std::cerr << "FILE " << f << " has no associated reference in a
license file! (gov and non-gov copyright)\n";
}
return 0;
}
Modified: brlcad/trunk/src/conv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/CMakeLists.txt 2020-04-10 21:16:49 UTC (rev
75346)
+++ brlcad/trunk/src/conv/CMakeLists.txt 2020-04-10 21:20:48 UTC (rev
75347)
@@ -146,8 +146,6 @@
patch/pull_comp.sh
patch/pull_solidsub.sh
patch/rpatch.f
- shp/shapelib/LICENSE.LGPL
- shp/shapelib/license.html
shp/shapelib/shapefil.h
shp/README
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
