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

[289] trunk/darwinbuild/log-index.pl
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 289 http://trac.macosforge.org/projects/darwinbuild/changeset/289 Author: kevin Date: 2006-10-04 02:02:21 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - print title information along with the build number Modified Paths: -------------- trunk/darwinbuild/log-index.pl Modified: trunk/darwinbuild/log-index.pl =================================================================== --- trunk/darwinbuild/log-index.pl 2005-10-31 22:21:55 UTC (rev 288) +++ trunk/darwinbuild/log-index.pl 2006-10-04 09:02:21 UTC (rev 289) @@ -47,11 +47,26 @@ return @projects; } +sub getTitle { + my $build = shift; + my $result = ""; + local *STREAM; + open STREAM, '-|', $darwinxref, '-b', $build, 'darwin' || die; + while(<STREAM>) { $result .= $_; } + close STREAM; + $result .= " ("; + open STREAM, '-|', $darwinxref, '-b', $build, 'macosx' || die; + while(<STREAM>) { $result .= $_; } + close STREAM; + $result .= ")"; + return $result; +} + ### ### Main ### -my $BUILD = &getBuild(); +my $BUILD = $ARGV[0] ? $ARGV[0] : &getBuild(); if (!$BUILD) { print STDERR <<EOB; @@ -63,6 +78,8 @@ exit 1; } +my $TITLE = &getTitle($BUILD); + my $LOGDIR; if ($ENV{'DARWIN_BUILDROOT'}) { $LOGDIR = $ENV{'DARWIN_BUILDROOT'} . "/Logs"; @@ -138,6 +155,7 @@ <body> <h2>$BUILD</h2> +<h3>$TITLE</h3> <p>Build log summary.</p> <table id="logtab">

1 0

[287] trunk/darwinxref/DBDataStore.c
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 287 http://trac.macosforge.org/projects/darwinbuild/changeset/287 Author: kevin Date: 2006-10-04 02:02:20 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - fixed double free Modified Paths: -------------- trunk/darwinxref/DBDataStore.c Modified: trunk/darwinxref/DBDataStore.c =================================================================== --- trunk/darwinxref/DBDataStore.c 2005-10-02 23:19:25 UTC (rev 286) +++ trunk/darwinxref/DBDataStore.c 2006-10-04 09:02:20 UTC (rev 287) @@ -277,7 +277,7 @@ CFMutableArrayRef projects = (CFMutableArrayRef)SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q", origbuild); - char* cbuild = origbuild; + char* cbuild = strdup(origbuild); // also include any build aliases for these projects do {

1 0

[286] trunk
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 286 http://trac.macosforge.org/projects/darwinbuild/changeset/286 Author: ssen Date: 2006-10-04 02:02:20 -0700 (Wed, 04 Oct 2006) Log Message: ----------- embed project plists as xar subdocs when packaging. Submitted by: bbraun@ Modified Paths: -------------- trunk/CHANGES trunk/darwinbuild/packageRoots.sh Added Paths: ----------- trunk/darwinxref/plugins/exportProject.c Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2005-09-30 01:09:51 UTC (rev 285) +++ trunk/CHANGES 2006-10-04 09:02:20 UTC (rev 286) @@ -2,6 +2,9 @@ ----------------------------------- Release 0.X.Y [now] + - darwinbuild: add support to packageRoots -x to embed project + plists as xar subdocs (bbraun) + - darwinxref: add exportProject verb (bbraun) - darwinbuild: Add support for "src_foo.c.add" patches as overlays - updated Makfile to honor DSTROOT - darwinxref: Added additive and subtractive dependencies Modified: trunk/darwinbuild/packageRoots.sh =================================================================== --- trunk/darwinbuild/packageRoots.sh 2005-09-30 01:09:51 UTC (rev 285) +++ trunk/darwinbuild/packageRoots.sh 2006-10-04 09:02:20 UTC (rev 286) @@ -118,7 +118,7 @@ ;; xar) FILE="$DARWIN_BUILDROOT/Packages/$PROJ$SFX.xar" - ARGS="-c -f" + ARGS="-s /tmp/$PROJ.$$.xml -n darwinbuild -c -f" SRCARG="." ;; *) @@ -131,10 +131,15 @@ if [ -n "$build_version" -a \ "$SOURCEDIR" -nt "$FILE" ]; then echo "$PROJVERS~$build_version" + $VERBOSE cd "$DARWIN_BUILDROOT" + cd "$DARWIN_BUILDROOT" + $VERBOSE "$DARWINXREF" exportProject -xml $PROJ + "$DARWINXREF" exportProject -xml $PROJ > /tmp/$PROJ.$$.xml $VERBOSE cd "$SOURCEDIR" cd "$SOURCEDIR" $VERBOSE $TOOL $ARGS "$FILE" "$SRCARG" $NORUN $TOOL $ARGS "$FILE" "$SRCARG" + rm -f /tmp/$PROJ.$$.xml fi done } Added: trunk/darwinxref/plugins/exportProject.c =================================================================== --- trunk/darwinxref/plugins/exportProject.c (rev 0) +++ trunk/darwinxref/plugins/exportProject.c 2006-10-04 09:02:20 UTC (rev 286) @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * @APPLE_BSD_LICENSE_HEADER_END@ + */ + +#include "DBPlugin.h" +#include <CoreFoundation/CoreFoundation.h> +#include <sys/stat.h> +#include <unistd.h> + +static int run(CFArrayRef argv) { + int res = 0; + CFIndex count = CFArrayGetCount(argv); + if (count > 2) return -1; + int xml = 0, i; + CFMutableDictionaryRef dict, preplist; + CFDictionaryRef project; + char *cproj; + CFStringRef projname; + CFArrayRef builds; + const void *ssites, *bsites; + CFStringRef build = DBGetCurrentBuild(); + + if (count == 2) { + CFStringRef arg = CFArrayGetValueAtIndex(argv, 0); + xml = CFEqual(arg, CFSTR("-xml")); + // -xml is the only supported option + if (!xml) return -1; + projname = CFArrayGetValueAtIndex(argv, 1); + } else if (count == 1 ) { + projname = CFArrayGetValueAtIndex(argv, 0); + } else + return -1; + + builds = DBCopyBuildInheritance(build); + dict = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks,&kCFTypeDictionaryValueCallBacks); + + preplist = (CFMutableDictionaryRef)DBCopyProjectPlist(build, NULL); + ssites = CFDictionaryGetValue(preplist, CFSTR("source_sites")); + bsites = CFDictionaryGetValue(preplist, CFSTR("binary_sites")); + + preplist = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks,&kCFTypeDictionaryValueCallBacks); + for( i = 0; i < CFArrayGetCount(builds); i++ ) { + build = CFArrayGetValueAtIndex(builds, i); + project = DBCopyProjectPlist(build, projname); + if( CFDictionaryGetCount(project) > 0 ) + break; + } + if( CFDictionaryGetCount(project) < 1 ) + return -1; + CFDictionaryAddValue(dict, projname, project); + CFRelease(project); + CFDictionarySetValue(preplist, CFSTR("build"), build); + CFDictionarySetValue(preplist, CFSTR("projects"), dict); + if(ssites) CFDictionarySetValue(preplist, CFSTR("source_sites"), ssites); + if(bsites) CFDictionarySetValue(preplist, CFSTR("binary_sites"), bsites); + + CFPropertyListRef plist = preplist; + if (xml) { + CFDataRef data = CFPropertyListCreateXMLData(NULL, plist); + res = write(STDOUT_FILENO, CFDataGetBytePtr(data), CFDataGetLength(data)); + } else { + res = writePlist(stdout, plist, 0); + } + return res; +} + +static CFStringRef usage() { + return CFRetain(CFSTR("[-xml] project")); +} + +int initialize(int version) { + //if ( version < kDBPluginCurrentVersion ) return -1; + + DBPluginSetType(kDBPluginBasicType); + DBPluginSetName(CFSTR("exportProject")); + DBPluginSetRunFunc(&run); + DBPluginSetUsageFunc(&usage); + return 0; +} + Property changes on: trunk/darwinxref/plugins/exportProject.c ___________________________________________________________________ Name: svn:eol-style + native

1 0

[285] trunk/darwinxref/DBDataStore.c
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 285 http://trac.macosforge.org/projects/darwinbuild/changeset/285 Author: kevin Date: 2006-10-04 02:02:19 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - only show aliases that point to something in the current build Modified Paths: -------------- trunk/darwinxref/DBDataStore.c Modified: trunk/darwinxref/DBDataStore.c =================================================================== --- trunk/darwinxref/DBDataStore.c 2005-09-29 23:51:27 UTC (rev 284) +++ trunk/darwinxref/DBDataStore.c 2006-10-04 09:02:19 UTC (rev 285) @@ -273,13 +273,15 @@ } CFArrayRef DBCopyOneProjectNames(CFStringRef build) { - char* cbuild = strdup_cfstr(build); + char* origbuild = strdup_cfstr(build); - CFMutableArrayRef projects = (CFMutableArrayRef)SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q", cbuild); + CFMutableArrayRef projects = (CFMutableArrayRef)SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q", origbuild); + char* cbuild = origbuild; + // also include any build aliases for these projects do { - CFArrayRef res = SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q AND property='original'", cbuild); + CFArrayRef res = SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q AND property='original' AND value IN (SELECT DISTINCT project FROM properties WHERE build=%Q)", cbuild, origbuild); free(cbuild); arrayAppendArrayDistinct(projects, res); @@ -291,7 +293,7 @@ CFArraySortValues(projects, CFRangeMake(0, CFArrayGetCount(projects)), (CFComparatorFunction)CFStringCompare, 0); - free(cbuild); + free(origbuild); return projects; }

1 0

[284] trunk/darwinbuild/darwinbuild.common
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 284 http://trac.macosforge.org/projects/darwinbuild/changeset/284 Author: kevin Date: 2006-10-04 02:02:19 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - changed InstallHeader logic to install self-built headers more often Modified Paths: -------------- trunk/darwinbuild/darwinbuild.common Modified: trunk/darwinbuild/darwinbuild.common =================================================================== --- trunk/darwinbuild/darwinbuild.common 2005-09-29 21:48:12 UTC (rev 283) +++ trunk/darwinbuild/darwinbuild.common 2006-10-04 09:02:19 UTC (rev 284) @@ -272,50 +272,42 @@ fi fi - CheckForReceipt "$BuildRoot" "$Project" "hdrs" - if [ $? -eq 0 ]; then - # receipt is present. But do we have a newer local build? + # Install self-built headers only if they're newer than anything + # else that's been installed (Headers and Roots) + if [ -n "$SelfBuiltHeader" ]; then CheckIfNewerThanReceipt "$BuildRoot" "$Project" "hdrs" "$SelfBuiltHeader" if [ $? -eq 0 ]; then - # we're newer Headers. Load us - InstallSelfBuiltHeader=1 - else + CheckIfNewerThanReceipt "$BuildRoot" "$Project" "root" "$SelfBuiltHeader" + if [ $? -eq 0 ]; then + # we're newer Headers. Load us + InstallSelfBuiltHeader=1 + fi + fi + fi + + # If we can't find self-built headers, install a self-built root only + # if it's newer than anything else that's been installed (Headers and Roots) + if [ $InstallSelfBuiltHeader -eq 0 -a -n "$SelfBuiltRoot" ]; then CheckIfNewerThanReceipt "$BuildRoot" "$Project" "hdrs" "$SelfBuiltRoot" if [ $? -eq 0 ]; then - CheckForReceipt "$BuildRoot" "$Project" "root" - if [ $? -eq 0 ]; then CheckIfNewerThanReceipt "$BuildRoot" "$Project" "root" "$SelfBuiltRoot" if [ $? -eq 0 ]; then - # we're newer Root. Load us - InstallSelfBuiltRoot=1 + # we're newer Headers. Load us + InstallSelfBuiltRoot=1 fi - else - InstallSelfBuiltRoot=1 - fi fi - - fi - else - # there wasn't a Headers receipt. look for Roots - CheckForReceipt "$BuildRoot" "$Project" "root" - if [ $? -eq 0 ]; then - CheckIfNewerThanReceipt "$BuildRoot" "$Project" "root" "$SelfBuiltRoot" - if [ $? -eq 0 ]; then - # we're newer Root. Load us - InstallSelfBuiltRoot=1 + fi + + # If we can't find self-built headers or self-built roots, install a + # pre-built root only if nothing's been previously installed. + if [ $InstallSelfBuiltHeader -eq 0 -a $InstallSelfBuiltRoot -eq 0 ]; then + CheckForReceipt "$BuildRoot" "$Project" "hdrs" + if [ $? -eq 1 ]; then + CheckForReceipt "$BuildRoot" "$Project" "root" + if [ $? -eq 1 ]; then + InstallPreBuiltRoot=1 + fi fi - else - # there wasn't any receipt. but if we have a self-built root, we should use it - if [ -n "$SelfBuiltHeader" ]; then - InstallSelfBuiltHeader=1 - else - if [ -n "$SelfBuiltRoot" ]; then - InstallSelfBuiltRoot=1 - else - InstallPreBuiltRoot=1 - fi - fi - fi fi # install a self-built root, or a prebuilt root, or nothing

1 0

[281] trunk/darwinxref
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 281 http://trac.macosforge.org/projects/darwinbuild/changeset/281 Author: kevin Date: 2006-10-04 02:02:17 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - added '?' argument to version, printing out only projects from current build. Modified Paths: -------------- trunk/darwinxref/DBPlugin.h trunk/darwinxref/plugins/version.c Modified: trunk/darwinxref/DBPlugin.h =================================================================== --- trunk/darwinxref/DBPlugin.h 2005-09-26 23:39:08 UTC (rev 280) +++ trunk/darwinxref/DBPlugin.h 2006-10-04 09:02:17 UTC (rev 281) @@ -146,6 +146,7 @@ CFTypeID DBCopyPropSubDictType(CFStringRef property); CFArrayRef DBCopyPropNames(CFStringRef build, CFStringRef project); CFArrayRef DBCopyProjectNames(CFStringRef build); +CFArrayRef DBCopyOneProjectNames(CFStringRef build); CFArrayRef DBCopyChangedProjectNames(CFStringRef oldbuild, CFStringRef newbuild); Modified: trunk/darwinxref/plugins/version.c =================================================================== --- trunk/darwinxref/plugins/version.c 2005-09-26 23:39:08 UTC (rev 280) +++ trunk/darwinxref/plugins/version.c 2006-10-04 09:02:17 UTC (rev 281) @@ -49,6 +49,12 @@ for (i = 0; i < count; ++i) { printProjectVersion(CFArrayGetValueAtIndex(projects, i)); } + } else if (CFEqual(project, CFSTR("?"))) { + CFArrayRef projects = DBCopyOneProjectNames(build); + CFIndex i, count = CFArrayGetCount(projects); + for (i = 0; i < count; ++i) { + printProjectVersion(CFArrayGetValueAtIndex(projects, i)); + } } else { printProjectVersion(project); } @@ -57,7 +63,7 @@ } static CFStringRef usage() { - return CFRetain(CFSTR("<project>")); + return CFRetain(CFSTR("<project>\n*: all projects (including inheritance)\n?: all projects (without inheritance)")); } int initialize(int version) {

1 0

[283] trunk/darwinxref/DBDataStore.c
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 283 http://trac.macosforge.org/projects/darwinbuild/changeset/283 Author: kevin Date: 2006-10-04 02:02:18 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - include inherited build aliases in DBCopyOneProjectNames (crazy but correct). Modified Paths: -------------- trunk/darwinxref/DBDataStore.c Modified: trunk/darwinxref/DBDataStore.c =================================================================== --- trunk/darwinxref/DBDataStore.c 2005-09-29 21:16:15 UTC (rev 282) +++ trunk/darwinxref/DBDataStore.c 2006-10-04 09:02:18 UTC (rev 283) @@ -274,9 +274,25 @@ CFArrayRef DBCopyOneProjectNames(CFStringRef build) { char* cbuild = strdup_cfstr(build); - CFArrayRef res = SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q ORDER BY project", cbuild); + + CFMutableArrayRef projects = (CFMutableArrayRef)SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q", cbuild); + + // also include any build aliases for these projects + do { + CFArrayRef res = SQL_CFARRAY("SELECT DISTINCT project FROM properties WHERE build=%Q AND property='original'", cbuild); + free(cbuild); + + arrayAppendArrayDistinct(projects, res); + CFRelease(res); + + build = DBCopyOnePropString(build, NULL, CFSTR("inherits")); + cbuild = strdup_cfstr(build); + } while (build != NULL); + + CFArraySortValues(projects, CFRangeMake(0, CFArrayGetCount(projects)), (CFComparatorFunction)CFStringCompare, 0); + free(cbuild); - return res; + return projects; } CFArrayRef DBCopyProjectNames(CFStringRef build) {

1 0

[282] trunk/darwinbuild/log-index.pl
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 282 http://trac.macosforge.org/projects/darwinbuild/changeset/282 Author: kevin Date: 2006-10-04 02:02:18 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - show files from this build that haven't been built yet. Modified Paths: -------------- trunk/darwinbuild/log-index.pl Modified: trunk/darwinbuild/log-index.pl =================================================================== --- trunk/darwinbuild/log-index.pl 2005-09-29 18:56:43 UTC (rev 281) +++ trunk/darwinbuild/log-index.pl 2006-10-04 09:02:18 UTC (rev 282) @@ -35,7 +35,7 @@ my $build = shift; local *PROJECTS; - open PROJECTS, '-|', $darwinxref, '-b', $build, 'version', '*' || die; + open PROJECTS, '-|', $darwinxref, '-b', $build, 'version', '?' || die; my @projects; while (<PROJECTS>) { my $project = $_; @@ -166,9 +166,8 @@ my $logfile; if ( -e "$LOGDIR/$projnam" ) { - #$build_version = getBuildVersion bsd_glob("$LOGDIR/$projnam/$project.*"); - #my $logfile = "$LOGDIR/$projnam/$project.log~$build_version"; - $logfile = bsd_glob("$LOGDIR/$projnam/*.log~*"); + $build_version = getBuildVersion(bsd_glob("$LOGDIR/$projnam/$project.*")); + $logfile = "$LOGDIR/$projnam/$project.log~$build_version"; if ( -e $logfile ) { local *LOG; open LOG, $logfile; @@ -205,6 +204,14 @@ <td align="right" $color>$exitstatus</td> </tr> EOB + } else { + print <<EOB; +<tr> + <td>$project</td> + <td></td> + <td></td> + <td></td> +EOB } }

1 0

[280] trunk/darwinbuild/darwinbuild
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 280 http://trac.macosforge.org/projects/darwinbuild/changeset/280 Author: kevin Date: 2006-10-04 02:02:16 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - support -headers for -load, which causes the Headers root to be loaded. Modified Paths: -------------- trunk/darwinbuild/darwinbuild Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2005-09-22 20:51:46 UTC (rev 279) +++ trunk/darwinbuild/darwinbuild 2006-10-04 09:02:16 UTC (rev 280) @@ -237,7 +237,11 @@ for ARG in "$@"; do if [ "$projnam" == "" ]; then if [ "$ARG" == "-headers" ]; then - action="installhdrs" + if [ "$action" == "load" ]; then + action="loadhdrs" + else + action="installhdrs" + fi elif [ "$ARG" == "-fetch" ]; then action="fetch" elif [ "$ARG" == "-source" ]; then @@ -253,7 +257,11 @@ elif [ "$ARG" == "-nopatch" ]; then nopatch="YES" elif [ "$ARG" == "-load" ]; then - action="load" + if [ "$action" == "installhdrs" ]; then + action="loadhdrs" + else + action="load" + fi elif [ "$ARG" == "-noload" ]; then noload="YES" elif [ "$ARG" == "-loadonly" ]; then @@ -308,6 +316,9 @@ if [ "$action" == "load" ]; then InstallRoot "$BuildRoot" "$projnam" "$depsbuild" exit 0 +elif [ "$action" == "loadhdrs" ]; then + InstallHeader "$BuildRoot" "$projnam" "$depsbuild" + exit 0 fi #

1 0

[279] trunk/darwinxref/Makefile
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 279 http://trac.macosforge.org/projects/darwinbuild/changeset/279 Author: kevin Date: 2006-10-04 02:02:13 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - use substitution, not wildcards, since plugins won't exist before the build Modified Paths: -------------- trunk/darwinxref/Makefile Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2005-09-22 07:14:06 UTC (rev 278) +++ trunk/darwinxref/Makefile 2006-10-04 09:02:13 UTC (rev 279) @@ -13,8 +13,8 @@ cfutils.c \ main.c -PLUGIN_SOURCES=$(wildcard plugins/*.c) $(wildcard plugins-darwinports/*.c) -PLUGIN_OBJECTS=$(wildcard plugins/*.so) $(wildcard plugins/*.tcl) +PLUGIN_SOURCES=$(wildcard plugins/*.c) +PLUGIN_OBJECTS=$(PLUGIN_SOURCES:.c=.so) $(wildcard plugins/*.tcl) ### todo: --with-plugin-path configuration CFLAGS+= \

1 0