![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / make
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.36 / (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.35: +1 -2 lines
Diff to previous 1.35 (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.35 / (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_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,
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,
OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (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.34 / (download) - annotate - [select for diffs], Sat Dec 5 18:31:17 2015 UTC (8 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.33: +7 -3 lines
Diff to previous 1.33 (colored)
yet another feof check, just to be sure.
Revision 1.33 / (download) - annotate - [select for diffs], Mon Nov 3 12:48:37 2014 UTC (9 years, 6 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.32: +8 -14 lines
Diff to previous 1.32 (colored)
introspection feature: ${MAKEFILE_LIST} contains the list of makefiles
parsed.
name stolen from gmake, from a suggestion from guenther@, to avoid
gratuitous confusin.
okay guenther@, millert@
Revision 1.32 / (download) - annotate - [select for diffs], Wed Nov 7 14:18:41 2012 UTC (11 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5,
OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.31: +1 -2 lines
Diff to previous 1.31 (colored)
say goodbye to killing trailing spaces. this was yet another weirdness in our make that isn't shared by other makes, and that isn't part of any standard. This means end-of-line spaces in variables ARE significant (spaces around the equal sign still aren't). okay sthen@, "sounds fine" deraadt@
Revision 1.31 / (download) - annotate - [select for diffs], Thu Oct 18 17:54:43 2012 UTC (11 years, 7 months ago) by espie
Branch: MAIN
Changes since 1.30: +5 -9 lines
Diff to previous 1.30 (colored)
numerous error message fixes: - do ^C checking differently: don't record sent signals, but when jobs die, recheck whether we received/have pending a INT/QUIT/TERM/HUP signal. Then don't display our process group "normally", instead group together everything dying by signal/shell dying by signal (just give the target names). - make certain we always handle signals before dying from "other conditions" - have the parser messages look more like normal messages - remove double error messages from some parser errors - make sure unclosed variables ARE errors when some modifiers are present - keep track of the base directory we're run from, so that submakes can get shortened directories... - make sure the whole error message including silent command fits into a reasonable length. okay millert@
Revision 1.30 / (download) - annotate - [select for diffs], Tue Oct 2 10:29:31 2012 UTC (11 years, 7 months ago) by espie
Branch: MAIN
Changes since 1.29: +18 -27 lines
Diff to previous 1.29 (colored)
more changes, discussed and tested by various people. - put back some job control, turns out it's necessary when we don't run a shell. - zap old #ifdef CLEANUP code... probably doesn't even compile. - kill most of the OP_LIB code. Just keep a wee little bit for compatibility (deprecated .LIBS and .INCLUDES, warns for weird dependencies instead of erroring out). - much improved debugging and -p output: sort variables, targets, rules, output stuff in a nicer format mimicing input. - better error message when no command is found, explain where the target comes from. - sort final error list by file. - show system files in errors as <bsd.prog.mk> - reincorporate random delay, that was dropped - optimize siginfo output by not regenerating the whole string each time. - finish zapping old LocationInfo field that's no longer used.
Revision 1.29 / (download) - annotate - [select for diffs], Fri Sep 21 07:55:20 2012 UTC (11 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.28: +22 -2 lines
Diff to previous 1.28 (colored)
major overhaul of the way make handle jobs, inspired by dpb: instead of forking a "job" per target, and having that job further fork separate commands, have make maintain a list of jobs, indexed by pid of currently running commands, and handle process termination continuation-style. This has lots of benefits: - make is responsible for most printing, so we no longer need pipes nor job control: make -j jobs see the tty. - no more special-casing for jobs that don't really execute anything. - unify code for make -jn and make -B, including signal handlers and job waiting. So make -n, make -q, +cmd now run commands in the same way in all cases. - unified more accurate error-reporting, as make knows precisely which command failed. Commands are tagged with their lines, and we display failing commands in silent mode. - fine-grained "expensive" command handling (recursion limiter). Do it per-command instead of per-target. Moreover, signal response is now simpler, as we just block the signals in a small critical sections, test for events, and sigpause (thanks a lot to guenther@ and millert@), so running make is now almost always paused without any busy-waiting. Thanks to everyone who tested and gave input.
Revision 1.28 / (download) - annotate - [select for diffs], Sat Aug 25 08:12:56 2012 UTC (11 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.27: +16 -3 lines
Diff to previous 1.27 (colored)
- make wrong variable specs (unterminated) parse errors. - add info to be able to pinpoint parse errors at runtime. - let job runners abort when a parse error happens while expanding a variable during execution - fix an infinite loop when compiling without FEATURE_RECVARS. okay millert@, krw@ the very few errors found out by this (less than 10 over src/X/ports) fixed trivially beforehand, as requested by deraadt@
Revision 1.27 / (download) - annotate - [select for diffs], Thu Mar 22 13:50:30 2012 UTC (12 years, 2 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2
Changes since 1.26: +3 -1 lines
Diff to previous 1.26 (colored)
tweak: consistent include guards, no change in generated code.
Revision 1.26 / (download) - annotate - [select for diffs], Thu Mar 22 13:47:12 2012 UTC (12 years, 2 months ago) by espie
Branch: MAIN
Changes since 1.25: +36 -25 lines
Diff to previous 1.25 (colored)
minor cleanup: error messages include lineno and fileno together, so recognize that and create a struct Location_ for it. mostly from Jonathan Calmels, a few nits from me. okay otto@
Revision 1.25 / (download) - annotate - [select for diffs], Sun Dec 26 13:09:22 2010 UTC (13 years, 4 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 (colored)
nits with current being NULL or not. okay miod@
Revision 1.24 / (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_4_8_BASE,
OPENBSD_4_8
Changes since 1.23: +1 -2 lines
Diff to previous 1.23 (colored)
Correct $OpenBSD$ stuff
Revision 1.23 / (download) - annotate - [select for diffs], Thu Jul 15 10:41:11 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)
whitespace
Revision 1.22 / (download) - annotate - [select for diffs], Sat Sep 22 10:43:38 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.21: +89 -86 lines
Diff to previous 1.21 (colored)
rename functions and data structures for clarity
Revision 1.21 / (download) - annotate - [select for diffs], Sat Sep 22 10:23:02 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.20: +224 -220 lines
Diff to previous 1.20 (colored)
reindent
Revision 1.20 / (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.19: +5 -5 lines
Diff to previous 1.19 (colored)
kill extra spaces at end of line
Revision 1.19 / (download) - annotate - [select for diffs], Thu May 17 03:37:31 2007 UTC (17 years ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.18: +1 -2 lines
Diff to previous 1.18 (colored)
Remove extra return statement, from tbert from lint. OK jaredy@ and moritz@
Revision 1.18 / (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_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.17: +22 -39 lines
Diff to previous 1.17 (colored)
ISO function declarations, trim a few comments, rename a few variables to more explicit/more consistent names. okay otto@
Revision 1.17 / (download) - annotate - [select for diffs], Sun Dec 29 17:29:35 2002 UTC (21 years, 4 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5,
OPENBSD_3_4_BASE,
OPENBSD_3_4,
OPENBSD_3_3_BASE,
OPENBSD_3_3
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 (colored)
check -DCLEANUP compilation
Revision 1.16 / (download) - annotate - [select for diffs], Sun Nov 11 12:35:02 2001 UTC (22 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE,
OPENBSD_3_2,
OPENBSD_3_1_BASE,
OPENBSD_3_1
Changes since 1.15: +2 -2 lines
Diff to previous 1.15 (colored)
Fixed version... don't see how this could work on i386, since it didn't initialize create in main.c.
Revision 1.15 / (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.14: +1 -1 lines
Diff to previous 1.14 (colored)
undo changes that crash on (at least) the alpha
Revision 1.14 / (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.13: +2 -2 lines
Diff to previous 1.13 (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.13 / (download) - annotate - [select for diffs], Wed Jul 18 14:49:13 2001 UTC (22 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE,
OPENBSD_3_0
Changes since 1.12: +3 -3 lines
Diff to previous 1.12 (colored)
Avoid dumping core when reporting open conditionals. Turns out that current is NULL when Parse_Fatal is called in this case, so just do something sensible in error reporting functions when current is NULL...
Revision 1.12 / (download) - annotate - [select for diffs], Wed Jul 11 12:59:43 2001 UTC (22 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)
Typo in comment
Revision 1.11 / (download) - annotate - [select for diffs], Tue May 29 12:53:41 2001 UTC (22 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.10: +2 -1 lines
Diff to previous 1.10 (colored)
Take includes out of lst.h, re-add what's needed to separate files. Removes remaining lint stuff from lst.lib.
Revision 1.10 / (download) - annotate - [select for diffs], Tue May 29 12:17:05 2001 UTC (22 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.9: +2 -1 lines
Diff to previous 1.9 (colored)
Blech! gcc is a stupid program. Compiling with -fno-builtin shows lots of missing function declarations.
Revision 1.9 / (download) - annotate - [select for diffs], Wed May 23 12:34:45 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.8: +99 -165 lines
Diff to previous 1.8 (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.8 / (download) - annotate - [select for diffs], Mon May 14 12:55:48 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)
Ensure IFile str is always intialized, so that we can free it without problems. Bug found by wilfried@.
Revision 1.7 / (download) - annotate - [select for diffs], Mon May 7 22:57:19 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)
avoid closing the same file twice. parse module assumes ownership of file handles it's passed to. (this is apparently harmless on BSDs, but is still a bug).
Revision 1.6 / (download) - annotate - [select for diffs], Thu May 3 13:41:07 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.5: +232 -318 lines
Diff to previous 1.5 (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.5 / (download) - annotate - [select for diffs], Fri Nov 24 14:27:19 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE,
OPENBSD_2_9
Changes since 1.4: +4 -2 lines
Diff to previous 1.4 (colored)
Clean-ups: * Buf_Destroy can be a macro * X_ instead of _X for struct names, to avoid infringing on the system's namespace. * better wildcard detection heuristics * fix #ifdef CLEANUP code * a few comments
Revision 1.4 / (download) - annotate - [select for diffs], Thu Sep 14 13:32:07 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE,
OPENBSD_2_8
Changes since 1.3: +1 -3 lines
Diff to previous 1.3 (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.3 / (download) - annotate - [select for diffs], Mon Jul 17 23:54:26 2000 UTC (23 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)
FALLTHRU -> FALLTHROUGH, requested by miod@ and style(9)
Revision 1.2 / (download) - annotate - [select for diffs], Fri Jun 23 16:40:50 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.1: +332 -1 lines
Diff to previous 1.1 (colored)
This is complementary to the previous patch. There is no code change in this patch, we just move the remaining `lowparse' functions to the right file, and adjust the interface file accordingly. Reviewed by miod@
Revision 1.1 / (download) - annotate - [select for diffs], Fri Jun 23 16:39:45 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
This patch is worth a lot, speed-wise. This does introduce a proper stack of IFiles to handle included files: instead of having the current file be a special case, it's also an IFile. The corresponding code is slightly unobfuscated, removing the error-prone ParseEOF function, freeing the filename systematically (thus, main.c needs to strdup stdin), and merging both include functions lookup into one. The speed gain comes from changing the IFile structure to merge with fgetln seamlessly. The low-level parse code is mostly moved to a new file, lowparse.c, to make things easier to read (see next patch as well). Accordingly, util.c gains a fgetln. Note the interaction between Parse_File, Dir_FindFile, and ReadMakefile in main.c. This patch closes a subtle memory hole (only the Makefile names, so rather small). Reviewed by miod@.