Update env.py files to append to EXTRA_BUILD_PATH

All env.py files used to just overwrite EXTRA_BUILD_PATH, but this does not
allow a user to specify EXTRA_BUILD_PATH from the commandline (or
activate script) and then have it stick when those env.py files are run.
This change adds a python module which makes setting these build path
variables more straight forward, and converts all the env.py files to
use it. Now EXTRA_BUILD_PATH is appended to instead of overwritten.

The added python module is: redo/environments/modify_build_path.py

Author: dinkelk

doc/architecture_description_document/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + os.path.join(this_dir, ".." + os.sep + "example_architecture")
+modify_build_path.add_to_build_path([this_dir, os.path.join(this_dir, ".." + os.sep + "example_architecture")])

doc/example_architecture/active_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/array_register_set/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir + os.sep + ".."])

doc/example_architecture/array_representation/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/background_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/command_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/data_dependency_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/data_product_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/doc/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/enum_assertion/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/enum_m/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/enum_py/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/enum_representation/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/env.py

@@ -1,8 +1,9 @@
+from environments import modify_build_path
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-# os.environ["BUILD_PATH"] = this_dir
+# modify_build_path.set_build_path(this_dir)

doc/example_architecture/event_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/doc/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/test2/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/test3/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/test4/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/test5/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/example_component/tester/env.py

@@ -1,9 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-# os.environ["BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/fault_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/hello_world/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/nested_record/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.sep + ".."
+modify_build_path.add_to_build_path(this_dir + os.sep + "..")

doc/example_architecture/oo_package/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/packet_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/parameter_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/queued_component/test/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/queued_component/test2/env.py

@@ -1,9 +1,9 @@
-from environments import test  # noqa: F401
+from environments import test, modify_build_path  # noqa: F401
 import os
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/record_assertion/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/record_conversion/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.sep + ".."
+modify_build_path.add_to_build_path(this_dir + os.sep + "..")

doc/example_architecture/record_m/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])

doc/example_architecture/record_py/env.py

@@ -1,8 +1,9 @@
 import os
+from environments import modify_build_path
 
 this_dir = os.path.dirname(os.path.realpath(__file__))
 # Overwrite the normal build path mechanism and just use
 # this directory as the build path. This prevents any
 # name conflicts we might get from using the regular
 # ".all_path".
-os.environ["EXTRA_BUILD_PATH"] = this_dir + os.pathsep + this_dir + os.sep + ".."
+modify_build_path.add_to_build_path([this_dir, this_dir + os.sep + ".."])