hrev43629 adds 2 changesets to branch 'master' old head: f91a2037a58c410e2326be431f6e704f91329485 new head: 430fc0e90cb53830a39e2b87aa3ac871a68fcad5 ---------------------------------------------------------------------------- 577d81a: Add proper error on ExtractArchive with missing filename The * case was not generating any message due to empty string expansion I suppose... 430fc0e: Fix build for !x86 && !ppc At least this should fix other platform builds to the point they worked before. The ICU_DEVEL zip name assign was moved inside the if block, making it empty for other archs, and ExtractArchive was of course having issues with this. So I moved the rest inside the if block as well. Should fix at least kernel builds. [ François Revol <revol@xxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 15 insertions(+), 15 deletions(-) build/jam/FileRules | 1 + build/jam/OptionalBuildFeatures | 29 ++++++++++++++--------------- ############################################################################ Commit: 577d81a9b6baebc1b0a9e6edca4f79fc19e7f899 URL: http://cgit.haiku-os.org/haiku/commit/?id=577d81a Author: François Revol <revol@xxxxxxx> Date: Thu Jan 5 02:17:37 2012 UTC Add proper error on ExtractArchive with missing filename The * case was not generating any message due to empty string expansion I suppose... ---------------------------------------------------------------------------- diff --git a/build/jam/FileRules b/build/jam/FileRules index 788dcfc..2a5b896 100644 --- a/build/jam/FileRules +++ b/build/jam/FileRules @@ -239,6 +239,7 @@ rule ExtractArchive directory : entries : archiveFile : grist $(archiveFile) ; case .tgz : ExtractTarArchive1 $(targets) : $(directory) $(archiveFile) ; + case "" : Exit "ExtractArchive: No archive passed" ; case * : Exit "ExtractArchive: Unhandled archive extension: $(archiveFile:S)" ; } ############################################################################ Revision: hrev43629 Commit: 430fc0e90cb53830a39e2b87aa3ac871a68fcad5 URL: http://cgit.haiku-os.org/haiku/commit/?id=430fc0e Author: François Revol <revol@xxxxxxx> Date: Thu Jan 5 02:26:59 2012 UTC Fix build for !x86 && !ppc At least this should fix other platform builds to the point they worked before. The ICU_DEVEL zip name assign was moved inside the if block, making it empty for other archs, and ExtractArchive was of course having issues with this. So I moved the rest inside the if block as well. Should fix at least kernel builds. ---------------------------------------------------------------------------- diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 4724b0c..d2b5090 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -108,26 +108,25 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { : extracted-icu ] ; } + + # zip file and output directory + HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE) + : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ; + HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) + $(HAIKU_ICU_DEVEL_PACKAGE:B) ] ; + + # extract headers + HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR) + : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) + : extracted-icu-devel ] ; + + HAIKU_ICU_HEADERS + = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ; } else { Echo "ICU not available for $(TARGET_ARCH)" ; } -# zip file and output directory -HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE) - : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ; -HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) - $(HAIKU_ICU_DEVEL_PACKAGE:B) ] ; - -# extract headers -HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR) - : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) - : extracted-icu-devel ] ; - -HAIKU_ICU_HEADERS - = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ; - - # CLucene # Automatically install the CLucene feature, when the optional CLucene optional