From 92cbc8ab0de6fa3756462cd1d093b497c51e20a7 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Tue, 14 Oct 2025 10:33:00 +0200 Subject: [PATCH] Remove some obsolete build rules CLucene and Taglib have not been updated since the switch to package management. The old rules do not wrk since they relied on the haiku-files.org domain. The libraries can be reintroduced as build packages if we ever decide to resume the project that needed them (general file content indexing). Change-Id: Id7e3fb7c5b9070addaaa9763053d7d006f2b3484 Reviewed-on: https://review.haiku-os.org/c/haiku/+/9690 Reviewed-by: waddlesplash Tested-by: Commit checker robot --- build/jam/BuildFeatures | 101 ---------------------------------------- build/jam/PackageRules | 9 ---- 2 files changed, 110 deletions(-) diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index 7bb65a56d1..b2f4141846 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -132,57 +132,6 @@ if [ IsPackageAvailable icu_devel ] { } -# CLucene - -# TODO: Update to packages! -if ! 1 { - -# Automatically install the CLucene feature, when the CLucene package is -# enabled. -if [ IsHaikuImagePackageAdded clucene ] { - HAIKU_BUILD_FEATURE_CLUCENE = 1 ; -} - - -HAIKU_CLUCENE_PACKAGE = clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip ; -HAIKU_CLUCENE_URL = $(baseURL)/$(HAIKU_CLUCENE_PACKAGE) ; - -if $(HAIKU_BUILD_FEATURE_CLUCENE) { - if $(TARGET_ARCH) != x86 { - Echo "CLucene build feature not available for" - "$(TARGET_PACKAGING_ARCH)" ; - } else { - # Download the zip archive. - local zipFile = [ DownloadFile $(HAIKU_CLUCENE_PACKAGE) - : $(HAIKU_CLUCENE_URL) ] ; - - # zip file and output directory - HAIKU_CLUCENE_ZIP_FILE = $(zipFile) ; - HAIKU_CLUCENE_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) - $(HAIKU_CLUCENE_PACKAGE:B) ] ; - - # extract headers and libraries - HAIKU_CLUCENE_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_CLUCENE_DIR) - : common/include/ : $(zipFile) : extracted-clucene - ] ; - - HAIKU_CLUCENE_LIBS = [ ExtractArchive $(HAIKU_CLUCENE_DIR) - : - common/lib/libclucene.a - : $(zipFile) - : extracted-clucene - ] ; - - HAIKU_CLUCENE_HEADERS - = [ FDirName $(HAIKU_CLUCENE_DIR) common include ] ; - - EnableBuildFeatures clucene ; - } -} - -} # ! 1 - - # Giflib if [ IsPackageAvailable giflib_devel ] { ExtractBuildFeatureArchives giflib : @@ -335,56 +284,6 @@ if [ IsPackageAvailable gutenprint9_devel ] { } -# TagLib - -# TODO: Update to packages! -if ! 1 { - -# Automatically install the TagLib feature, when the optional TagLib optional -# package is enabled. -if [ IsHaikuImagePackageAdded taglib ] { - HAIKU_BUILD_FEATURE_TAGLIB = 1 ; -} - -HAIKU_TAGLIB_PACKAGE = taglib-1.6.3-r1a4-x86-gcc2-2012-09-03.zip ; -HAIKU_TAGLIB_URL = $(baseURL)/$(HAIKU_TAGLIB_PACKAGE) ; - -if $(HAIKU_BUILD_FEATURE_TAGLIB) { - if $(TARGET_ARCH) != x86 { - Echo "TagLib build feature not available for $(TARGET_PACKAGING_ARCH)" ; - } else { - # Download the zip archive. - local zipFile = [ DownloadFile $(HAIKU_TAGLIB_PACKAGE) - : $(HAIKU_TAGLIB_URL) ] ; - - # zip file and output directory - HAIKU_TAGLIB_ZIP_FILE = $(zipFile) ; - HAIKU_TAGLIB_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) - $(HAIKU_TAGLIB_PACKAGE:B) ] ; - - # extract headers and libraries - HAIKU_TAGLIB_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_TAGLIB_DIR) - : common/include/ : $(zipFile) : extracted-taglib - ] ; - - HAIKU_TAGLIB_LIBS = [ ExtractArchive $(HAIKU_TAGLIB_DIR) - : - common/lib/libtag.so - common/lib/libtag_c.so - : $(zipFile) - : extracted-taglib - ] ; - - HAIKU_TAGLIB_HEADERS - = [ FDirName $(HAIKU_TAGLIB_DIR) common include taglib ] ; - - EnableBuildFeatures taglib ; - } -} - -} # ! 1 - - # WebKit if [ IsPackageAvailable haikuwebkit_devel ] { ExtractBuildFeatureArchives webkit : diff --git a/build/jam/PackageRules b/build/jam/PackageRules index d201c7db5c..c114a316b4 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -307,15 +307,6 @@ rule AddWifiFirmwareToPackage driver : subDirToExtract : archive } -rule ExtractArchiveToPackage dirTokens : archiveFile : flags : extractedSubDir -{ - if ! [ FDontRebuildCurrentPackage ] { - ExtractArchiveToContainer $(HAIKU_CURRENTLY_BUILT_HAIKU_PACKAGE) - : $(dirTokens) : $(archiveFile) : $(flags) : $(extractedSubDir) ; - } -} - - rule AddDriversToPackage relativeDirectoryTokens : targets { if ! [ FDontRebuildCurrentPackage ] {