From 7418499c4a7fd35289aea835235a961e5cf6b1eb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 7 Jul 2013 11:14:28 +0200 Subject: [PATCH] Remove more optional package related left-overs --- build/jam/ImageRules | 26 -------------- build/jam/OptionalTestPackages | 63 +++++++++++++++++---------------- build/jam/images/Haiku64Image | 24 ------------- build/jam/images/HaikuImage | 24 ------------- build/scripts/build_haiku_image | 4 --- 5 files changed, 32 insertions(+), 109 deletions(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index a61747cb6c..35976def48 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1145,32 +1145,6 @@ rule AddGroupToHaikuImage group : gid : members } -rule AddOptionalPackageDescriptionToHaikuImage file : searchPath -{ - if $(searchPath) { - SEARCH on $(file) = [ FDirName $(searchPath) ] ; - } - - HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS += $(file) ; -} - -rule AddLicenseToHaikuImage file : name : searchPath -{ - if $(searchPath) { - SEARCH on $(file) = [ FDirName $(searchPath) ] ; - } - - if $(name) && $(file:BS) = $(name) { - name = ; - } - - local systemDirTokens - = [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ; - - AddFilesToHaikuImage $(systemDirTokens) data licenses : $(file) : $(name) ; -} - - rule AddLibrariesToHaikuImage directory : libs { # AddLibraryToHaikuImage : diff --git a/build/jam/OptionalTestPackages b/build/jam/OptionalTestPackages index d15e07e379..45fef15331 100644 --- a/build/jam/OptionalTestPackages +++ b/build/jam/OptionalTestPackages @@ -7,34 +7,35 @@ # libMicro -if [ IsOptionalHaikuImagePackageAdded libMicro ] { - # add scripts, tattle executable and README - SEARCH on bench multiview README - = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ; - - AddFilesToHaikuImage home benchmarks libmicro - : bench multiview README ; - AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ; - - # add libmicro benchmarks - AddFilesToHaikuImage home benchmarks libmicro bin-BePC : - atomic bind cachetocache cascade_cond cascade_fcntl - cascade_flock cascade_lockf cascade_mutex chdir close close_tcp - connection dup exec exec_bin exit exp fcntl fcntl_ndelay file_lock fork - getcontext getenv getpeername getpid getrusage getsockname - gettimeofday isatty listen localtime_r log longjmp lrand48 - lseek malloc memcpy memmove memrand memset mktime mmap mprotect msync - munmap mutex nop open pipe poll pread pthread_create pwrite - read realpath recurse select semop setcontext setsockopt sigaction - siglongjmp signal sigprocmask socket socketpair stat - strcasecmp strchr strcmp strcpy strftime strlen strtol system time times - write writev ; - - AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ; - - AddOptionalPackageDescriptionToHaikuImage - .OptionalPackageDescription - : $(HAIKU_TOP) src tests system benchmarks libMicro ; - AddLicenseToHaikuImage OPENSOLARIS.LICENSE : OpenSolaris - : $(HAIKU_TOP) src tests system benchmarks libMicro ; -} +# TODO: Make this an actual package! +# if [ IsOptionalHaikuImagePackageAdded libMicro ] { +# # add scripts, tattle executable and README +# SEARCH on bench multiview README +# = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ; +# +# AddFilesToHaikuImage home benchmarks libmicro +# : bench multiview README ; +# AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ; +# +# # add libmicro benchmarks +# AddFilesToHaikuImage home benchmarks libmicro bin-BePC : +# atomic bind cachetocache cascade_cond cascade_fcntl +# cascade_flock cascade_lockf cascade_mutex chdir close close_tcp +# connection dup exec exec_bin exit exp fcntl fcntl_ndelay file_lock fork +# getcontext getenv getpeername getpid getrusage getsockname +# gettimeofday isatty listen localtime_r log longjmp lrand48 +# lseek malloc memcpy memmove memrand memset mktime mmap mprotect msync +# munmap mutex nop open pipe poll pread pthread_create pwrite +# read realpath recurse select semop setcontext setsockopt sigaction +# siglongjmp signal sigprocmask socket socketpair stat +# strcasecmp strchr strcmp strcpy strftime strlen strtol system time times +# write writev ; +# +# AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ; +# +# AddOptionalPackageDescriptionToHaikuImage +# .OptionalPackageDescription +# : $(HAIKU_TOP) src tests system benchmarks libMicro ; +# AddLicenseToHaikuImage OPENSOLARIS.LICENSE : OpenSolaris +# : $(HAIKU_TOP) src tests system benchmarks libMicro ; +# } diff --git a/build/jam/images/Haiku64Image b/build/jam/images/Haiku64Image index 0fd57aeb9e..7c12aa501c 100644 --- a/build/jam/images/Haiku64Image +++ b/build/jam/images/Haiku64Image @@ -448,29 +448,9 @@ CopyDirectoryToHaikuImage system documentation #pragma mark - Optional Packages -HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ; - include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ; -local optionalPackageDescriptions ; -if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) { - optionalPackageDescriptions = optional_package_descriptions ; - MakeLocate $(optionalPackageDescriptions) - : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ; - - Depends $(optionalPackageDescriptions) - : $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ; - - actions together BuildOptionalPackageDescriptions - { - cat $(2) > $(1) - } - - BuildOptionalPackageDescriptions $(optionalPackageDescriptions) - : $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ; -} - #pragma mark - User/Group Setup @@ -554,10 +534,6 @@ if $(HOST_RM_ATTRS_TARGET) { } else { AddVariableToScript $(script) : rmAttrs : rm ; } -if $(optionalPackageDescriptions) { - AddTargetVariableToScript $(script) : $(optionalPackageDescriptions) - : optionalPackageDescriptions ; -} # create the other scripts diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage index f1a65e7fd2..f01dc13c7c 100644 --- a/build/jam/images/HaikuImage +++ b/build/jam/images/HaikuImage @@ -320,29 +320,9 @@ for repository in $(HAIKU_REPOSITORIES) { #pragma mark - Optional Packages -HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ; - include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ; -local optionalPackageDescriptions ; -if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) { - optionalPackageDescriptions = optional_package_descriptions ; - MakeLocate $(optionalPackageDescriptions) - : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ; - - Depends $(optionalPackageDescriptions) - : $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ; - - actions together BuildOptionalPackageDescriptions - { - cat $(2) > $(1) - } - - BuildOptionalPackageDescriptions $(optionalPackageDescriptions) - : $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ; -} - #pragma mark - User/Group Setup @@ -428,10 +408,6 @@ if $(HOST_RM_ATTRS_TARGET) { } else { AddVariableToScript $(script) : rmAttrs : rm ; } -if $(optionalPackageDescriptions) { - AddTargetVariableToScript $(script) : $(optionalPackageDescriptions) - : optionalPackageDescriptions ; -} # Add a variable to indicate whether packages dependencies shall be resolved. We # always want to do that in non-update mode, but also in update mode when all diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image index 52f70c23df..39fb725f65 100755 --- a/build/scripts/build_haiku_image +++ b/build/scripts/build_haiku_image @@ -20,7 +20,6 @@ set -o errexit # updateOnly # dontClearImage # isVMwareImage -# optionalPackageDescriptions # # addattr # copyattr @@ -245,9 +244,6 @@ downloadFile() mkdir -p $tmpDir copyrightsFile=$tmpDir/copyrights $rmAttrs -f $copyrightsFile -if [ "$optionalPackageDescriptions" ]; then - cp "$optionalPackageDescriptions" $copyrightsFile -fi if [ $isCD ]; then # setup output dir