Changeset 24528

Timestamp:

03/22/08 17:05:03 (8 months ago)

Author:

bonefish

Message:

* BuildPlatformMain supports overriding HOST_LIBROOT on the target now,

so one can set it to the static libroot, if desired.

* Generic attribute emulation:

• Added build tool rm_attrs, a simple "rm" replacement, which also removes the attributes directory for a given file.
• Added build/scripts/rm_attrs shell script, which wraps the invocation of the rm_attrs tool. If it doesn't exist yet, the ordinary rm is used.
• The RM jam variable refers to the rm_attrs script now, i.e. whenever something is removed by the build system, the attributes are removed too (if the build tool has already been built, that is).
• Removed the shell function attrrmrf() in build_haiku_image. We use the rm_attrs tool instead, if necessary.

Location:

haiku/trunk

Files:

• build/jam/BeOSRules (modified) (1 diff)
• build/jam/BuildSetup (modified) (4 diffs)
• build/jam/HaikuImage (modified) (1 diff)
• build/jam/ImageRules (modified) (4 diffs)
• build/jam/MainBuildRules (modified) (3 diffs)
• build/jam/OverriddenJamRules (modified) (1 diff)
• build/scripts/build_haiku_image (modified) (5 diffs)
• build/scripts/rm_attrs (added)
• src/tools/Jamfile (modified) (2 diffs)
• src/tools/rm_attrs.cpp (added)

haiku/trunk/build/jam/BeOSRules

@@ -263 +263 @@
         $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
         if [ \\"$(deleteAttributeFile1)\\" = "true" ]; then
-                rm -f $(1)
+                $(RM) $(1)
         fi
         $(2[1]) -O -o "$(1)" "$(2[2-])"

haiku/trunk/build/jam/BuildSetup

@@ -528 +528 @@
 HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) lib ] ;
 
+# For the generic attributes emulation: Target rm_attrs -- rm replacement that
+# also removes the attributes.
+HOST_RM_ATTRS_TARGET = ;
+
 if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
         HOST_LIBSTDC++ = stdc++.r4 ;
         HOST_LIBROOT = root ;
+        HOST_STATIC_LIBROOT = $(HOST_LIBROOT) ;
         HOST_LIBBE = be ;
         HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR = ;
@@ -537 +542 @@
         HOST_LIBSTDC++ = stdc++ ;
         HOST_LIBROOT = libroot_build.so ;
+        HOST_STATIC_LIBROOT = libroot_build.a ;
         HOST_LIBBE = libbe_build.so ;
         HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
@@ -557 +563 @@
         if $(HOST_PLATFORM) = freebsd {
                 HOST_LIBROOT += /usr/lib/libgnuregex.so ;
+                HOST_STATIC_LIBROOT += /usr/lib/libgnuregex.so ;
         } else if $(HOST_PLATFORM) = darwin {
                 HOST_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
+                HOST_STATIC_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
         }
 
@@ -581 +589 @@
         if $(HAIKU_HOST_USE_XATTR) = 1 {
                 HOST_DEFINES += HAIKU_HOST_USE_XATTR ;
+        } else {
+                # Otherwise the generic attribute emulation is used, which uses a
+                # directory per file to store its attribute. We need to redefine RM so
+                # that the attributes are removed as well. We use a wrapper script, which
+                # invokes a build tool. If the build tool hasn't been built yet, the
+                # normal "rm" is used and the attributes are leaked (likely there aren't
+                # any yet).
+                RM = $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ";"
+                        [ FDirName $(HAIKU_TOP) build scripts rm_attrs ]
+                        [ FDirName $(HAIKU_OBJECT_DIR) $(HOST_PLATFORM) $(HOST_ARCH) release
+                                tools rm_attrs ] -f ;
+                        # assumes that rm_attrs is built with debugging disabled
+                HOST_RM_ATTRS_TARGET = <build>rm_attrs ;
         }
 }

haiku/trunk/build/jam/HaikuImage

@@ -665 +665 @@
 AddVariableToScript $(script) : headerDirsToCopy
         : $(HAIKU_INSTALL_HEADER_DIRS) ;
+if $(HOST_RM_ATTRS_TARGET) {
+        AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
+} else {
+        AddVariableToScript $(script) : rmAttrs : rm ;
+}
+
 
 # create the other scripts

haiku/trunk/build/jam/ImageRules

@@ -38 +38 @@
 actions InitScript1
 {
-        rm -f $(1)
+        $(RM) $(1)
         echo -n > $(1)
 }
@@ -679 +679 @@
 actions BuildVMWareImage1
 {
-        rm -f $(1)
+        $(RM) $(1)
         $(2[1]) -h 64k -i$(IMAGE_SIZE)M $(1) &&
         cat $(2[2]) >> $(1)
@@ -858 +858 @@
 actions BuildFloppyBootImage1
 {
-        rm -f $(<)
+        $(RM) $(<)
         # make an empty image
         dd if=/dev/zero of=$(<) bs=1k count=1440
@@ -883 +883 @@
 actions BuildCDBootImage1
 {
-        rm -f $(<)
+        $(RM) $(<)
         mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-])
 }

haiku/trunk/build/jam/MainBuildRules

@@ -558 +558 @@
                 # add the build libroot
                 if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
-                        Depends $(target) : $(HOST_LIBROOT) ;
-                        NEEDLIBS on $(target) += $(HOST_LIBROOT) ;
+                        local libroot = [ on $(target) return $(HOST_LIBROOT) ] ;
+                        Depends $(target) : $(libroot) ;
+                        NEEDLIBS on $(target) += $(libroot) ;
                 }
         }
@@ -636 +637 @@
 }
 
-rule BuildPlatformStaticLibrary
+rule BuildPlatformStaticLibrary lib : sources : otherObjects
 {
         # BuildPlatformStaticLibrary <lib> : <sources> ;
         # Creates a static library from sources.
-        # <lib>: The library.
+        # <lib>: The static library to be built.
         # <sources>: List of source files.
-
-        local lib = $(1) ;
-        local sources = $(2) ;
+        # <otherObjects>: List of additional object files.
+        #
+
         local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
 
@@ -656 +657 @@
         }
 
-        StaticLibrary $(lib) : $(sources) ;
-}
-
+        StaticLibrary $(lib) : $(sources) : $(otherObjects) ;
+}
+

haiku/trunk/build/jam/OverriddenJamRules

@@ -38 +38 @@
                 MimeSet $(1) ;
                 SetVersion $(1) ;
+
+                # If the generic attribute emulation is enabled, make sure the tool to
+                # remove the attributes is built first.
+                if $(HOST_RM_ATTRS_TARGET) {
+                        Depends $(1) : $(HOST_RM_ATTRS_TARGET) ;
+                }
         }
 }

haiku/trunk/build/scripts/build_haiku_image

@@ -22 +22 @@
 # resattr
 # rc
+# rmAttrs
 # unzip
 # vmdkheader
@@ -60 +61 @@
 
 
-# attribute-safe rm -rf
-# This makes sure there are no leftover attribute file before removing each file
-attrrmrf()
-{
-        test -e "$1" || return
-        if [ -d "$outputDir/attributes" ]; then
-                # test for gnu stat, else fallback to the bsd one.
-                statFormatOpt="-c"
-                stat -c '%i' . >/dev/null 2>&1 || statFormatOpt="-f"
-                find "$1" -print0 | xargs -0 stat $statFormatOpt %i | awk "{ print \"$outputDir/attributes/\" \$1 }" | xargs rm -rf
-        fi
-        rm -rf "$1"
-}
-
 unzipFile()
 {
@@ -84 +71 @@
         if [ $isImage ]; then
                 unzipDir=$tmpDir/unzip
-                attrrmrf "$unzipDir"
+                $rmAttrs -rf "$unzipDir"
                 mkdir -p "$unzipDir"
 
@@ -90 +77 @@
                 $cp -r "${sPrefix}$unzipDir/." "${tPrefix}$targetUnzipDir"
 
-                attrrmrf "$unzipDir"
+                $rmAttrs -rf "$unzipDir"
         else
                 $unzip -q -o -d "${tPrefix}$targetUnzipDir" "${sPrefix}$zipFile"
@@ -193 +180 @@
 
         # cleanup tmp dir
-        attrrmrf $mimeTmpDir
+        $rmAttrs -rf $mimeTmpDir
 fi      # ! updateOnly
 

haiku/trunk/src/tools/Jamfile

@@ -12 +12 @@
         <build>mimeset
         <build>mkindex
+        <build>rm_attrs_tmp
         <build>rmattr
         <build>settype
@@ -57 +58 @@
 BuildPlatformMain <build>mkindex : mkindex.cpp : $(HOST_LIBBE) ;
 
+# We want rm_attrs to be self-contained, so we link against the static libroot.
+HOST_LIBROOT on <build>rm_attrs_tmp = $(HOST_STATIC_LIBROOT) ;
+BuildPlatformMain <build>rm_attrs_tmp : rm_attrs.cpp
+        : $(HOST_LIBSUPC++) $(HOST_LIBSTDC++) ;
+MakeLocateDebug <build>rm_attrs ;
+File <build>rm_attrs : <build>rm_attrs_tmp ;
+MODE on <build>rm_attrs = 755 ;
+
 BuildPlatformMain <build>rmattr : rmattr.cpp : $(HOST_LIBBE) ;