Repository support (first cut).

5 files changed, 708 insertions, 8 deletions

diff --git a/test/Repository/.aeignore b/test/Repository/.aeignore
new file mode 100644
index 0000000..877ac53
--- /dev/null
+++ b/test/Repository/.aeignore
@@ -0,0 +1,4 @@
+*,D
+.*.swp
+.consign
+.sconsign
diff --git a/test/Repository/Program.py b/test/Repository/Program.py
new file mode 100644
index 0000000..854ede2
--- /dev/null
+++ b/test/Repository/Program.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import sys
+import TestSCons
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+test.subdir('repository', 'work')
+
+repository = test.workpath('repository')
+repository_foo_c = test.workpath('repository', 'foo.c')
+work_foo = test.workpath('work', 'foo' + _exe)
+work_foo_c = test.workpath('work', 'foo.c')
+
+test.write(['work', 'SConstruct'], r"""
+Repository('%s')
+env = Environment()
+env.Program(target= 'foo', source = Split('aaa.c bbb.c foo.c'))
+""" % repository)
+
+test.write(['repository', 'aaa.c'], r"""
+void
+aaa(void)
+{
+	printf("repository/aaa.c\n");
+}
+""")
+
+test.write(['repository', 'bbb.c'], r"""
+void
+bbb(void)
+{
+	printf("repository/bbb.c\n");
+}
+""")
+
+test.write(['repository', 'foo.c'], r"""
+extern void aaa(void);
+extern void bbb(void);
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	aaa();
+	bbb();
+	printf("repository/foo.c\n");
+	exit (0);
+}
+""")
+
+# Make the entire repository non-writable, so we'll detect
+# if we try to write into it accidentally.
+test.writable('repository', 0)
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout = """repository/aaa.c
+repository/bbb.c
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.write(['work', 'bbb.c'], r"""
+void
+bbb(void)
+{
+	printf("work/bbb.c\n");
+}
+""")
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout = """repository/aaa.c
+work/bbb.c
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.write(['work', 'aaa.c'], r"""
+void
+aaa(void)
+{
+	printf("work/aaa.c\n");
+}
+""")
+
+test.write(['work', 'foo.c'], r"""
+extern void aaa(void);
+extern void bbb(void);
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	aaa();
+	bbb();
+	printf("work/foo.c\n");
+	exit (0);
+}
+""")
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout = """work/aaa.c
+work/bbb.c
+work/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.unlink(['work', 'aaa.c'])
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout = """repository/aaa.c
+work/bbb.c
+work/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.unlink(['work', 'bbb.c'])
+test.unlink(['work', 'foo.c'])
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout = """repository/aaa.c
+repository/bbb.c
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.pass_test()
diff --git a/test/Repository/include.py b/test/Repository/include.py
new file mode 100644
index 0000000..1538e1a
--- /dev/null
+++ b/test/Repository/include.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import sys
+import TestSCons
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+test.subdir('repository', 'work')
+
+repository = test.workpath('repository')
+work_foo = test.workpath('work', 'foo' + _exe)
+work_foo_h = test.workpath('work', 'foo.h')
+
+test.write(['work', 'SConstruct'], """
+Repository('%s')
+env = Environment(CPPPATH = ['.'])
+env.Program(target = 'foo', source = 'foo.c')
+""" % repository)
+
+test.write(['repository', 'foo.h'], r"""
+#define	STRING1	"repository/foo.h"
+#include <bar.h>
+""")
+
+test.write(['repository', 'bar.h'], r"""
+#define	STRING2	"repository/bar.h"
+""")
+
+test.write(['repository', 'foo.c'], r"""
+#include <foo.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("%s\n", STRING1);
+	printf("%s\n", STRING2);
+	printf("repository/foo.c\n");
+	exit (0);
+}
+""")
+
+# Make the entire repository non-writable, so we'll detect
+# if we try to write into it accidentally.
+test.writable('repository', 0)
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""repository/foo.h
+repository/bar.h
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.write(['work', 'foo.h'], r"""
+#define STRING1	"work/foo.h"
+#include <bar.h>
+""")
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""work/foo.h
+repository/bar.h
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.write(['work', 'foo.c'], r"""
+#include <foo.h>
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("%s\n", STRING1);
+	printf("%s\n", STRING2);
+	printf("work/foo.c\n");
+	exit (0);
+}
+""")
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""work/foo.h
+repository/bar.h
+work/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.write(['work', 'bar.h'], r"""
+#define STRING2	"work/bar.h"
+""")
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""work/foo.h
+work/bar.h
+work/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.writable('repository', 1)
+test.unlink(['work', 'foo.h'])
+test.writable('repository', 0)
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""repository/foo.h
+work/bar.h
+work/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.writable('repository', 1)
+test.unlink(['work', 'foo.c'])
+test.writable('repository', 0)
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""repository/foo.h
+work/bar.h
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.writable('repository', 1)
+test.unlink(['work', 'bar.h'])
+test.writable('repository', 0)
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout =
+"""repository/foo.h
+repository/bar.h
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+#
+test.pass_test()
diff --git a/test/Repository/no-repository.py b/test/Repository/no-repository.py
new file mode 100644
index 0000000..8659c00
--- /dev/null
+++ b/test/Repository/no-repository.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = sys.executable
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+test = TestSCons.TestSCons()
+
+test.subdir('work')
+
+no_repository = test.workpath('no_repository')
+work_foo = test.workpath('work', 'foo' + _exe)
+
+test.write(['work', 'SConstruct'], """
+Repository('%s')
+env = Environment()
+env.Program(target = 'foo', source = Split('aaa.c bbb.c foo.c'))
+""" % no_repository)
+
+test.write(['work', 'aaa.c'], r"""
+void
+aaa(void)
+{
+	printf("work/aaa.c\n");
+}
+""")
+
+test.write(['work', 'bbb.c'], r"""
+void
+bbb(void)
+{
+	printf("work/bbb.c\n");
+}
+""")
+
+test.write(['work', 'foo.c'], r"""
+extern void aaa(void);
+extern void bbb(void);
+int
+main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	aaa();
+	bbb();
+	printf("work/foo.c\n");
+	exit (0);
+}
+""")
+
+test.run(chdir = 'work', arguments = '.')
+
+test.run(program = work_foo, stdout = """work/aaa.c
+work/bbb.c
+work/foo.c
+""")
+
+test.up_to_date(chdir = 'work', arguments = '.')
+
+test.pass_test()
diff --git a/test/option--Y.py b/test/option--Y.py
index b201bbd..c675e9b 100644
--- a/test/option--Y.py
+++ b/test/option--Y.py
@@ -24,19 +24,269 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestSCons
-import string
 import sys
+import TestSCons
+
+if sys.platform == 'win32':
+    _exe = '.exe'
+else:
+    _exe = ''
+
+
 
 test = TestSCons.TestSCons()
 
-test.write('SConstruct', "")
+test.subdir('repository', 'work1')
+
+repository = test.workpath('repository')
+repository_foo_c = test.workpath('repository', 'foo.c')
+work1_foo = test.workpath('work1', 'foo' + _exe)
+work1_foo_c = test.workpath('work1', 'foo.c')
+
+test.write(['repository', 'SConstruct'], r"""
+env = Environment()
+env.Program(target= 'foo', source = Split('aaa.c bbb.c foo.c'))
+""")
+
+test.write(['repository', 'aaa.c'], r"""
+void
+aaa(void)
+{
+      printf("repository/aaa.c\n");
+}
+""")
+
+test.write(['repository', 'bbb.c'], r"""
+void
+bbb(void)
+{
+      printf("repository/bbb.c\n");
+}
+""")
+
+test.write(['repository', 'foo.c'], r"""
+extern void aaa(void);
+extern void bbb(void);
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      aaa();
+      bbb();
+      printf("repository/foo.c\n");
+      exit (0);
+}
+""")
+
+opts = '-Y ' + repository
+
+# Make the entire repository non-writable, so we'll detect
+# if we try to write into it accidentally.
+test.writable('repository', 0)
+
+test.run(chdir = 'work1', options = opts, arguments = '.')
+
+test.run(program = work1_foo, stdout = """repository/aaa.c
+repository/bbb.c
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work1', options = opts, arguments = '.')
+
+#
+test.write(['work1', 'bbb.c'], r"""
+void
+bbb(void)
+{
+      printf("work1/bbb.c\n");
+}
+""")
+
+test.run(chdir = 'work1', options = opts, arguments = '.')
+
+test.run(program = work1_foo, stdout = """repository/aaa.c
+work1/bbb.c
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work1', options = opts, arguments = '.')
+
+#
+test.write(['work1', 'aaa.c'], r"""
+void
+aaa(void)
+{
+      printf("work1/aaa.c\n");
+}
+""")
+
+test.write(['work1', 'foo.c'], r"""
+extern void aaa(void);
+extern void bbb(void);
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      aaa();
+      bbb();
+      printf("work1/foo.c\n");
+      exit (0);
+}
+""")
+
+test.run(chdir = 'work1', options = opts, arguments = '.')
+
+test.run(program = work1_foo, stdout = """work1/aaa.c
+work1/bbb.c
+work1/foo.c
+""")
+
+test.up_to_date(chdir = 'work1', options = opts, arguments = '.')
+
+#
+test.unlink(['work1', 'bbb.c'])
+test.unlink(['work1', 'foo.c'])
+
+test.run(chdir = 'work1', options = opts, arguments = '.')
+
+test.run(program = work1_foo, stdout = """work1/aaa.c
+repository/bbb.c
+repository/foo.c
+""")
+
+test.up_to_date(chdir = 'work1', options = opts, arguments = '.')
+
+
+
+#
+test.subdir('r.NEW', 'r.OLD', 'work2')
+
+workpath_r_NEW = test.workpath('r.NEW')
+workpath_r_OLD = test.workpath('r.OLD')
+work2_foo = test.workpath('work2', 'foo' + _exe)
+
+SConstruct = """
+env = Environment()
+env.Program(target = 'foo', source = 'foo.c')
+"""
+
+test.write(['r.OLD', 'SConstruct'], SConstruct)
 
-test.run(arguments = '-Y foo',
-	 stderr = "Warning:  the -Y option is not yet implemented\n")
+test.write(['r.NEW', 'SConstruct'], SConstruct)
 
-test.run(arguments = '--repository=foo',
-	 stderr = "Warning:  the --repository option is not yet implemented\n")
+test.write(['r.OLD', 'foo.c'], r"""
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      printf("r.OLD/foo.c\n");
+      exit (0);
+}
+""")
 
+opts = '-Y %s -Y %s' % (workpath_r_NEW, workpath_r_OLD)
+
+# Make the repositories non-writable, so we'll detect
+# if we try to write into them accidentally.
+test.writable('r.OLD', 0)
+test.writable('r.NEW', 0)
+
+test.run(chdir = 'work2', options = opts, arguments = '.')
+
+test.run(program = work2_foo, stdout = "r.OLD/foo.c\n")
+
+test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
+
+#
+test.writable('r.NEW', 1)
+
+test.write(['r.NEW', 'foo.c'], r"""
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      printf("r.NEW/foo.c\n");
+      exit (0);
+}
+""")
+
+test.writable('r.NEW', 0)
+
+test.run(chdir = 'work2', options = opts, arguments = '.')
+
+test.run(program = work2_foo, stdout = "r.NEW/foo.c\n")
+
+test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
+
+#
+test.write(['work2', 'foo.c'], r"""
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      printf("work2/foo.c\n");
+      exit (0);
+}
+""")
+
+test.run(chdir = 'work2', options = opts, arguments = '.')
+
+test.run(program = work2_foo, stdout = "work2/foo.c\n")
+
+test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
+
+#
+test.writable('r.OLD', 1)
+test.writable('r.NEW', 1)
+
+test.write(['r.OLD', 'foo.c'], r"""
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      printf("r.OLD/foo.c 2\n");
+      exit (0);
+}
+""")
+
+test.write(['r.NEW', 'foo.c'], r"""
+int
+main(int argc, char *argv[])
+{
+      argv[argc++] = "--";
+      printf("r.NEW/foo.c 2\n");
+      exit (0);
+}
+""")
+
+test.writable('r.OLD', 0)
+test.writable('r.NEW', 0)
+
+test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
+
+#
+test.unlink(['work2', 'foo.c'])
+
+test.run(chdir = 'work2', options = opts, arguments = '.')
+
+test.run(program = work2_foo, stdout = "r.NEW/foo.c 2\n")
+
+test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
+
+#
+test.writable('r.NEW', 1)
+
+test.unlink(['r.NEW', 'foo.c'])
+
+test.writable('r.NEW', 0)
+
+test.run(chdir = 'work2', options = opts, arguments = '.')
+
+test.run(program = work2_foo, stdout = "r.OLD/foo.c 2\n")
+
+test.up_to_date(chdir = 'work2', options = opts, arguments = '.')
+
+
+
+#
 test.pass_test()
-