January 2009 - darwinbuild-changes - lists.macosforge.org

[470] tags/darwinbuild-7/
by source_changes＠macosforge.org 29 Jan '09

29 Jan '09

Revision: 470 http://trac.macosforge.org/projects/darwinbuild/changeset/470 Author: wsiegrist(a)apple.com Date: 2009-01-29 11:17:43 -0800 (Thu, 29 Jan 2009) Log Message: ----------- "Tagging darwinbuild-7 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-7/ Property changes on: tags/darwinbuild-7 ___________________________________________________________________ Added: 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 /branches/PR-6497694:466-468 /trunk:432-434

1 0

[469] trunk
by source_changes＠macosforge.org 29 Jan '09

29 Jan '09

Revision: 469 http://trac.macosforge.org/projects/darwinbuild/changeset/469 Author: wsiegrist(a)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; }

1 0

[468] branches/PR-6497694/darwinup/Depot.cpp
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 468 http://trac.macosforge.org/projects/darwinbuild/changeset/468 Author: wsiegrist(a)apple.com Date: 2009-01-27 18:26:46 -0800 (Tue, 27 Jan 2009) Log Message: ----------- Only calculate numfiles once. Improve the comment. Modified Paths: -------------- branches/PR-6497694/darwinup/Depot.cpp Modified: branches/PR-6497694/darwinup/Depot.cpp =================================================================== --- branches/PR-6497694/darwinup/Depot.cpp 2009-01-28 02:20:36 UTC (rev 467) +++ branches/PR-6497694/darwinup/Depot.cpp 2009-01-28 02:26:46 UTC (rev 468) @@ -425,7 +425,8 @@ // XXX: res = file->backup() - // Copy libraries gnutar uses since we need to use gnutar before they are replaced + // 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* tarfiles[] = {"/usr/bin/tar", @@ -437,7 +438,8 @@ "/usr/lib/libSystem.B.dylib", "/usr/lib/libiconv.2.dylib", "/usr/lib/libgcc_s.1.dylib"}; - for (i = 0; i < sizeof(tarfiles)/sizeof(*tarfiles); i++) { + 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;

1 0

[467] branches/PR-6497694/darwinup/Depot.cpp
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 467 http://trac.macosforge.org/projects/darwinbuild/changeset/467 Author: wsiegrist(a)apple.com Date: 2009-01-27 18:20:36 -0800 (Tue, 27 Jan 2009) Log Message: ----------- Fix loop to count over all list elements. Also fix some whitespace Modified Paths: -------------- branches/PR-6497694/darwinup/Depot.cpp Modified: branches/PR-6497694/darwinup/Depot.cpp =================================================================== --- branches/PR-6497694/darwinup/Depot.cpp 2009-01-28 01:14:28 UTC (rev 466) +++ branches/PR-6497694/darwinup/Depot.cpp 2009-01-28 02:20:36 UTC (rev 467) @@ -426,18 +426,18 @@ // XXX: res = file->backup() // Copy libraries gnutar uses since we need to use gnutar before they are replaced - int i = 0; + size_t i = 0; bool docopy = false; 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"}; - for (i = 0; i < 3; i++) { + "/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"}; + for (i = 0; i < sizeof(tarfiles)/sizeof(*tarfiles); i++) { if (strncmp(tarfiles[i], file->path(), strlen(tarfiles[i])) == 0) { docopy = true; break;

1 0

[466] branches/PR-6497694/darwinup/Depot.cpp
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 466 http://trac.macosforge.org/projects/darwinbuild/changeset/466 Author: wsiegrist(a)apple.com Date: 2009-01-27 17:14:28 -0800 (Tue, 27 Jan 2009) Log Message: ----------- Protect more files during the archive process Modified Paths: -------------- branches/PR-6497694/darwinup/Depot.cpp Modified: branches/PR-6497694/darwinup/Depot.cpp =================================================================== --- branches/PR-6497694/darwinup/Depot.cpp 2009-01-28 00:33:43 UTC (rev 465) +++ branches/PR-6497694/darwinup/Depot.cpp 2009-01-28 01:14:28 UTC (rev 466) @@ -428,11 +428,17 @@ // Copy libraries gnutar uses since we need to use gnutar before they are replaced int i = 0; bool docopy = false; - const char* tarlibs[] = {"/usr/lib/libSystem.B.dylib", + 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"}; for (i = 0; i < 3; i++) { - if (strncmp(tarlibs[i], file->path(), strlen(tarlibs[i])) == 0) { + if (strncmp(tarfiles[i], file->path(), strlen(tarfiles[i])) == 0) { docopy = true; break; }

1 0

[465] branches/PR-6497694/
by source_changes＠macosforge.org 28 Jan '09

28 Jan '09

Revision: 465 http://trac.macosforge.org/projects/darwinbuild/changeset/465 Author: wsiegrist(a)apple.com Date: 2009-01-27 16:33:43 -0800 (Tue, 27 Jan 2009) Log Message: ----------- Branching for rdar://6497694 Added Paths: ----------- branches/PR-6497694/ Property changes on: branches/PR-6497694 ___________________________________________________________________ Added: 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

1 0

[464] trunk/darwinbuild/Makefile
by source_changes＠macosforge.org 27 Jan '09

27 Jan '09

Revision: 464 http://trac.macosforge.org/projects/darwinbuild/changeset/464 Author: wsiegrist(a)apple.com Date: 2009-01-26 16:26:58 -0800 (Mon, 26 Jan 2009) Log Message: ----------- Allow for incremental generation of the prefixes target Modified Paths: -------------- trunk/darwinbuild/Makefile Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2009-01-14 22:25:29 UTC (rev 463) +++ trunk/darwinbuild/Makefile 2009-01-27 00:26:58 UTC (rev 464) @@ -16,10 +16,11 @@ manifest: manifest.c cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ -prefixes: - @$(foreach SCRIPT,$(PrefixReplacements), \ - $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $(SCRIPT).in > $(SCRIPT) ;) +prefixes: $(PrefixReplacements) +$(PrefixReplacements): % : %.in + $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $@ ; + install: all [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR)

1 0

[463] tags/darwinbuild-6/
by source_changes＠macosforge.org 14 Jan '09

14 Jan '09

Revision: 463 http://trac.macosforge.org/projects/darwinbuild/changeset/463 Author: wsiegrist(a)apple.com Date: 2009-01-14 14:25:29 -0800 (Wed, 14 Jan 2009) Log Message: ----------- "Tagging darwinbuild-6 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-6/ Property changes on: tags/darwinbuild-6 ___________________________________________________________________ Added: 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

1 0

[462] trunk
by source_changes＠macosforge.org 14 Jan '09

14 Jan '09

Revision: 462 http://trac.macosforge.org/projects/darwinbuild/changeset/462 Author: wsiegrist(a)apple.com Date: 2009-01-14 14:25:01 -0800 (Wed, 14 Jan 2009) Log Message: ----------- Merging PR-6493844 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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /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 /trunk/darwinbuild/thinPackages.sh:432-434 Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2009-01-14 00:07:16 UTC (rev 461) +++ trunk/darwinup/Depot.cpp 2009-01-14 22:25:01 UTC (rev 462) @@ -50,6 +50,8 @@ } Depot::Depot(const char* prefix) { + m_lock_fd = -1; + asprintf(&m_depot_path, "%s/.DarwinDepot", prefix); asprintf(&m_database_path, "%s/Database-V100", m_depot_path); asprintf(&m_archives_path, "%s/Archives", m_depot_path);

1 0

[461] branches/PR-6493844/darwinup/Depot.cpp
by source_changes＠macosforge.org 14 Jan '09

14 Jan '09

Revision: 461 http://trac.macosforge.org/projects/darwinbuild/changeset/461 Author: wsiegrist(a)apple.com Date: 2009-01-13 16:07:16 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Make the depot fd default to -1 to avoid using it uninitialized in Depot::lock() Modified Paths: -------------- branches/PR-6493844/darwinup/Depot.cpp Modified: branches/PR-6493844/darwinup/Depot.cpp =================================================================== --- branches/PR-6493844/darwinup/Depot.cpp 2009-01-13 23:59:11 UTC (rev 460) +++ branches/PR-6493844/darwinup/Depot.cpp 2009-01-14 00:07:16 UTC (rev 461) @@ -50,6 +50,8 @@ } Depot::Depot(const char* prefix) { + m_lock_fd = -1; + asprintf(&m_depot_path, "%s/.DarwinDepot", prefix); asprintf(&m_database_path, "%s/Database-V100", m_depot_path); asprintf(&m_archives_path, "%s/Archives", m_depot_path);

1 0