Commit 6c4d8f83 authored by Russ Cox's avatar Russ Cox

gobuild:

	recognize "// package foo" in non-go files
	recognize "gobuild: ignore" to exclude from build

R=r
DELTA=10  (7 added, 2 deleted, 1 changed)
OCL=19878
CL=19905
parent 0e198da6
...@@ -206,12 +206,17 @@ getpkg(char *file) ...@@ -206,12 +206,17 @@ getpkg(char *file)
char *p, *q; char *p, *q;
int i; int i;
if(!suffix(file, ".go"))
return nil;
if((b = Bopen(file, OREAD)) == nil) if((b = Bopen(file, OREAD)) == nil)
sysfatal("open %s: %r", file); sysfatal("open %s: %r", file);
while((p = Brdline(b, '\n')) != nil) { while((p = Brdline(b, '\n')) != nil) {
p[Blinelen(b)-1] = '\0'; p[Blinelen(b)-1] = '\0';
if(!suffix(file, ".go")) {
if(*p != '/' || *(p+1) != '/')
continue;
p += 2;
}
if(strstr(p, "gobuild: ignore"))
return "main";
while(*p == ' ' || *p == '\t') while(*p == ' ' || *p == '\t')
p++; p++;
if(strncmp(p, "package", 7) == 0 && (p[7] == ' ' || p[7] == '\t')) { if(strncmp(p, "package", 7) == 0 && (p[7] == ' ' || p[7] == '\t')) {
...@@ -487,7 +492,7 @@ main(int argc, char **argv) ...@@ -487,7 +492,7 @@ main(int argc, char **argv)
njob = 0; njob = 0;
job = emalloc(argc*sizeof job[0]); job = emalloc(argc*sizeof job[0]);
for(i=0; i<argc; i++) { for(i=0; i<argc; i++) {
if(suffix(argv[i], "_test.go") != nil) if(suffix(argv[i], "_test.go"))
continue; continue;
job[njob].name = argv[i]; job[njob].name = argv[i];
job[njob].pass = -1; job[njob].pass = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment