May 2010 - darwinbuild-changes - lists.macosforge.org

[828] trunk/plists/10A432.plist
by source_changes＠macosforge.org 06 May '10

06 May '10

Revision: 828 http://trac.macosforge.org/projects/darwinbuild/changeset/828 Author: wsiegrist(a)apple.com Date: 2010-05-06 12:06:23 -0700 (Thu, 06 May 2010) Log Message: ----------- mDNSResponderSystemLibraries does not provide dns_sd.h with installhdrs, so move to a build dependency. Modified Paths: -------------- trunk/plists/10A432.plist Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2010-05-05 03:27:30 UTC (rev 827) +++ trunk/plists/10A432.plist 2010-05-06 19:06:23 UTC (rev 828) @@ -3146,6 +3146,7 @@ gcc_select, gnumake, gnuzip, + mDNSResponderSystemLibraries, perl, shell_cmds, system_cmds, @@ -3166,7 +3167,6 @@ libdispatch, libdyld, libresolv, - mDNSResponderSystemLibraries, xnu, ); };

1 0

[827] tags/darwinbuild-18.1/
by source_changes＠macosforge.org 05 May '10

05 May '10

Revision: 827 http://trac.macosforge.org/projects/darwinbuild/changeset/827 Author: wsiegrist(a)apple.com Date: 2010-05-04 20:27:30 -0700 (Tue, 04 May 2010) Log Message: ----------- "Tagging darwinbuild-18.1 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-18.1/ Property changes on: tags/darwinbuild-18.1 ___________________________________________________________________ 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,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7935095:819-821

1 0

[826] trunk
by source_changes＠macosforge.org 05 May '10

05 May '10

Revision: 826 http://trac.macosforge.org/projects/darwinbuild/changeset/826 Author: wsiegrist(a)apple.com Date: 2010-05-04 20:19:46 -0700 (Tue, 04 May 2010) Log Message: ----------- Changes and version bump for 18.1 Modified Paths: -------------- trunk/CHANGES trunk/darwinup/main.cpp Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2010-05-04 21:58:29 UTC (rev 825) +++ trunk/CHANGES 2010-05-05 03:19:46 UTC (rev 826) @@ -1,6 +1,9 @@ Darwin Build Scripts Change History ----------------------------------- +Release 18.1 [04-May-2010] + - darwinup: fix release build issue + Release 18 [03-May-2010] - darwinup: fix bug which caused the uninstall half of upgrade to run when the install half failed Modified: trunk/darwinup/main.cpp =================================================================== --- trunk/darwinup/main.cpp 2010-05-04 21:58:29 UTC (rev 825) +++ trunk/darwinup/main.cpp 2010-05-05 03:19:46 UTC (rev 826) @@ -46,7 +46,7 @@ void usage(char* progname) { fprintf(stderr, "usage: %s [-v] [-p DIR] [command] [args] \n", progname); - fprintf(stderr, "version: 18 \n"); + fprintf(stderr, "version: 18.1 \n"); fprintf(stderr, " \n"); fprintf(stderr, "options: \n"); #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

1 0

[825] trunk/darwinbuild.xcodeproj/project.pbxproj
by source_changes＠macosforge.org 04 May '10

04 May '10

Revision: 825 http://trac.macosforge.org/projects/darwinbuild/changeset/825 Author: wsiegrist(a)apple.com Date: 2010-05-04 14:58:29 -0700 (Tue, 04 May 2010) Log Message: ----------- Build fix for Release config. Modified Paths: -------------- trunk/darwinbuild.xcodeproj/project.pbxproj Modified: trunk/darwinbuild.xcodeproj/project.pbxproj =================================================================== --- trunk/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 22:11:19 UTC (rev 824) +++ trunk/darwinbuild.xcodeproj/project.pbxproj 2010-05-04 21:58:29 UTC (rev 825) @@ -3473,10 +3473,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7227AB9C1098AAE100BE33D7 /* prefix.xcconfig */; buildSettings = { - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + COPY_PHASE_STRIP = YES; + DEPLOYMENT_POSTPROCESSING = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; INSTALL_PATH = "$(BINDIR)"; PREFIX = /usr; PRODUCT_NAME = darwinup; + STRIP_INSTALLED_PRODUCT = YES; + STRIP_STYLE = all; }; name = Release; };

1 0

[824] tags/darwinbuild-18/
by source_changes＠macosforge.org 03 May '10

03 May '10

Revision: 824 http://trac.macosforge.org/projects/darwinbuild/changeset/824 Author: wsiegrist(a)apple.com Date: 2010-05-03 15:11:19 -0700 (Mon, 03 May 2010) Log Message: ----------- "Tagging darwinbuild-18 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-18/ Property changes on: tags/darwinbuild-18 ___________________________________________________________________ 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,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7935095:819-821

1 0

[823] trunk
by source_changes＠macosforge.org 03 May '10

03 May '10

Revision: 823 http://trac.macosforge.org/projects/darwinbuild/changeset/823 Author: wsiegrist(a)apple.com Date: 2010-05-03 15:11:02 -0700 (Mon, 03 May 2010) Log Message: ----------- Changes and version bump for 18 Modified Paths: -------------- trunk/CHANGES trunk/darwinup/main.cpp Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2010-05-03 21:36:14 UTC (rev 822) +++ trunk/CHANGES 2010-05-03 22:11:02 UTC (rev 823) @@ -1,6 +1,11 @@ Darwin Build Scripts Change History ----------------------------------- +Release 18 [03-May-2010] + - darwinup: fix bug which caused the uninstall half of upgrade to + run when the install half failed + - darwinup: add .tbz as a suffix for bzip2 tarballs + Release 17.1 [20-Apr-2010] - darwinup: add a manpage for darwinup - darwinup: fix crash when not root and a db upgrade is needed Modified: trunk/darwinup/main.cpp =================================================================== --- trunk/darwinup/main.cpp 2010-05-03 21:36:14 UTC (rev 822) +++ trunk/darwinup/main.cpp 2010-05-03 22:11:02 UTC (rev 823) @@ -46,7 +46,7 @@ void usage(char* progname) { fprintf(stderr, "usage: %s [-v] [-p DIR] [command] [args] \n", progname); - fprintf(stderr, "version: 17.1 \n"); + fprintf(stderr, "version: 18 \n"); fprintf(stderr, " \n"); fprintf(stderr, "options: \n"); #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

1 0

[822] trunk
by source_changes＠macosforge.org 03 May '10

03 May '10

Revision: 822 http://trac.macosforge.org/projects/darwinbuild/changeset/822 Author: wsiegrist(a)apple.com Date: 2010-05-03 14:36:14 -0700 (Mon, 03 May 2010) Log Message: ----------- Merge PR-7935095 Modified Paths: -------------- trunk/darwinbuild.xcodeproj/project.pbxproj trunk/darwinup/Archive.cpp trunk/darwinup/Depot.cpp trunk/testing/darwinup/run-tests.sh Property Changed: ---------------- trunk/ trunk/darwinbuild/darwinbuild.in trunk/darwinbuild/darwinmaster.in trunk/darwinbuild/installXcode.in trunk/darwinbuild/packageRoots.in trunk/darwinbuild/thinPackages.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 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 + /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,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7935095:819-821 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 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinbuild.in:632-650 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /branches/PR-6729491/darwinbuild/darwinbuild.in:655-664 /branches/PR-6973110/darwinbuild/darwinbuild.in:804-813 /branches/PR-7250612/darwinbuild/darwinbuild.in:635-650 /branches/PR-7341154/darwinbuild/darwinbuild.in:682-694 /branches/PR-7431723/darwinbuild/darwinbuild.in:660-664 /branches/PR-7461534/darwinbuild/darwinbuild.in:650-664 /branches/PR-7489777/darwinbuild/darwinbuild.in:676-731 /branches/PR-7529688/darwinbuild/darwinbuild.in:692-694 /branches/PR-7593824/darwinbuild/darwinbuild.in:739-772 /branches/PR-7598640/darwinbuild/darwinbuild.in:703-731 /branches/PR-7748469/darwinbuild/darwinbuild.in:777-785 /branches/PR-7765119/darwinbuild/darwinbuild.in:790-791 /branches/PR-7798586/darwinbuild/darwinbuild.in:796-799 + /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,471 /branches/PR-6634286/darwinbuild/darwinbuild.in:632-650 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /branches/PR-6729491/darwinbuild/darwinbuild.in:655-664 /branches/PR-6973110/darwinbuild/darwinbuild.in:804-813 /branches/PR-7250612/darwinbuild/darwinbuild.in:635-650 /branches/PR-7341154/darwinbuild/darwinbuild.in:682-694 /branches/PR-7431723/darwinbuild/darwinbuild.in:660-664 /branches/PR-7461534/darwinbuild/darwinbuild.in:650-664 /branches/PR-7489777/darwinbuild/darwinbuild.in:676-731 /branches/PR-7529688/darwinbuild/darwinbuild.in:692-694 /branches/PR-7593824/darwinbuild/darwinbuild.in:739-772 /branches/PR-7598640/darwinbuild/darwinbuild.in:703-731 /branches/PR-7748469/darwinbuild/darwinbuild.in:777-785 /branches/PR-7765119/darwinbuild/darwinbuild.in:790-791 /branches/PR-7798586/darwinbuild/darwinbuild.in:796-799 /branches/PR-7935095/darwinbuild/darwinbuild.in:819-821 Property changes on: trunk/darwinbuild/darwinmaster.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 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinmaster.in:632-650 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /branches/PR-6729491/darwinbuild/darwinmaster.in:655-664 /branches/PR-6973110/darwinbuild/darwinmaster.in:804-813 /branches/PR-7250612/darwinbuild/darwinmaster.in:635-650 /branches/PR-7341154/darwinbuild/darwinmaster.in:682-694 /branches/PR-7431723/darwinbuild/darwinmaster.in:660-664 /branches/PR-7461534/darwinbuild/darwinmaster.in:650-664 /branches/PR-7489777/darwinbuild/darwinmaster.in:676-731 /branches/PR-7529688/darwinbuild/darwinmaster.in:692-694 /branches/PR-7593824/darwinbuild/darwinmaster.in:739-772 /branches/PR-7598640/darwinbuild/darwinmaster.in:703-731 /branches/PR-7748469/darwinbuild/darwinmaster.in:777-785 /branches/PR-7765119/darwinbuild/darwinmaster.in:790-791 /branches/PR-7798586/darwinbuild/darwinmaster.in:796-799 + /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,471 /branches/PR-6634286/darwinbuild/darwinmaster.in:632-650 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /branches/PR-6729491/darwinbuild/darwinmaster.in:655-664 /branches/PR-6973110/darwinbuild/darwinmaster.in:804-813 /branches/PR-7250612/darwinbuild/darwinmaster.in:635-650 /branches/PR-7341154/darwinbuild/darwinmaster.in:682-694 /branches/PR-7431723/darwinbuild/darwinmaster.in:660-664 /branches/PR-7461534/darwinbuild/darwinmaster.in:650-664 /branches/PR-7489777/darwinbuild/darwinmaster.in:676-731 /branches/PR-7529688/darwinbuild/darwinmaster.in:692-694 /branches/PR-7593824/darwinbuild/darwinmaster.in:739-772 /branches/PR-7598640/darwinbuild/darwinmaster.in:703-731 /branches/PR-7748469/darwinbuild/darwinmaster.in:777-785 /branches/PR-7765119/darwinbuild/darwinmaster.in:790-791 /branches/PR-7798586/darwinbuild/darwinmaster.in:796-799 /branches/PR-7935095/darwinbuild/darwinmaster.in:819-821 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 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6634286/darwinbuild/installXcode.in:632-650 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /branches/PR-6729491/darwinbuild/installXcode.in:655-664 /branches/PR-6973110/darwinbuild/installXcode.in:804-813 /branches/PR-7250612/darwinbuild/installXcode.in:635-650 /branches/PR-7341154/darwinbuild/installXcode.in:682-694 /branches/PR-7431723/darwinbuild/installXcode.in:660-664 /branches/PR-7461534/darwinbuild/installXcode.in:650-664 /branches/PR-7489777/darwinbuild/installXcode.in:676-731 /branches/PR-7529688/darwinbuild/installXcode.in:692-694 /branches/PR-7593824/darwinbuild/installXcode.in:739-772 /branches/PR-7598640/darwinbuild/installXcode.in:703-731 /branches/PR-7748469/darwinbuild/installXcode.in:777-785 /branches/PR-7765119/darwinbuild/installXcode.in:790-791 /branches/PR-7798586/darwinbuild/installXcode.in:796-799 + /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,471 /branches/PR-6634286/darwinbuild/installXcode.in:632-650 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /branches/PR-6729491/darwinbuild/installXcode.in:655-664 /branches/PR-6973110/darwinbuild/installXcode.in:804-813 /branches/PR-7250612/darwinbuild/installXcode.in:635-650 /branches/PR-7341154/darwinbuild/installXcode.in:682-694 /branches/PR-7431723/darwinbuild/installXcode.in:660-664 /branches/PR-7461534/darwinbuild/installXcode.in:650-664 /branches/PR-7489777/darwinbuild/installXcode.in:676-731 /branches/PR-7529688/darwinbuild/installXcode.in:692-694 /branches/PR-7593824/darwinbuild/installXcode.in:739-772 /branches/PR-7598640/darwinbuild/installXcode.in:703-731 /branches/PR-7748469/darwinbuild/installXcode.in:777-785 /branches/PR-7765119/darwinbuild/installXcode.in:790-791 /branches/PR-7798586/darwinbuild/installXcode.in:796-799 /branches/PR-7935095/darwinbuild/installXcode.in:819-821 Property changes on: trunk/darwinbuild/packageRoots.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 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/packageRoots.in:632-650 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /branches/PR-6729491/darwinbuild/packageRoots.in:655-664 /branches/PR-6973110/darwinbuild/packageRoots.in:804-813 /branches/PR-7250612/darwinbuild/packageRoots.in:635-650 /branches/PR-7341154/darwinbuild/packageRoots.in:682-694 /branches/PR-7431723/darwinbuild/packageRoots.in:660-664 /branches/PR-7461534/darwinbuild/packageRoots.in:650-664 /branches/PR-7489777/darwinbuild/packageRoots.in:676-731 /branches/PR-7529688/darwinbuild/packageRoots.in:692-694 /branches/PR-7593824/darwinbuild/packageRoots.in:739-772 /branches/PR-7598640/darwinbuild/packageRoots.in:703-731 /branches/PR-7748469/darwinbuild/packageRoots.in:777-785 /branches/PR-7765119/darwinbuild/packageRoots.in:790-791 /branches/PR-7798586/darwinbuild/packageRoots.in:796-799 + /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,471 /branches/PR-6634286/darwinbuild/packageRoots.in:632-650 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /branches/PR-6729491/darwinbuild/packageRoots.in:655-664 /branches/PR-6973110/darwinbuild/packageRoots.in:804-813 /branches/PR-7250612/darwinbuild/packageRoots.in:635-650 /branches/PR-7341154/darwinbuild/packageRoots.in:682-694 /branches/PR-7431723/darwinbuild/packageRoots.in:660-664 /branches/PR-7461534/darwinbuild/packageRoots.in:650-664 /branches/PR-7489777/darwinbuild/packageRoots.in:676-731 /branches/PR-7529688/darwinbuild/packageRoots.in:692-694 /branches/PR-7593824/darwinbuild/packageRoots.in:739-772 /branches/PR-7598640/darwinbuild/packageRoots.in:703-731 /branches/PR-7748469/darwinbuild/packageRoots.in:777-785 /branches/PR-7765119/darwinbuild/packageRoots.in:790-791 /branches/PR-7798586/darwinbuild/packageRoots.in:796-799 /branches/PR-7935095/darwinbuild/packageRoots.in:819-821 Property changes on: trunk/darwinbuild/thinPackages.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 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/thinPackages.in:632-650 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /branches/PR-6729491/darwinbuild/thinPackages.in:655-664 /branches/PR-6973110/darwinbuild/thinPackages.in:804-813 /branches/PR-7250612/darwinbuild/thinPackages.in:635-650 /branches/PR-7341154/darwinbuild/thinPackages.in:682-694 /branches/PR-7431723/darwinbuild/thinPackages.in:660-664 /branches/PR-7461534/darwinbuild/thinPackages.in:650-664 /branches/PR-7489777/darwinbuild/thinPackages.in:676-731 /branches/PR-7529688/darwinbuild/thinPackages.in:692-694 /branches/PR-7593824/darwinbuild/thinPackages.in:739-772 /branches/PR-7598640/darwinbuild/thinPackages.in:703-731 /branches/PR-7748469/darwinbuild/thinPackages.in:777-785 /branches/PR-7765119/darwinbuild/thinPackages.in:790-791 /branches/PR-7798586/darwinbuild/thinPackages.in:796-799 + /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,471 /branches/PR-6634286/darwinbuild/thinPackages.in:632-650 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /branches/PR-6729491/darwinbuild/thinPackages.in:655-664 /branches/PR-6973110/darwinbuild/thinPackages.in:804-813 /branches/PR-7250612/darwinbuild/thinPackages.in:635-650 /branches/PR-7341154/darwinbuild/thinPackages.in:682-694 /branches/PR-7431723/darwinbuild/thinPackages.in:660-664 /branches/PR-7461534/darwinbuild/thinPackages.in:650-664 /branches/PR-7489777/darwinbuild/thinPackages.in:676-731 /branches/PR-7529688/darwinbuild/thinPackages.in:692-694 /branches/PR-7593824/darwinbuild/thinPackages.in:739-772 /branches/PR-7598640/darwinbuild/thinPackages.in:703-731 /branches/PR-7748469/darwinbuild/thinPackages.in:777-785 /branches/PR-7765119/darwinbuild/thinPackages.in:790-791 /branches/PR-7798586/darwinbuild/thinPackages.in:796-799 /branches/PR-7935095/darwinbuild/thinPackages.in:819-821 Modified: trunk/darwinbuild.xcodeproj/project.pbxproj =================================================================== --- trunk/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 21:36:14 UTC (rev 822) @@ -3475,6 +3475,7 @@ buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INSTALL_PATH = "$(BINDIR)"; + PREFIX = /usr; PRODUCT_NAME = darwinup; }; name = Release; Modified: trunk/darwinup/Archive.cpp =================================================================== --- trunk/darwinup/Archive.cpp 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/darwinup/Archive.cpp 2010-05-03 21:36:14 UTC (rev 822) @@ -327,7 +327,9 @@ archive = new TarArchive(actpath); } else if (has_suffix(actpath, ".tar.gz") || has_suffix(actpath, ".tgz")) { archive = new TarGZArchive(actpath); - } else if (has_suffix(actpath, ".tar.bz2") || has_suffix(actpath, ".tbz2")) { + } else if (has_suffix(actpath, ".tar.bz2") + || has_suffix(actpath, ".tbz2") + || has_suffix(actpath, ".tbz")) { archive = new TarBZ2Archive(actpath); #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 } else if (has_suffix(actpath, ".xar")) { Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/darwinup/Depot.cpp 2010-05-03 21:36:14 UTC (rev 822) @@ -672,7 +672,9 @@ res = 1; } } else { - fprintf(stdout, "Archive not found: %s\n", path); + fprintf(stdout, "Error: unable to load \"%s\". Either the path is invalid or" + " the file is in an unknown format.\n", path); + return -1; } return res; Modified: trunk/testing/darwinup/run-tests.sh =================================================================== --- trunk/testing/darwinup/run-tests.sh 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/testing/darwinup/run-tests.sh 2010-05-03 21:36:14 UTC (rev 822) @@ -241,6 +241,19 @@ echo "DIFF: diffing original test files to dest (should be no diffs) ..." $DIFF $ORIG $DEST 2>&1 +echo "========== TEST: Try to upgrade with non-existent file =============" +$DARWINUP install $PREFIX/root5 +mv $PREFIX/root5 $PREFIX/root5.tmp +set +e +$DARWINUP upgrade $PREFIX/root5 +set -e +C=$($DARWINUP list | grep root5 | wc -l | xargs) +test "$C" == "1" +mv $PREFIX/root5.tmp $PREFIX/root5 +$DARWINUP uninstall oldest +echo "DIFF: diffing original test files to dest (should be no diffs) ..." +$DIFF $ORIG $DEST 2>&1 + echo "========== TEST: Superseded =============" $DARWINUP install $PREFIX/root5 $DARWINUP install $PREFIX/root6

1 0

[821] branches/PR-7935095/darwinbuild.xcodeproj/project.pbxproj
by source_changes＠macosforge.org 03 May '10

03 May '10

Revision: 821 http://trac.macosforge.org/projects/darwinbuild/changeset/821 Author: wsiegrist(a)apple.com Date: 2010-05-03 12:06:30 -0700 (Mon, 03 May 2010) Log Message: ----------- Adjust prefix per config Modified Paths: -------------- branches/PR-7935095/darwinbuild.xcodeproj/project.pbxproj Modified: branches/PR-7935095/darwinbuild.xcodeproj/project.pbxproj =================================================================== --- branches/PR-7935095/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 18:54:57 UTC (rev 820) +++ branches/PR-7935095/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 19:06:30 UTC (rev 821) @@ -3475,6 +3475,7 @@ buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INSTALL_PATH = "$(BINDIR)"; + PREFIX = /usr; PRODUCT_NAME = darwinup; }; name = Release;

1 0

[820] branches/PR-7935095/darwinup
by source_changes＠macosforge.org 03 May '10

03 May '10

Revision: 820 http://trac.macosforge.org/projects/darwinbuild/changeset/820 Author: wsiegrist(a)apple.com Date: 2010-05-03 11:54:57 -0700 (Mon, 03 May 2010) Log Message: ----------- Add .tbz as a valid TarBZ2 suffix. Improve error message when darwinup does not understand the target file format. Modified Paths: -------------- branches/PR-7935095/darwinup/Archive.cpp branches/PR-7935095/darwinup/Depot.cpp Modified: branches/PR-7935095/darwinup/Archive.cpp =================================================================== --- branches/PR-7935095/darwinup/Archive.cpp 2010-05-03 18:44:56 UTC (rev 819) +++ branches/PR-7935095/darwinup/Archive.cpp 2010-05-03 18:54:57 UTC (rev 820) @@ -327,7 +327,9 @@ archive = new TarArchive(actpath); } else if (has_suffix(actpath, ".tar.gz") || has_suffix(actpath, ".tgz")) { archive = new TarGZArchive(actpath); - } else if (has_suffix(actpath, ".tar.bz2") || has_suffix(actpath, ".tbz2")) { + } else if (has_suffix(actpath, ".tar.bz2") + || has_suffix(actpath, ".tbz2") + || has_suffix(actpath, ".tbz")) { archive = new TarBZ2Archive(actpath); #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 } else if (has_suffix(actpath, ".xar")) { Modified: branches/PR-7935095/darwinup/Depot.cpp =================================================================== --- branches/PR-7935095/darwinup/Depot.cpp 2010-05-03 18:44:56 UTC (rev 819) +++ branches/PR-7935095/darwinup/Depot.cpp 2010-05-03 18:54:57 UTC (rev 820) @@ -672,7 +672,8 @@ res = 1; } } else { - fprintf(stdout, "Archive not found: %s\n", path); + fprintf(stdout, "Error: unable to load \"%s\". Either the path is invalid or" + " the file is in an unknown format.\n", path); return -1; }

1 0

[819] branches/PR-7935095
by source_changes＠macosforge.org 03 May '10

03 May '10

Revision: 819 http://trac.macosforge.org/projects/darwinbuild/changeset/819 Author: wsiegrist(a)apple.com Date: 2010-05-03 11:44:56 -0700 (Mon, 03 May 2010) Log Message: ----------- Return an error code when install routine cannot find the target archive. Modified Paths: -------------- branches/PR-7935095/darwinup/Depot.cpp branches/PR-7935095/testing/darwinup/run-tests.sh Modified: branches/PR-7935095/darwinup/Depot.cpp =================================================================== --- branches/PR-7935095/darwinup/Depot.cpp 2010-05-03 18:36:05 UTC (rev 818) +++ branches/PR-7935095/darwinup/Depot.cpp 2010-05-03 18:44:56 UTC (rev 819) @@ -673,6 +673,7 @@ } } else { fprintf(stdout, "Archive not found: %s\n", path); + return -1; } return res; Modified: branches/PR-7935095/testing/darwinup/run-tests.sh =================================================================== --- branches/PR-7935095/testing/darwinup/run-tests.sh 2010-05-03 18:36:05 UTC (rev 818) +++ branches/PR-7935095/testing/darwinup/run-tests.sh 2010-05-03 18:44:56 UTC (rev 819) @@ -241,6 +241,19 @@ echo "DIFF: diffing original test files to dest (should be no diffs) ..." $DIFF $ORIG $DEST 2>&1 +echo "========== TEST: Try to upgrade with non-existent file =============" +$DARWINUP install $PREFIX/root5 +mv $PREFIX/root5 $PREFIX/root5.tmp +set +e +$DARWINUP upgrade $PREFIX/root5 +set -e +C=$($DARWINUP list | grep root5 | wc -l | xargs) +test "$C" == "1" +mv $PREFIX/root5.tmp $PREFIX/root5 +$DARWINUP uninstall oldest +echo "DIFF: diffing original test files to dest (should be no diffs) ..." +$DIFF $ORIG $DEST 2>&1 + echo "========== TEST: Superseded =============" $DARWINUP install $PREFIX/root5 $DARWINUP install $PREFIX/root6

1 0