[Boost-commit] svn:boost r39617 - in trunk/tools/jam: . src

From: grafikrobot_at_[hidden]
Date: 2007-09-30 12:33:37

Author: grafik
Date: 2007-09-30 12:33:36 EDT (Sun, 30 Sep 2007)
New Revision: 39617
URL: http://svn.boost.org/trac/boost/changeset/39617

Log:
Fix copying the wrong files for the archive, and prefer using POSIX/pax format.
Text files modified: 
   trunk/tools/jam/build_dist.sh |     2 +-                                      
   trunk/tools/jam/src/build.jam |    18 +++++++++++++++---                      
   2 files changed, 16 insertions(+), 4 deletions(-)

Modified: trunk/tools/jam/build_dist.sh
==============================================================================
--- trunk/tools/jam/build_dist.sh	(original)
+++ trunk/tools/jam/build_dist.sh	2007-09-30 12:33:36 EDT (Sun, 30 Sep 2007)
@@ -24,4 +24,4 @@
 cd ../stage
 
 #~ Build distribution archives.
-. ./build.sh --- dist
+sh ./build.sh --- dist

Modified: trunk/tools/jam/src/build.jam
==============================================================================
--- trunk/tools/jam/src/build.jam	(original)
+++ trunk/tools/jam/src/build.jam	2007-09-30 12:33:36 EDT (Sun, 30 Sep 2007)
@@ -864,9 +864,19 @@
 }
 if $(UNIX)
 {
+    tar ?= [ GLOB $(PATH) : star bsdtar tar ] ;
+    tar = $(tar[1]) ;
+    switch $(tar:D=:S=)
+    {
+        case star : tar += -c artype=pax -D -d -to-stdout ;
+        case * : tar += -c -f - ;
+    }
     actions [PACK] {
-    tar zcf "$(<)" "$(>)"
+    "$(tar)" "$(>)" | gzip -c9 > "$(<)"
     }
+    #~ actions [PACK] {
+    #~ tar cf "$(<:S=.tar)" "$(>)"
+    #~ }
     actions [ZIP] {
     gzip -c9 "$(>)" > "$(<)"
     }
@@ -894,6 +904,7 @@
 rule .package ( dst-dir : src-files + )
 {
     local dst-files ;
+    local src-files-actual ;
     for local src-path in $(src-files)
     {
         if ! [ GLOB $(src-path:P) : $(src-path:B) ] || [ CHECK_IF_FILE $(src-path) ]
@@ -906,6 +917,7 @@
                 src-file = $(src-file:D=) ;
             }
             dst-files += $(src-file:R=$(dst-dir)) ;
+            src-files-actual += $(src-path) ;
         }
     }
     
@@ -917,7 +929,7 @@
     DEPENDS $(pack) : $(dst-files) ;
     
     local dst-files-queue = $(dst-files) ;
-    for local src-path in $(src-files)
+    for local src-path in $(src-files-actual)
     {
         local dst-file = $(dst-files-queue[1]) ;
         dst-files-queue = $(dst-files-queue[2-]) ;
@@ -980,6 +992,6 @@
     .package $(NAME)-$(VERSION)-$(RELEASE)-$(platform) : $(dist.bin) ;
     if $(rpm-tool)
     {
-        .rpm $(NAME)-$(VERSION)-$(RELEASE) : $(NAME)-$(VERSION).tgz ;
+        #~ .rpm $(NAME)-$(VERSION)-$(RELEASE) : $(NAME)-$(VERSION).tgz ;
     }
 }