Revision: 469 http://trac.macosforge.org/projects/darwinbuild/changeset/469 Author: wsiegrist@apple.com Date: 2009-01-29 11:17:08 -0800 (Thu, 29 Jan 2009) Log Message: ----------- Merging PR-6497694 Modified Paths: -------------- trunk/darwinup/Depot.cpp Property Changed: ---------------- trunk/ trunk/darwinbuild/darwinbuild.in trunk/darwinbuild/darwinmaster.sh.in trunk/darwinbuild/installXcode.in trunk/darwinbuild/packageRoots.sh.in trunk/darwinbuild/thinPackages.sh.in Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /trunk:432-434 + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468 /trunk:432-434 Property changes on: trunk/darwinbuild/darwinbuild.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /trunk/darwinbuild/darwinbuild:432-434 + /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468 /trunk/darwinbuild/darwinbuild:432-434 Property changes on: trunk/darwinbuild/darwinmaster.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /trunk/darwinbuild/darwinmaster.sh:432-434 + /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468 /trunk/darwinbuild/darwinmaster.sh:432-434 Property changes on: trunk/darwinbuild/installXcode.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /trunk/darwinbuild/installXcode:432-434 + /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468 /trunk/darwinbuild/installXcode:432-434 Property changes on: trunk/darwinbuild/packageRoots.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /trunk/darwinbuild/packageRoots.sh:432-434 + /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468 /trunk/darwinbuild/packageRoots.sh:432-434 Property changes on: trunk/darwinbuild/thinPackages.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /trunk/darwinbuild/thinPackages.sh:432-434 + /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468 /trunk/darwinbuild/thinPackages.sh:432-434 Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2009-01-28 02:26:46 UTC (rev 468) +++ trunk/darwinup/Depot.cpp 2009-01-29 19:17:08 UTC (rev 469) @@ -425,14 +425,22 @@ // XXX: res = file->backup() - // Copy libraries gnutar uses since we need to use gnutar before they are replaced - int i = 0; + // copy files used by gnutar and libarchive instead of moving them + // since we use tar during the archive process + size_t i = 0; bool docopy = false; - const char* tarlibs[] = {"/usr/lib/libSystem.B.dylib", - "/usr/lib/libiconv.2.dylib", - "/usr/lib/libgcc_s.1.dylib"}; - for (i = 0; i < 3; i++) { - if (strncmp(tarlibs[i], file->path(), strlen(tarlibs[i])) == 0) { + const char* tarfiles[] = {"/usr/bin/tar", + "/usr/bin/gnutar", + "/usr/bin/bsdtar", + "/usr/lib/libarchive.2.dylib", + "/usr/lib/libbz2.1.0.dylib", + "/usr/lib/libz.1.dylib", + "/usr/lib/libSystem.B.dylib", + "/usr/lib/libiconv.2.dylib", + "/usr/lib/libgcc_s.1.dylib"}; + size_t numfiles = sizeof(tarfiles)/sizeof(*tarfiles); + for (i = 0; i < numfiles; i++) { + if (strncmp(tarfiles[i], file->path(), strlen(tarfiles[i])) == 0) { docopy = true; break; }