Release version 1.2.1100+2v1.2.1100+2

Fix libz/buildfile.
Disable success build emails.
Canonicalize license in package manifest.
Make the .map and .def files prerequisites of the libs type target.
Turn libz/LICENSE into symlink.

4 files changed, 11 insertions, 42 deletions

diff --git a/TODO b/TODO
index 6ca67fb..da80960 100644
--- a/TODO
+++ b/TODO
@@ -1,17 +1,5 @@
 On the revision:
 
-- Make the .map and .def files prerequisites of the libs type target and only
-  on the respective OSes.
-
-- Fix the switch statements in the buildfiles, replacing 'switch $c.class,
-  $tsys' with 'switch $c.class'.
-
-- Canonicalize the license in the package manifest.
-
-- Disable the success build emails.
-
-- Make libz/LICENSE a symlink to the file in the project root directory.
-
 On the release:
 
 - Use legal{} target type for legal documentation (LICENSE, AUTHORS, etc).
diff --git a/libz/LICENSE b/libz/LICENSE
index 51c2378..ea5b606 100644..120000
--- a/libz/LICENSE
+++ b/libz/LICENSE
@@ -1,20 +1 @@
- (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
+../LICENSE
\ No newline at end of file
diff --git a/libz/libz/buildfile b/libz/libz/buildfile
index 32d97e4..89c7ea9 100644
--- a/libz/libz/buildfile
+++ b/libz/libz/buildfile
@@ -1,7 +1,7 @@
 # file      : libz/buildfile
 # license   : zlib License; see accompanying LICENSE file
 
-lib{z}: {h c}{*} def{zlib}
+lib{z}: {h c}{* -zconf} h{zconf}
 
 tclass = $c.target.class
 tsys   = $c.target.system
@@ -10,7 +10,8 @@ linux   = ($tclass == 'linux')
 bsd     = ($tclass == 'bsd')
 windows = ($tclass == 'windows')
 
-lib{z}: file{zlib.map}: include = ($linux || $bsd ? adhoc : false)
+libs{z}: file{zlib.map}: include = ($linux || $bsd ? adhoc : false)
+libs{z}: def{zlib}:      include = $windows
 
 # Include the generated config header into the distribution (so that we don't
 # pick up an installed one) and don't remove it when cleaning in src (so that
@@ -47,7 +48,7 @@ switch $tclass, $tsys
 #
 c.poptions =+ "-I$out_base" "-I$src_base"
 
-switch $c.class, $tsys
+switch $c.class
 {
   case 'gcc'
   {
@@ -96,7 +97,6 @@ else
 
 # Install the bare minimum of headers (note: not recreating subdirectories).
 #
-h{*}: install = false
-
-for h: zconf zlib
-  h{$h}@./: install = include/
+h{*}:       install = false
+h{zconf}:   install = include/
+h{zlib}@./: install = include/
diff --git a/libz/manifest b/libz/manifest
index 0e773b8..c871cd3 100644
--- a/libz/manifest
+++ b/libz/manifest
@@ -1,10 +1,10 @@
 : 1
 name: libz
-version: 1.2.1100+1
+version: 1.2.1100+2
 upstream-version: 1.2.11
 project: zlib
 summary: General-purpose lossless data compression C library
-license: zlib License ; Permissive free software license.
+license: Zlib ; Permissive free software license.
 topics: C, data compression
 description-file: README
 url: https://www.zlib.net/
@@ -13,7 +13,7 @@ src-url: https://git.build2.org/cgit/packaging/zlib/zlib/tree/libz/
 package-url: https://git.build2.org/cgit/packaging/zlib/
 email: zlib@gzip.org ; Send Windows DLL-related questions to Gilles Vollant at info@winimage.com.
 package-email: packaging@build2.org ; Mailing list.
-build-email: builds@build2.org
+build-warning-email: builds@build2.org
 builds: all
 depends: * build2 >= 0.12.0
 depends: * bpkg >= 0.12.0