![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / make
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.84 / (download) - annotate - [select for diffs], Mon Sep 4 11:35:11 2023 UTC (8 months, 2 weeks ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
HEAD
Changes since 1.83: +1 -2 lines
Diff to previous 1.83 (colored)
GC old code that was originally implemented to facilitate adoption by other BSDs, which never happened, so make things simpler for further development. Ditches config.h entirely since it gets reduced to 2 defines. okay tb@
Revision 1.83 / (download) - annotate - [select for diffs], Sat Jul 8 18:42:27 2023 UTC (10 months, 1 week ago) by espie
Branch: MAIN
Changes since 1.82: +4 -3 lines
Diff to previous 1.82 (colored)
nitpicking: singular of children is child
Revision 1.82 / (download) - annotate - [select for diffs], Sun Jan 26 12:41:21 2020 UTC (4 years, 3 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE,
OPENBSD_7_3,
OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7
Changes since 1.81: +2 -11 lines
Diff to previous 1.81 (colored)
remove OP_* for deprecated keywords (document that :: still uses OP_INVISIBLE) okay millert@
Revision 1.81 / (download) - annotate - [select for diffs], Mon Jan 13 15:41:53 2020 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.80: +18 -21 lines
Diff to previous 1.80 (colored)
make the choice of engine explicit simplify the running of .BEGIN/.END so that they pass through the engine first (so they can now have dependencies). Error out properly if .BEGIN/.END fails.
Revision 1.80 / (download) - annotate - [select for diffs], Mon Jan 13 15:24:31 2020 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.79: +8 -2 lines
Diff to previous 1.79 (colored)
unify compat mode and parallelmode a bit: there's no longer a need for handle_one_job, always go thru Job_Make now.
Revision 1.79 / (download) - annotate - [select for diffs], Mon Jan 13 15:15:17 2020 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.78: +2 -2 lines
Diff to previous 1.78 (colored)
less confusing function name
Revision 1.78 / (download) - annotate - [select for diffs], Mon Jan 13 14:05:21 2020 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.77: +2 -1 lines
Diff to previous 1.77 (colored)
move a large chunk of suff.c into its own file (independent functions which are not really directly related to suffix handling), so that I can eventually understand how this whole thing works.
Revision 1.77 / (download) - annotate - [select for diffs], Wed Jan 8 14:09:29 2020 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.76: +3 -2 lines
Diff to previous 1.76 (colored)
fix -q: in compatMode, compute and return outofdate just like parallel mode. Also, never run .END in querymode (we don't actually care about updating problem in that case). okay millert@
Revision 1.76 / (download) - annotate - [select for diffs], Sat Dec 21 15:31:54 2019 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.75: +6 -7 lines
Diff to previous 1.75 (colored)
yet another mostly cosmetic diff - rename context into localvars, which is more meaningful and less generic - instantiate the random rumbling at the start of gnode.h with actual variable names - explain and group gnode.h variables better - make some comments terser/more meaningful okay millert@
Revision 1.75 / (download) - annotate - [select for diffs], Sat Dec 21 15:29:25 2019 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.74: +44 -43 lines
Diff to previous 1.74 (colored)
rename a few variable/functions to have better names. adjust comments to be more meaningful reorder predecessors/successors fields in an order that makes more sense to me. okay millert@
Revision 1.74 / (download) - annotate - [select for diffs], Sat Dec 21 15:28:17 2019 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.73: +2 -2 lines
Diff to previous 1.73 (colored)
rename built_status constants to be less quirky fold back BEINGMADE and BUILDING which mean the same thing GC CYCLE/ENDCYCLE okay millert@
Revision 1.73 / (download) - annotate - [select for diffs], Thu Jun 22 17:09:10 2017 UTC (6 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2
Changes since 1.72: +13 -13 lines
Diff to previous 1.72 (colored)
zap trailing spaces from the previous commits and also other trailing spaces
Revision 1.72 / (download) - annotate - [select for diffs], Thu Jun 22 17:08:20 2017 UTC (6 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.71: +125 -60 lines
Diff to previous 1.71 (colored)
better display of cycles in -j mode. lots of tests by krw@ review and comments by pirofti@, more tweaks to come
Revision 1.71 / (download) - annotate - [select for diffs], Fri Oct 21 16:12:38 2016 UTC (7 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.70: +4 -4 lines
Diff to previous 1.70 (colored)
small obvious cleanups: - remove a lot of unnecessary casts - zap extra param that's no longer needed - add proper prototype and make function static okay natano@
Revision 1.70 / (download) - annotate - [select for diffs], Fri Aug 21 02:19:49 2015 UTC (8 years, 9 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.69: +2 -2 lines
Diff to previous 1.69 (colored)
correctly indent a line to make the intent clear ok espie@
Revision 1.69 / (download) - annotate - [select for diffs], Fri Jan 23 13:18:40 2015 UTC (9 years, 3 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.68: +9 -7 lines
Diff to previous 1.68 (colored)
remove a bunch of dangerous casts (useless casts from void * to something else, in some cases by adding extra temporary variables. IMO, it's much better practice to do void *a; int *p = a; *p = 42; rather than void *a; *(int *)a = 42; okay miod@... to be revisited for some possible const additions later.
Revision 1.68 / (download) - annotate - [select for diffs], Mon Jan 6 12:21:45 2014 UTC (10 years, 4 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.67: +2 -2 lines
Diff to previous 1.67 (colored)
Suff_FindDeps must happen before SuffExpandChildren (expand_all_children) so that dynamic variables are solved properly
Revision 1.67 / (download) - annotate - [select for diffs], Wed May 22 12:14:08 2013 UTC (10 years, 11 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.66: +13 -25 lines
Diff to previous 1.66 (colored)
as checked through thorough tests, youngest->mtime == ctime, so ditch the extra field. remove some extra abstraction layer: use clock_gettime directly instead of ts_set_from_now (what is "now" anyways) time_to_string takes param by pointer rename "now" into starttime (more accurate term) randomize queue uses arc4random_uniform (prompted by deraadt@) display debug timestamp with ns too (it's debug, so it doesn't really matter whichever way it's done, as long as it's done) okay millert@
Revision 1.66 / (download) - annotate - [select for diffs], Tue Apr 23 14:32:53 2013 UTC (11 years ago) by espie
Branch: MAIN
Changes since 1.65: +3 -2 lines
Diff to previous 1.65 (colored)
remove TIMESTAMP abstraction layer, prodded by theo. while there, clean up includes. use strtoll for ar timestamps (pretty much unused in reality, more standard conforming than anything) use idea from Todd to adapt to time_t being 32 bits OR 64 bits (pedantically correct: INT_MIN would work just fine up to 1910 or so...) okay millert@, gone thru a make build.
Revision 1.65 / (download) - annotate - [select for diffs], Sat Dec 8 12:54:17 2012 UTC (11 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.64: +5 -5 lines
Diff to previous 1.64 (colored)
document a bit of job.c notice that Job_Finish() really returns a boolean, so unconfuse that accordingly (it's likely the extra Fatal() message is not needed and we could just call finish)
Revision 1.64 / (download) - annotate - [select for diffs], Tue Oct 9 19:49:28 2012 UTC (11 years, 7 months ago) by espie
Branch: MAIN
Changes since 1.63: +62 -5 lines
Diff to previous 1.63 (colored)
actual engine change: prevent jobs from stomping on each other's files. namely: - targets that ARE the same file shouldn't build concurrently. - targets in the same group (e.g., file.c file.c: file.y) shouldn't build concurrently. This probably fixes all the remaining races in make -j4 build in src.
Revision 1.63 / (download) - annotate - [select for diffs], Sat Apr 21 04:35:32 2012 UTC (12 years, 1 month ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2
Changes since 1.62: +3 -8 lines
Diff to previous 1.62 (colored)
When a new parent is attached to an already examined child (prerequisite), use the same logic to update the parent (factored out as SuffLinkParent()) as is used for updating the original parent. Fixes the "make -j2" problem reported by tedu@ at c2k11 ok espie@
Revision 1.62 / (download) - annotate - [select for diffs], Thu Nov 3 20:55:22 2011 UTC (12 years, 6 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1
Changes since 1.61: +1 -4 lines
Diff to previous 1.61 (colored)
Garbage collect an unused variable. Found by Michael W. Bombardieri <mwb at bom dot nom dot co> using lint. ok deraadt@
Revision 1.61 / (download) - annotate - [select for diffs], Mon Jul 19 19:46:44 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.60: +1 -2 lines
Diff to previous 1.60 (colored)
Correct $OpenBSD$ stuff
Revision 1.60 / (download) - annotate - [select for diffs], Sun Aug 16 09:53:43 2009 UTC (14 years, 9 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.59: +1 -1 lines
Diff to previous 1.59 (colored)
modify timestamp handling to grab current time instead of relying on a stale timestamp. all those diffs sent to people ages ago, who didn't answer, except for Theo, who said he ran it with no issues, so let's get this in...
Revision 1.59 / (download) - annotate - [select for diffs], Sun May 10 11:07:37 2009 UTC (15 years ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6
Changes since 1.58: +1 -1 lines
Diff to previous 1.58 (colored)
simplify job handling a great deal: we don't care when jobs get stopped/continued, as we won't try to start new jobs when other stuff is stopped. Redo signal handling so that most stuff can be done directly in the handler. This requires blocking/unblocking signals while creating new jobs, and creating a small list that only contains job's pids. Switch to pgrps for jobs, since that works. Add a clamping heuristic that avoids starting new jobs while an expensive job is running (expensive meaning "very likely to be a recursive make run"). This idea is mostly from Theo, through the implementation is mine.
Revision 1.58 / (download) - annotate - [select for diffs], Tue Nov 4 07:22:36 2008 UTC (15 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE,
OPENBSD_4_5
Changes since 1.57: +16 -2 lines
Diff to previous 1.57 (colored)
changes to get target equivalence to work better. - add new file to create lists of equivalent targets (siblings) - use that for sequential mode to have much better VPATH support - separate checking commands from reporting error, for later. - zap DieHorribly accordingly - renumber existing flags - signal_running_jobs() is simpler than pass_signal_to_jobs() - new debug option -dn for name matching. Similar code to handle parallel make is still missing. thanks to Mark, Miod, Theo, Otto, Todd for tests and/or comments.
Revision 1.57 / (download) - annotate - [select for diffs], Sat Jan 12 13:08:59 2008 UTC (16 years, 4 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.56: +1 -2 lines
Diff to previous 1.56 (colored)
better error reporting/job handling error: - systematically reorder jobs based on who did output last, so that the last job to output is *first* to output again. - better reaction to errors: any job that outputs is checked for termination directly, and the Error message is printed right afterwards. - better error messages, giving more useful information in -j mode.
Revision 1.56 / (download) - annotate - [select for diffs], Sat Dec 1 15:14:34 2007 UTC (16 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.55: +50 -16 lines
Diff to previous 1.55 (colored)
I was sure I had committed this already, grrrr. Anyways, switch to a growable array for job to do. Allows us to randomize it. fix manpage. do not add delay if just one job to run.
Revision 1.55 / (download) - annotate - [select for diffs], Wed Nov 28 09:41:03 2007 UTC (16 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.54: +1 -1 lines
Diff to previous 1.54 (colored)
grrr
Revision 1.54 / (download) - annotate - [select for diffs], Wed Nov 28 09:40:08 2007 UTC (16 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.53: +38 -7 lines
Diff to previous 1.53 (colored)
debug scaffolding: allows the insertion of a random delay before firing up jobs in parallel mode.
Revision 1.53 / (download) - annotate - [select for diffs], Mon Nov 26 22:48:18 2007 UTC (16 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.52: +1 -1 lines
Diff to previous 1.52 (colored)
keep unmade uptodate all the time, even for targets we're not making yet, since we might want to make them later. okay millert@, beck@
Revision 1.52 / (download) - annotate - [select for diffs], Sat Nov 24 15:41:01 2007 UTC (16 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.51: +138 -91 lines
Diff to previous 1.51 (colored)
more parallel make fixes. Preparations to fix the engine: - new function has_been_built(gn), that tells you what's the status of a given node. Allows us to run Suff_FindDeps later, by updating the number of unmade children correctly. - take out the code that handles shell expansions in an expand_children* set of functions, called by Suff_FindDeps, among others. These must be called early in the engine to avoid creating bogus nodes. Engine fixes: - take the predecessor/successor special handling out, deal with it in separate functions. - don't count nodes. Explicitly track them all in a hash table (better way to deal with non-built issues). - don't run Suff_FindDeps at start, but just before building an actual node. This allows make to find all dependencies correctly, as in groff. Pfiou! now it works.
Revision 1.51 / (download) - annotate - [select for diffs], Sun Nov 18 09:20:25 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.50: +9 -10 lines
Diff to previous 1.50 (colored)
simplify, no sense to break just to do return afterwards
Revision 1.50 / (download) - annotate - [select for diffs], Sat Nov 17 16:39:45 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.49: +1 -1 lines
Diff to previous 1.49 (colored)
simplify dynamic variable handling a great deal: first remove all usage of Varq_Append by building the string directly. then replace `common' handling with specialized handling for dynamic strings (since they no longer need a buffer). Finally, identify the place where the variable value needs to be copied because it's going to be free'd or erased soon, and finally, use simple char* pointers. Shaves about 80 bytes off every gnode structure, and kills quite a few unnecessary malloc()s as well.
Revision 1.49 / (download) - annotate - [select for diffs], Sat Nov 10 13:59:48 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.48: +3 -3 lines
Diff to previous 1.48 (colored)
UNMADE -> UNKNOWN
Revision 1.48 / (download) - annotate - [select for diffs], Sat Nov 10 12:51:40 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.47: +17 -16 lines
Diff to previous 1.47 (colored)
rename make -> must_make, made -> built_status to make them easier to find in source files.
Revision 1.47 / (download) - annotate - [select for diffs], Tue Nov 6 21:12:23 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.46: +1 -13 lines
Diff to previous 1.46 (colored)
simplify the way we deal with implicit rules and handle $<. Having an `iParents' field is actually backwards, it's ways simpler to store the pointer in the child, as an impliedsrc, and to set the variable just in time along with all the rest in DoAllVar. This is simpler, and it should allow us to call SuffFindDeps much later.
Revision 1.46 / (download) - annotate - [select for diffs], Tue Nov 6 21:09:42 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.45: +106 -89 lines
Diff to previous 1.45 (colored)
get make.c in a more readable state, by extracting code into separate functions. Restore a big more debug: if DEBUG(JOB), print commands (unexpanded).
Revision 1.45 / (download) - annotate - [select for diffs], Sat Nov 3 11:45:52 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.44: +0 -4 lines
Diff to previous 1.44 (colored)
zap dead code
Revision 1.44 / (download) - annotate - [select for diffs], Sat Nov 3 10:39:22 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.43: +2 -4 lines
Diff to previous 1.43 (colored)
suff.c sets IMPSRC correctly, whereas this is bogus and strips the path a lot of the time.
Revision 1.43 / (download) - annotate - [select for diffs], Fri Nov 2 17:27:24 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.42: +5 -6 lines
Diff to previous 1.42 (colored)
Work done at p2k7. This is a really big step towards getting parallel make to work. Note that this is not yet complete. There are still a few `details' to fix before this works 100%. Specifically: sequential make (compat) and parallel make don't use the same engine, and the parallel engine still has a few limitations. For instance, some known issues: - parallel make does not deal with .phony targets correctly all the time. - some errors are deadly in parallel make mode. - parallel make NEEDS way more sturdy correspondance of file system paths and target names, since it often needs to match dependencies to targets before the corresponding files exist. - some local variables like $* get set in a bogus way in some cases. - suffix handling has issues, especially related to the NULL suffix. So, if you find stuff that does NOT yet work with parallel make, don't go blindly try to fix the Makefile. It's very likely you might have stumbled into a make bug. (unless you really, really, understand Makefiles, DON'T GO CHANGING THEM YET). Tested by lots of people, thanks go to miod@, and robert@ among other people. Quick summary of what this does: - remove `saving commands' extension (it's not really usable, nor used) - move compat job runner and parallel interrupt handling into engine.c - tweak the code so that both compat and parallel mode use the same job runner and the same interrupt handling. Remove the other one. - optimize job runner so that, in parallel mode, the last command does not fork if we can avoid it (as it's already running in a sub shell). - scrape all the code that dealt with creating shell scripts from commands. - scrape all the code that dealt with recognizing special sequences in command output to print/not print output. - fix the parallel job pipe to not keep around file descriptors that are not needed. - replace the parallel job buffering with a nicer one, that deals with non-blocking descriptors to try to agregate as much output from one job in one go (greed) to unconfuse the users. - create two pipes per job, so that stdout and stderr stay separate. - make job token printing a debug option. - always use the parallel job-runner to `execute' commands, even if we just print them out. - store list of errors encountered during parallel make running, and print them on exit, so that we know what went wrong. - add a dirty hack to targ.c to deal with paths produced by gccmakedep.
Revision 1.42 / (download) - annotate - [select for diffs], Mon Sep 17 12:01:17 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.41: +2 -2 lines
Diff to previous 1.41 (colored)
make usePipes the default, zap undocumented -P.
Revision 1.41 / (download) - annotate - [select for diffs], Mon Sep 17 09:28:36 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.40: +32 -32 lines
Diff to previous 1.40 (colored)
kill extra spaces at end of line
Revision 1.40 / (download) - annotate - [select for diffs], Mon Sep 17 08:53:59 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.39: +248 -269 lines
Diff to previous 1.39 (colored)
reindent, zap useless comments
Revision 1.39 / (download) - annotate - [select for diffs], Mon Sep 17 08:36:57 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.38: +2 -2 lines
Diff to previous 1.38 (colored)
kill += 1, -= 1 -> ++, --
Revision 1.38 / (download) - annotate - [select for diffs], Sun Sep 16 12:09:36 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.37: +2 -3 lines
Diff to previous 1.37 (colored)
rename Targ_FmtTime into time_to_string and move it, as it's not related to target nodes at all (reduces modules inter-dependencies)
Revision 1.37 / (download) - annotate - [select for diffs], Sun Sep 16 10:39:07 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.36: +2 -327 lines
Diff to previous 1.36 (colored)
first step towards sanity: take the functions common to parallel/not parallel make outside of make.c and job.c, and create an engine.c file to hold them.
Revision 1.36 / (download) - annotate - [select for diffs], Sun Sep 16 09:46:14 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.35: +1 -35 lines
Diff to previous 1.35 (colored)
remove dead code: #define RECHECK is always on
Revision 1.35 / (download) - annotate - [select for diffs], Wed Apr 7 13:11:36 2004 UTC (20 years, 1 month ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2,
OPENBSD_4_1_BASE,
OPENBSD_4_1,
OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6
Changes since 1.34: +27 -31 lines
Diff to previous 1.34 (colored)
ISO function declarations, trim a few comments, rename a few variables to more explicit/more consistent names. okay otto@
Revision 1.34 / (download) - annotate - [select for diffs], Sat Nov 8 19:17:29 2003 UTC (20 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5
Changes since 1.33: +2 -2 lines
Diff to previous 1.33 (colored)
typos from Jonathon Gray;
Revision 1.33 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:12 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.32: +2 -6 lines
Diff to previous 1.32 (colored)
Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo.
Revision 1.32 / (download) - annotate - [select for diffs], Fri Nov 23 23:42:45 2001 UTC (22 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE,
OPENBSD_3_3,
OPENBSD_3_2_BASE,
OPENBSD_3_2,
OPENBSD_3_1_BASE,
OPENBSD_3_1
Changes since 1.31: +1 -2 lines
Diff to previous 1.31 (colored)
back out changes that break kernel compiles. good testing jobmk install!
Revision 1.31 / (download) - annotate - [select for diffs], Thu Nov 22 21:18:10 2001 UTC (22 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.30: +3 -2 lines
Diff to previous 1.30 (colored)
Explicitly mark nodes whose commands have been filled with implicit (suffix) rules. Then, only expand the IMPSRC/< variable if the node has been marked. This matches what Single Unix 2 and common sense say: implicit rules shouldn't count when an explicit rule has been found (an explicit rule being a full-scale dependency, with some associated commands) Note that Single Unix leaves the `PREFIX' question open, so we leave the PREFIX code as it is. This fixes regression case mk14, which now fails as it should. This is just a bug-fix. Some more correct (and faster) code should probably be substituted. Namely, right now, the suffix code is too greedy, whereas it should test for explicit rules earlier, and not even bother instantiating implicit rules from templates when they duplicate actual existing rules. ok millert@
Revision 1.30 / (download) - annotate - [select for diffs], Sun Nov 11 12:35:02 2001 UTC (22 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)
Fixed version... don't see how this could work on i386, since it didn't initialize create in main.c.
Revision 1.29 / (download) - annotate - [select for diffs], Sun Nov 11 06:02:06 2001 UTC (22 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.28: +1 -1 lines
Diff to previous 1.28 (colored)
undo changes that crash on (at least) the alpha
Revision 1.28 / (download) - annotate - [select for diffs], Sun Nov 11 01:19:23 2001 UTC (22 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 (colored)
Redo LstInit as a macro: smaller and faster code in all cases, zeroing two pointers is simpler than calling a function. Recognize purely static lst headers, which don't really need any initialization. ok miod@
Revision 1.27 / (download) - annotate - [select for diffs], Tue May 29 12:53:42 2001 UTC (22 years, 11 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE,
OPENBSD_3_0
Changes since 1.26: +2 -1 lines
Diff to previous 1.26 (colored)
Take includes out of lst.h, re-add what's needed to separate files. Removes remaining lint stuff from lst.lib.
Revision 1.26 / (download) - annotate - [select for diffs], Wed May 23 12:34:46 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.25: +46 -45 lines
Diff to previous 1.25 (colored)
Mostly clean-up: - cut up those huge include files into separate interfaces for all modules. Put the interface documentation there, and not with the implementation. - light-weight includes for needed concrete types (lst_t.h, timestamp_t.h). - cut out some more logically separate parts: cmd_exec, varname, parsevar, timestamp. - put all error handling functions together, so that we will be able to clean them up. - more systematic naming: functioni to handle interval, function to handle string. - put the init/end code apart to minimize coupling. - kill weird types like ReturnStatus and Boolean. Use standard bool (with a fallback for non-iso systems) - better interface documentation for lots of subsystems. As a result, make compilation goes somewhat faster (5%, even considering the largish BSD copyrights to read). The corresponding preprocessed source goes down from 1,5M to 1M. A few minor code changes as well: Parse_DoVar is no longer destructive. Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an assignment is), a few more interval handling functions. Avoid calling XXX_End when they do nothing, just #define XXX_End to nothing. Parse_DoVar is slightly more general: it will handle compound assignments as long as they make sense, e.g., VAR +!= cmd will work. As a side effect, VAR++=value now triggers an error (two + in assignment). - this stuff doesn't occur in portable Makefiles. - writing VAR++ = value or VAR+ +=value disambiguates it. - this is a good thing, it uncovered a bug in bsd.port.mk. Tested by naddy@. Okayed millert@. I'll handle the fallback if there is any. This went through a full make build anyways, including isakmpd (without mickey's custom binutils, as he didn't see fit to share it with me).
Revision 1.25 / (download) - annotate - [select for diffs], Thu May 3 13:41:08 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.24: +135 -151 lines
Diff to previous 1.24 (colored)
Synch with my current work.
Numerous changes:
- generate can build several tables
- style cleanup
- statistics code
- use variable names throughout (struct Name)
- recursive variables everywhere
- faster parser (pass buffer along instead of allocating multiple copies)
- correct parser. Handles comments everywhere, and ; correctly
- more string intervals
- simplified dir.c, less recursion.
- extended for loops
- sinclude()
- finished removing extra junk from Lst_*
- handles ${@D} and friends in a simpler way
- cleaned up and modular VarModifiers handling.
- recognizes some gnu Makefile usages and errors out about them.
Additionally, some extra functionality is defined by FEATURES. The set of
functionalities is currently hardcoded to OpenBSD defaults, but this may
include support for some NetBSD extensions, like ODE modifiers.
Backed by miod@ and millert@, who finally got sick of my endless patches...
Revision 1.24 / (download) - annotate - [select for diffs], Fri Nov 24 14:36:34 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE,
OPENBSD_2_9
Changes since 1.23: +14 -16 lines
Diff to previous 1.23 (colored)
Change the time stamp interface to use an abstract datatype. Define two possible interfaces: the classic one, and the new one (used where available) that depends on timespec. Better granularity, make is now able to distinguish between files that were built during the same second.
Revision 1.23 / (download) - annotate - [select for diffs], Thu Sep 14 13:52:42 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE,
OPENBSD_2_8
Changes since 1.22: +6 -5 lines
Diff to previous 1.22 (colored)
Introduce a few macros to handle timestamps in an abstract way. Replace the time stamp hash in dir.c with an open hashing structure. In doing so, remove some nasty casts, simplify code a bit: Dir_MTime can return a modification time, since make does not make a distinction between out-of-date and non-existent files.
Revision 1.22 / (download) - annotate - [select for diffs], Thu Sep 14 13:46:45 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.21: +4 -3 lines
Diff to previous 1.21 (colored)
Replace the old hash used to hold file names within a directory with open hashing. An interesting optimization is that the open hashing interface is more fine-grained, hence we can compute the correct hash value at the start of Dir_FindFile, and reuse it for each hash structure into which we look (the effect is measurable on large directories along with objdir/VPATH). Remove a few unnecessary Lst_Open/Lst_Close that serve no purpose except obfuscating the code. The interface to dir.h changes slightly, hence tedious includes changes...
Revision 1.21 / (download) - annotate - [select for diffs], Thu Sep 14 13:32:07 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.20: +10 -9 lines
Diff to previous 1.20 (colored)
Some systematic clean-up. - UNUSED macro that expands to __attribute__((unused)) for gcc - move rcsid around so that they can be tagged UNUSED. - activate -Wunused. - use UNUSED instead of kludgy junk for function arguments. - add extern to all extern prototypes. - update comments in lst.h. - clean up var.c a little bit, constifying arguments, updating comments...
Revision 1.20 / (download) - annotate - [select for diffs], Fri Jun 23 16:18:09 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.19: +16 -19 lines
Diff to previous 1.19 (colored)
Start of variable fixes and speed-ups. This patch may seem a bit non-sensical at first. It simply introduces some new interface. Specifically, recognizes that some variable names (.TARGET/$@, .OODATE/$?, .ALLSRC/$>, .IMPSRC/$<, .PREFIX/$*, .ARCHIVE/$!, .MEMBER/$%) are `special' (the actual variables which are local to a target, e.g. GNode). Currently, The Varq functions (for Varquick access) are only stubs to the normal functions. This fixes a very important detail before proceeding to turn variable lists into hash tables: if every GNode holds a hash table, initialization times for those will be very costly. But generic GNodes only hold those seven special variables... which can be stored directly into a small array; the only general cases are the environment, the command line and global variables.
Revision 1.19 / (download) - annotate - [select for diffs], Fri Jun 23 16:15:50 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.18: +39 -40 lines
Diff to previous 1.18 (colored)
Trivial consequences of the previous list changes: - audit code for Lst_Datum, it's never applied to an empty pointer, so check can be removed -> turn into a macro, - Lst_First, Lst_Last can become macro as well - specialized version of Lst_Succ (Lst_Adv) to use in loops where it cannot fail, - Lst_Open can no longer fail. Trim down corresponding code. Reviewed millert@, miod@
Revision 1.18 / (download) - annotate - [select for diffs], Sat Jun 17 14:43:36 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.17: +8 -8 lines
Diff to previous 1.17 (colored)
This removes the few instances of Lst_New left. - replaces Lst_Duplicate with Lst_Clone, which does not allocate storage - split Lst_Concat into Lst_Concat/Lst_ConcatDestroy Thus, all the LstValid checks are gone, since we always invoke list functions with valid pointers. Note that dynamic list allocation accounted for roughly 20% of all calls to malloc. The extraneous calls to malloc left are now mostly in parse.c, which makes some wasteful usage of temporary buffers. With those few patches, the code is sturdier, and easier to maintain. Reviewed by millert@
Revision 1.17 / (download) - annotate - [select for diffs], Sat Jun 17 14:38:18 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.16: +35 -37 lines
Diff to previous 1.16 (colored)
This patch introduces a distinction between Lst_Init (constructor) and Lst_New (allocation + construction) Lst_Destroy (destructor) and Lst_Delete (deallocation + destruction), and uses that to turn most dynamic allocation of lists (Lst pointers) into static structures (LIST). Most of this is mundane, except for allGNs in targ.c, where the code must be checked to verify that Targ_Init is called soon enough. Lst_New is a temporary addition. All lists will soon be static. Reviewed by millert@, like the previous patch.
Revision 1.16 / (download) - annotate - [select for diffs], Sat Jun 10 01:41:05 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.15: +17 -17 lines
Diff to previous 1.15 (colored)
Clean-up patch: use `void *' instead of old-fashioned ClientData/Address.
Revision 1.15 / (download) - annotate - [select for diffs], Sat Jun 10 01:32:23 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.14: +32 -56 lines
Diff to previous 1.14 (colored)
Thus, Lst_ForEach no longer needs returning a status. In fact, it can become a macro based on Lst_ForEachFrom. This also introduces Lst_Every, as a shortcut for the very common case where Lst_ForEach does not need any user data. Finally, make consistent use of a few function typedefs, instead of having explicit void (*)(Lst) arguments all over the place.
Revision 1.14 / (download) - annotate - [select for diffs], Sun Mar 26 16:21:32 2000 UTC (24 years, 1 month ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE,
OPENBSD_2_7
Changes since 1.13: +14 -14 lines
Diff to previous 1.13 (colored)
Remove idiotic, braindead casts T* -> void* They serve no purpose, except hiding potential bugs. In particular, remove (ClientData) cast from macro, showing potentially troublesome use of Hashes to store time_t.
Revision 1.13 / (download) - annotate - [select for diffs], Wed Feb 2 13:47:48 2000 UTC (24 years, 3 months ago) by espie
Branch: MAIN
Changes since 1.12: +11 -11 lines
Diff to previous 1.12 (colored)
Bug-fix: make should behave sensibly when presented with negative times... - let *_MTime return booleans, as that's what they're used for, the time_t is set as a side effect. - use OUT_OF_DATE for a date starting point, set it at the origin of time.
Revision 1.12 / (download) - annotate - [select for diffs], Sat Dec 18 21:58:07 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.11: +8 -8 lines
Diff to previous 1.11 (colored)
Nothing ever checks ReturnStatus on Lst_Insert, Lst_Append, Lst_AtFront, Lst_AtEnd, Lst_Concat, Lst_Remove, Lst_Replace. Don't bother returning one.
Revision 1.11 / (download) - annotate - [select for diffs], Sat Dec 18 21:56:07 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.10: +4 -6 lines
Diff to previous 1.10 (colored)
Lst_DeQueue already checks for empty lists.
Revision 1.10 / (download) - annotate - [select for diffs], Sat Dec 18 21:53:32 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.9: +11 -11 lines
Diff to previous 1.9 (colored)
NIL, NILGNODE, etc, are only glorified NULL. Get rid of them. Get rid of list.h, nothing uses it anyway.
Revision 1.9 / (download) - annotate - [select for diffs], Sat Dec 18 02:11:27 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.8: +3 -3 lines
Diff to previous 1.8 (colored)
make does not use circular lists, get rid of the extra weight.
Revision 1.8 / (download) - annotate - [select for diffs], Mon Dec 6 22:28:44 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.7: +7 -16 lines
Diff to previous 1.7 (colored)
Extra parameter no longer needed, ditch.
Revision 1.7 / (download) - annotate - [select for diffs], Sat Dec 5 00:06:28 1998 UTC (25 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE,
OPENBSD_2_6,
OPENBSD_2_5_BASE,
OPENBSD_2_5
Changes since 1.6: +7 -11 lines
Diff to previous 1.6 (colored)
Modifications from netbsd: - don't interfere with MACHINE/MACHINE_ARCH defines for bootstrap - type clean-up, time_t, and printing `unknown' ints - fix TARGET/MEMBER bug in archive rules - memmove... - cleaner Error handler. - reentrant brk_string - .MAKE env variable - preliminary scaffolding for .NOPATH Other improvements: - efree - shellneed streamlined - display Stop in .CURDIR after an error. - document most features and misfeatures. - add a few OpenBSD notes to the tutorial.
Revision 1.6 / (download) - annotate - [select for diffs], Mon Apr 28 01:52:38 1997 UTC (27 years ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE,
OPENBSD_2_4,
OPENBSD_2_3_BASE,
OPENBSD_2_3,
OPENBSD_2_2_BASE,
OPENBSD_2_2,
OPENBSD_2_1_BASE,
OPENBSD_2_1
Changes since 1.5: +26 -107 lines
Diff to previous 1.5 (colored)
Back out newer .USE code as it caused problems. I've done a "make build" without problems and the problem Theo saw before is gone.
Revision 1.5 / (download) - annotate - [select for diffs], Tue Apr 1 07:28:17 1997 UTC (27 years, 1 month ago) by millert
Branch: MAIN
Changes since 1.4: +116 -33 lines
Diff to previous 1.4 (colored)
Sync with NetBSD (mostly by christos initial substitution/regexp from Der Mouse)
- fix the variable substitution code in make [PR/2748]
1. change s/a/b/ so that it substitutes the first occurance of the
pattern on each word, not only the first word.
2. add flag '1' to the variable substitution so that the substitutions
get performed only once.
***THIS IS AN INCOMPATIBLE CHANGE!***
Unfortunately there was no way to make things consistent without
modifying the current behavior. Fortunately none of our Makefiles
depended on this.
OLD:
VAR = aa1 aa2 aa3 aa4
S/a/b/ = ba1 aa2 aa3 aa4
S/a/b/g = bb1 bb2 bb3 bb4
NEW:
VAR = aa1 aa2 aa3 aa4
S/a/b/ = ba1 ba2 ba3 ba4
S/a/b/1 = ba1 aa2 aa3 aa4
S/a/b/g = bb1 bb2 bb3 bb4
S/a/b/1g = bb1 aa2 aa3 aa4
- add regexp variable substitution via 'C/foo/bar/' [PR/2752]
- add variable quoting via the ${VAR:Q} modifier. This is useful when running
recursive invocations of make(1):
make VAR=${VAR:Q}
will always work... (This may prove useful in the kernel builds...) [PR/2981]
- BSD did not traditionally have <sys/cdefs.h>; use BSD4_4 instead and include
<sys/param.h> to grab it.
- Don't compile the regex code if MAKE_BOOTSTRAP (from gwr)
- Use explicit .c.o rule in Makefile.boot so that the bootstrap process works.
- Use only integral types in procedure arguments. [buf.c buf.h]
- Include <stdlib.h> to get getenv() prototype on SVR4
- if __STDC__ -> ifdef __STDC__ to appease SVR4
- Define const and volatile for non __STDC__
- Implement snprintf() and vsnprintf() for non BSD4_4 systems.
- Make $MACHINE_ARCH settable from the environment.
- Fix .USE directive problems: (reported by cgd)
1. ${.*} variables did not get expanded in dependencies.
2. expanded ${.*} variables in .USE dependencies can cause tree
restructuring; handle it.
3. in compat mode, expand .USE before evaluating the list of targets,
instead of doing .USE expansions on demand, because they can cause
tree restructuring.
- Add a .MADE directive to indicated that the children of a target are
up-to-date, even when they are not. This is to simulate our current
make install behavior with proper dependencies.
- Fix problems in the RE substitution error handling.
- Locate all the children of a node marked as MADE.
- Do not compile-in ${MACHINE} (as per NetBSD PR#3386)
- Disable globbing for targets/dependencies when POSIX is defined.
- Fix globbing so that patterns that don't have a matching number of [] or {}
don't get expanded. (before the [ case got expanded to nothing!) This is
disabled.
- Make sure that the children of nodes that are marked .MADE, are marked
UPTODATE and their timestamps are consistent.
- Don't disable wildcards completely; they are used by other Makefiles.
Revision 1.4 / (download) - annotate - [select for diffs], Sat Nov 30 21:09:00 1996 UTC (27 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.3: +25 -26 lines
Diff to previous 1.3 (colored)
Sync with NetBSD: - Merge in FreeBSD and Lite2 changes. - Fix bug where a non-archive target with a .a suffix would always be considered to be out of date, since it does not have a TOC. - Fix NetBSD PR #2930: declare missing variable.
Revision 1.3 / (download) - annotate - [select for diffs], Mon Sep 2 16:04:14 1996 UTC (27 years, 8 months ago) by briggs
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE,
OPENBSD_2_0
Changes since 1.2: +12 -5 lines
Diff to previous 1.2 (colored)
Sync up with NetBSD:
(christos)
Fix bug reported by Greg Hudson where leaf (source only) nodes were
referenced only by their basename and not by their full pathname. This
breaks when .PATH or MAKEOBJDIR are used. There might be Makefiles
around that try to work around this bug by prepending ${.CURDIR} to
the sources, and they should be found and fixed. Also a lot of the gunk
in suff.c that was attempting to work around the same problem could be
removed.
(christos)
- Move -D flags from Makefile to config.h and explain what they do. Add
-Wall -Wno-unused to CFLAGS. Add new define SYSVVARSUB to enable SysV
style variable substitutions and enable them.
- Add SunOS style command substitutions via SUNSHCMD
- Fix core dump with '{variable = value'
(christos)
Fix bug where make will always exit with 0, even when one or more
parallel jobs failed. (Only affects parallel make code)
(christos)
Protect __P from being multiply defined (for systems that already
define it)
(christos) Add strdup() since ultrix is missing it.
From Larry Schwimmer <rosebud@cyclone.Stanford.EDU>
(christos) Add estrdup(), a checked version of strdup and use it.
(christos) Recognize SVR4 style long filename entries in archives.
(thorpej) Tidy up some RCS ids a bit.
Revision 1.2 / (download) - annotate - [select for diffs], Wed Mar 27 19:32:38 1996 UTC (28 years, 1 month ago) by niklas
Branch: MAIN
Changes since 1.1: +7 -3 lines
Diff to previous 1.1 (colored)
From NetBSD: merge of 960317
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:45:43 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)
initial import of NetBSD tree
Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:45:43 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN
Initial revision