Complete outsourcing of zlib

* Add optional packages Zlib and Zlib-devel.
* Simplify the build feature section for zlib and also extract the
  source package.
* Replace all remaining references to the zlib instance in the tree and
  remove it.

build/jam/BuildFeatures

@@ -797,9 +797,10 @@ if $(TARGET_ARCH) in arm ppc x86 x86_64 {
 	Echo "jpeg support not available on $(TARGET_ARCH)" ;
 }
 
+
 # zlib
-local zlibBaseURL = $(baseURL)/lib ;
-if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 || $(TARGET_ARCH) = arm {
+local zlibBaseURL = $(hpkgBaseURL) ;
+if $(TARGET_ARCH) in arm ppc x86 x86_64 {
 	if $(TARGET_ARCH) = arm {
 		HAIKU_ZLIB_FILE = zlib-1.2.7-arm-2012-11-21.zip ;
 	} else if $(TARGET_ARCH) = ppc {
@@ -809,34 +810,22 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 || $(
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc4-2012-10-30.zip ;
 	} else {
-		HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc2-2012-10-30.zip ;
+		HAIKU_ZLIB_FILE = zlib-1.2.8-1-x86_gcc2.hpkg ;
+		HAIKU_ZLIB_DEVEL_FILE = zlib_devel-1.2.8-1-x86_gcc2.hpkg ;
 	}
+	HAIKU_ZLIB_SOURCE_FILE = zlib_source-1.2.8-1-x86_gcc2.hpkg ;
+		# TODO: Wrong architecture! Should be "any".
 
-	local zlibZipFile = [ DownloadFile $(HAIKU_ZLIB_FILE)
-		: $(zlibBaseURL)/$(HAIKU_ZLIB_FILE) ] ;
-
-	HAIKU_ZLIB_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
-		$(HAIKU_ZLIB_FILE:B) ] ;
-
-	HAIKU_ZLIB_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ZLIB_DIR)
-		: common/include : $(zlibZipFile)
-		: extracted-zlib ] ;
-
-	HAIKU_ZLIB_LIB = [ ExtractArchive $(HAIKU_ZLIB_DIR)
-		:
-		common/lib/libz.so
-		: $(zlibZipFile)
-		: extracted-zlib ] ;
-	HAIKU_ZLIB_CURRENT_LIB = [ ExtractArchive $(HAIKU_ZLIB_DIR)
-		:
-		common/lib/libz.so.1.2.7
-		: $(zlibZipFile)
-		: extracted-zlib ] ;
-	Depends $(HAIKU_ZLIB_LIB) $(HAIKU_ZLIB_CURRENT_LIB) : $(HAIKU_ZLIB_HEADERS_DEPENDENCY) ;
-
-	HAIKU_ZLIB_CURRENT_LINK = libz.so.1 ;
-
-	HAIKU_ZLIB_HEADERS = [ FDirName $(HAIKU_ZLIB_DIR) common include ] ;
+	ExtractBuildFeatureArchives zlib :
+		file: base $(zlibBaseURL)/$(HAIKU_ZLIB_FILE)
+			runtime: lib
+		file: devel $(zlibBaseURL)/$(HAIKU_ZLIB_DEVEL_FILE)
+			depends: base
+			library: develop/lib/libz.so
+			headers: develop/headers
+		file: source $(zlibBaseURL)/$(HAIKU_ZLIB_SOURCE_FILE)
+			sources: source/zlib-1.2.8
+		;
 
 	EnableBuildFeatures zlib ;
 } else {

build/jam/HaikuImage

@@ -78,7 +78,6 @@ SYSTEM_LIBS = [ FFilterByBuildFeatures
 PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
 	$(HAIKU_JPEG_CURRENT_LIB)
 	$(HAIKU_LIBPNG_CURRENT_LIB)
-	$(HAIKU_ZLIB_CURRENT_LIB)
 	$(HAIKU_FREETYPE_CURRENT_LIB)
 	libalm.so
 	libfluidsynth.so

build/jam/OptionalPackageDependencies

@@ -44,6 +44,7 @@ OptionalPackageDependencies Vim : GetText LibIconv ;
 OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositiveBookmarks ;
 OptionalPackageDependencies wpa_supplicant : OpenSSL ;
 OptionalPackageDependencies XZ-Utils : Tar ;
+OptionalPackageDependencies Zlib-devel : Zlib ;
 
 OptionalPackageDependencies MandatoryPackages
 	: Bzip Ctags Grep ICU LibSolv Sed Tar ;

build/jam/OptionalPackages

@@ -108,6 +108,8 @@
 #	WQY-MicroHei			- Chinese font
 #	XZ-Utils				- file archiving utility
 #	Yasm					- the assembler utility
+#	Zlib					- the zlib library
+#	Zlib-devel				- the zlib library development files
 
 local baseURL = http://haiku-files.org/files/optional-packages ;
 local hpkgBaseURL = http://haiku-files.org/files/hpkg ;
@@ -2080,3 +2082,19 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
 		Echo "No optional package Yasm available for $(TARGET_ARCH)" ;
 	}
 }
+
+
+# Zlib
+if [ IsOptionalHaikuImagePackageAdded Zlib ] {
+	InstallOptionalHaikuImagePackage
+		$(hpkgBaseURL)/$(HAIKU_ZLIB_FILE)
+		: system ;
+}
+
+
+# Zlib-devel
+if [ IsOptionalHaikuImagePackageAdded Zlib-devel ] {
+	InstallOptionalHaikuImagePackage
+		$(hpkgBaseURL)/$(HAIKU_ZLIB_DEVEL_FILE)
+		: system ;
+}

build/jam/ReleaseBuildProfiles

@@ -27,6 +27,7 @@ switch $(HAIKU_BUILD_PROFILE) {
 		AddOptionalHaikuImagePackages KeymapSwitcher Nano P7zip Welcome
 			BeBook XZ-Utils ;
 		AddOptionalHaikuImagePackages wpa_supplicant Man ;
+		AddOptionalHaikuImagePackages Zlib Zlib-devel ;
 	}
 
 	case "beta-*" : {
@@ -45,6 +46,7 @@ switch $(HAIKU_BUILD_PROFILE) {
 		AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ;
 		AddOptionalHaikuImagePackages Development Git OpenSSH OpenSSL ;
 		AddOptionalHaikuImagePackages wpa_supplicant WebPositive Man ;
+		AddOptionalHaikuImagePackages Zlib Zlib-devel ;
 	}
 }
 

build/jam/packages/Haiku

@@ -140,12 +140,6 @@ AddSymlinkToPackage lib : $(HAIKU_JPEG_CURRENT_LIB:BS)
 AddSymlinkToPackage lib : $(HAIKU_JPEG_CURRENT_LINK)
 	: libjpeg.so : : true ;
 
-# zlib.so links to the current zlib
-AddSymlinkToPackage lib : $(HAIKU_ZLIB_CURRENT_LIB:BS)
-	: $(HAIKU_ZLIB_CURRENT_LINK) : : true ;
-AddSymlinkToPackage lib : $(HAIKU_ZLIB_CURRENT_LINK)
-	: libz.so : : true ;
-
 # TODO: Remove when the packages have been rebuilt!
 AddSymlinkToPackage lib : libbe.so : liblocale.so ;
 

build/jam/packages/HaikuDevel

@@ -75,7 +75,6 @@ CopyDirectoryToPackage develop headers :
 	[ FDirName $(HAIKU_FREETYPE_DIR) develop headers 3rdparty ] ;
 CopyDirectoryToPackage develop headers : $(HAIKU_JPEG_HEADERS) : 3rdparty ;
 CopyDirectoryToPackage develop headers : $(HAIKU_LIBPNG_HEADERS) : 3rdparty ;
-CopyDirectoryToPackage develop headers : $(HAIKU_ZLIB_HEADERS) : 3rdparty ;
 
 # cpp headers
 if $(HAIKU_GCC_VERSION[1]) = 2 {