October 2008 - darwinbuild-changes - lists.macosforge.org

[407] trunk/darwinbuild/darwinbuild.common
by source_changes＠macosforge.org 31 Oct '08

31 Oct '08

Revision: 407 http://trac.macosforge.org/projects/darwinbuild/changeset/407 Author: wsiegrist(a)apple.com Date: 2008-10-31 08:36:47 -0700 (Fri, 31 Oct 2008) Log Message: ----------- Add --location when downloading sources in case the server needs to redirect us Modified Paths: -------------- trunk/darwinbuild/darwinbuild.common Modified: trunk/darwinbuild/darwinbuild.common =================================================================== --- trunk/darwinbuild/darwinbuild.common 2008-10-30 23:08:44 UTC (rev 406) +++ trunk/darwinbuild/darwinbuild.common 2008-10-31 15:36:47 UTC (rev 407) @@ -152,6 +152,7 @@ echo "Downloading $master_site/$filename ..." curl $CURLARGS --fail \ --silent \ + --location \ --continue-at - \ --output "$destination/.tmp.${filename}" \ --url "$master_site/$filename"

1 0

[406] tags/darwinbuild-1/
by source_changes＠macosforge.org 30 Oct '08

30 Oct '08

Revision: 406 http://trac.macosforge.org/projects/darwinbuild/changeset/406 Author: wsiegrist(a)apple.com Date: 2008-10-30 16:08:44 -0700 (Thu, 30 Oct 2008) Log Message: ----------- "Tagging darwinbuild-1 from http://svn.macosforge.org/repository/darwinbuild/branches/PR-4841388" Added Paths: ----------- tags/darwinbuild-1/

1 0

[405] tags/darwinbuild-1/
by source_changes＠macosforge.org 30 Oct '08

30 Oct '08

Revision: 405 http://trac.macosforge.org/projects/darwinbuild/changeset/405 Author: wsiegrist(a)apple.com Date: 2008-10-30 16:08:28 -0700 (Thu, 30 Oct 2008) Log Message: ----------- Removing tag to retag Removed Paths: ------------- tags/darwinbuild-1/

1 0

[404] branches/PR-4841388/Makefile
by source_changes＠macosforge.org 30 Oct '08

30 Oct '08

Revision: 404 http://trac.macosforge.org/projects/darwinbuild/changeset/404 Author: wsiegrist(a)apple.com Date: 2008-10-30 16:00:49 -0700 (Thu, 30 Oct 2008) Log Message: ----------- Do not install libredo.o during installsrc. Modified Paths: -------------- branches/PR-4841388/Makefile Modified: branches/PR-4841388/Makefile =================================================================== --- branches/PR-4841388/Makefile 2008-10-29 20:08:58 UTC (rev 403) +++ branches/PR-4841388/Makefile 2008-10-30 23:00:49 UTC (rev 404) @@ -20,7 +20,7 @@ make -C $(DIR) $@) || exit 1; ) installsrc: - tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www + tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www --exclude=darwinup/libredo.o installhdrs: @echo Nothing to be done for $@

1 0

[403] tags/darwinbuild-1/
by source_changes＠macosforge.org 29 Oct '08

29 Oct '08

Revision: 403 http://trac.macosforge.org/projects/darwinbuild/changeset/403 Author: wsiegrist(a)apple.com Date: 2008-10-29 13:08:58 -0700 (Wed, 29 Oct 2008) Log Message: ----------- "Tagging darwinbuild-1 from http://svn.macosforge.org/repository/darwinbuild/branches/PR-4841388" Added Paths: ----------- tags/darwinbuild-1/

1 0

[402] branches/PR-4841388/darwinxref/Makefile
by source_changes＠macosforge.org 27 Oct '08

27 Oct '08

Revision: 402 http://trac.macosforge.org/projects/darwinbuild/changeset/402 Author: wsiegrist(a)apple.com Date: 2008-10-27 14:51:57 -0700 (Mon, 27 Oct 2008) Log Message: ----------- * Build darwinxref into SYMROOT instead of OBJROOT. * fix a bug where tcl plugins were not installed when OBJROOT was set Modified Paths: -------------- branches/PR-4841388/darwinxref/Makefile Modified: branches/PR-4841388/darwinxref/Makefile =================================================================== --- branches/PR-4841388/darwinxref/Makefile 2008-10-24 20:49:17 UTC (rev 401) +++ branches/PR-4841388/darwinxref/Makefile 2008-10-27 21:51:57 UTC (rev 402) @@ -28,7 +28,7 @@ CFLAGS+=-g $(TCL_CFLAGS) -DVERSION=\"$(shell cat ../VERSION)\" $(SQLITEINC) LDFLAGS+=-framework CoreFoundation $(TCL_LDFLAGS) PLUGIN_CFLAGS=$(CFLAGS) -I. -PLUGIN_LDFLAGS=$(LDFLAGS) -bundle -bundle_loader $(OBJROOT)/darwinxref +PLUGIN_LDFLAGS=$(LDFLAGS) -bundle -bundle_loader $(SYMROOT)/darwinxref VERSION=$(shell uname -r | cut -f1 -d. ) ifeq ($(VERSION),7) @@ -54,11 +54,11 @@ install: all install_apple_plugins [ -d $(BINDIR) ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinxref $(BINDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) $(SYMROOT)/darwinxref $(BINDIR) [ -d $(DATDIR)/plugins ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)/plugins - $(INSTALL) $(INSTALL_DOC_FLAGS) $(wildcard $(OBJROOT)/plugins/*.so) $(wildcard $(OBJROOT)/plugins/*.tcl) $(DATDIR)/plugins + $(INSTALL) $(INSTALL_DOC_FLAGS) $(wildcard $(OBJROOT)/plugins/*.so) $(wildcard plugins/*.tcl) $(DATDIR)/plugins [ -d $(INCDIR) ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(INCDIR) @@ -84,10 +84,10 @@ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ echo $$CMD ; $$CMD || exit 1 ; \ done - $(CC) $(LDFLAGS) -o $(OBJROOT)/darwinxref \ + $(CC) $(LDFLAGS) -o $(SYMROOT)/darwinxref \ $(SQLITELIB) \ $(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE))) - $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(OBJROOT)/darwinxref || true + $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true plugins/register.so: plugins/register.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins

1 0

[401] trunk/plists/9A581.plist
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 401 http://trac.macosforge.org/projects/darwinbuild/changeset/401 Author: wsiegrist(a)apple.com Date: 2008-10-24 13:49:17 -0700 (Fri, 24 Oct 2008) Log Message: ----------- Add dependencies for Tokend Modified Paths: -------------- trunk/plists/9A581.plist Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2008-10-24 20:40:26 UTC (rev 400) +++ trunk/plists/9A581.plist 2008-10-24 20:49:17 UTC (rev 401) @@ -4216,6 +4216,24 @@ version = 6; }; Tokend = { + dependencies = { + build = ( + file_cmds, + gnutar, + Security, + CarbonHeaders, + cctools, + libsecurity_utilities, + CF, + xnu, + Libc_headers, + architecture, + libsecurity_cssm, + libutil, + text_cmds, + libsecurity_cdsa_utilities, + ); + }; version = 32432; }; Twisted = {

1 0

[400] trunk/darwinbuild/darwinbuild
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 400 http://trac.macosforge.org/projects/darwinbuild/changeset/400 Author: wsiegrist(a)apple.com Date: 2008-10-24 13:40:26 -0700 (Fri, 24 Oct 2008) Log Message: ----------- Undo part of r390 since replacing dsymutil with true breaks xnu builds. We need to find a different way to disconnect libauto dependencies for projects like launchd. Modified Paths: -------------- trunk/darwinbuild/darwinbuild Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2008-10-24 17:29:00 UTC (rev 399) +++ trunk/darwinbuild/darwinbuild 2008-10-24 20:40:26 UTC (rev 400) @@ -528,7 +528,7 @@ ### need dsymutil but it depends on libauto so disable for now if [ ! -x "$BuildRoot/usr/bin/dsymutil" ]; then - cp "/usr/bin/true" "$BuildRoot/usr/bin/dsymutil" + cp "/usr/bin/dsymutil" "$BuildRoot/usr/bin/dsymutil" fi ### CoreOSMakefiles

1 0

[399] branches/PR-4841388/
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 399 http://trac.macosforge.org/projects/darwinbuild/changeset/399 Author: wsiegrist(a)apple.com Date: 2008-10-24 10:29:00 -0700 (Fri, 24 Oct 2008) Log Message: ----------- Branch for <rdar://problem/4841388> Added Paths: ----------- branches/PR-4841388/

1 0

[398] trunk
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 398 http://trac.macosforge.org/projects/darwinbuild/changeset/398 Author: wsiegrist(a)apple.com Date: 2008-10-24 07:27:04 -0700 (Fri, 24 Oct 2008) Log Message: ----------- Build darwinup by default and fix a build failure when SYMROOT != OBJROOT Modified Paths: -------------- trunk/Makefile trunk/darwinup/Makefile trunk/darwinxref/Makefile Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2008-10-24 07:35:48 UTC (rev 397) +++ trunk/Makefile 2008-10-24 14:27:04 UTC (rev 398) @@ -1,6 +1,15 @@ +Project = darwinbuild +SubProjects = darwinbuild \ + darwintrace \ + darwinup \ + darwinxref + +Install_Flags = DESTDIR=$(DSTROOT) + SUBDIRS= \ darwinbuild \ darwinxref \ + darwinup \ darwintrace .PHONY: all clean install uninstall @@ -11,7 +20,7 @@ make -C $(DIR) $@) || exit 1; ) installsrc: - tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=darwinup + tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www installhdrs: @echo Nothing to be done for $@ Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2008-10-24 07:35:48 UTC (rev 397) +++ trunk/darwinup/Makefile 2008-10-24 14:27:04 UTC (rev 398) @@ -1,23 +1,29 @@ -all: darwinup +include ../common.mk CXXFLAGS=-g - -Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h -Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h -Digest.o: Digest.cpp Digest.h -File.o: File.cpp Archive.h Digest.h File.h Utils.h -Utils.o: Utils.h -main.o: main.cpp Depot.h Utils.h - # libredo.o is generated from cctools_ofiles - REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \ echo /usr/local/lib/libredo_prebinding.a ; else \ echo libredo.o ; fi) + +install: all + [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) darwinup $(BINDIR) + + +all: darwinup + darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \ $(REDO) g++ -lcrypto -lsqlite3 -o $@ $^ +Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h +Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h +Digest.o: Digest.cpp Digest.h +File.o: File.cpp Archive.h Digest.h File.h Utils.h +Utils.o: Utils.h +main.o: main.cpp Depot.h Utils.h + clean: rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2008-10-24 07:35:48 UTC (rev 397) +++ trunk/darwinxref/Makefile 2008-10-24 14:27:04 UTC (rev 398) @@ -4,7 +4,7 @@ ### Variables for the 'install' phase ### DATDIR:=$(DATDIR)/darwinxref -INCDIR:=$(INCDIR)/DarwinBuild +INCDIR:=$(INCDIR)/darwinbuild SOURCES= \ DBDataStore.c \ @@ -84,10 +84,10 @@ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ echo $$CMD ; $$CMD || exit 1 ; \ done - $(CC) $(LDFLAGS) -o $(SYMROOT)/darwinxref \ + $(CC) $(LDFLAGS) -o $(OBJROOT)/darwinxref \ $(SQLITELIB) \ $(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE))) - $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true + $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(OBJROOT)/darwinxref || true plugins/register.so: plugins/register.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins

1 0