Refactored VS 2003-2008

Author: burgerbecky

docs/constants.rst

@@ -140,22 +140,22 @@ python.BUILD_LIST
 ^^^^^^^^^^^^^^^^^^
 .. doxygenvariable:: makeprojects::python::BUILD_LIST
 
-buildme.CODEWARRIOR_ERRORS
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenvariable:: makeprojects::buildme::CODEWARRIOR_ERRORS
+codewarrior.CODEWARRIOR_ERRORS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenvariable:: makeprojects::codewarrior::CODEWARRIOR_ERRORS
 
-buildme._CW_SUPPORTED_LINKERS
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenvariable:: makeprojects::buildme::_CW_SUPPORTED_LINKERS
+codewarrior._CW_SUPPORTED_LINKERS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenvariable:: makeprojects::codewarrior::_CW_SUPPORTED_LINKERS
 
-buildme._VS_VERSION_YEARS
-^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenvariable:: makeprojects::buildme::_VS_VERSION_YEARS
+visual_studio._VS_VERSION_YEARS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenvariable:: makeprojects::visual_studio::_VS_VERSION_YEARS
 
-buildme._VS_OLD_VERSION_YEARS
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenvariable:: makeprojects::buildme::_VS_OLD_VERSION_YEARS
+visual_studio._VS_OLD_VERSION_YEARS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenvariable:: makeprojects::visual_studio::_VS_OLD_VERSION_YEARS
 
-buildme._VS_SDK_ENV_VARIABLE
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenvariable:: makeprojects::buildme::_VS_SDK_ENV_VARIABLE
+visual_studio._VS_SDK_ENV_VARIABLE
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenvariable:: makeprojects::visual_studio::_VS_SDK_ENV_VARIABLE

docs/functions.rst

@@ -23,10 +23,6 @@ makeprojects.new_solution
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::new_solution
 
-makeprojects.new_project
-^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::new_project
-
 makeprojects.new_configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::new_configuration
@@ -45,64 +41,44 @@ config.find_default_build_rules
 Clean
 -----
 
-cleanme.dispatch
-^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::cleanme::dispatch
-
-cleanme.process
-^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::cleanme::process
+cleanme.create_parser
+^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::cleanme::create_parser
 
-cleanme.main
-^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::cleanme::main
+cleanme.add_clean_rules
+^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::cleanme::add_clean_rules
 
-Build
------
+cleanme.add_project
+^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::cleanme::add_project
 
-buildme.build_rez_script
+cleanme.process_projects
 ^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_rez_script
-
-buildme.build_slicer_script
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_slicer_script
+.. doxygenfunction:: makeprojects::cleanme::process_projects
 
-buildme.build_doxygen
+cleanme.process_files
 ^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_doxygen
-
-buildme.build_makefile
-^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_makefile
-
-buildme.parse_sln_file
-^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::parse_sln_file
-
-buildme.parse_mcp_file
-^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::parse_mcp_file
+.. doxygenfunction:: makeprojects::cleanme::process_files
 
-buildme.build_codewarrior
-^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_codewarrior
+cleanme.process_directories
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::cleanme::process_directories
 
-buildme.parse_xcodeproj_file
+cleanme.process_dependencies
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::parse_xcodeproj_file
+.. doxygenfunction:: makeprojects::cleanme::process_dependencies
 
-buildme.build_xcode
-^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_xcode
+cleanme.main
+^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::cleanme::main
 
-buildme.parse_codeblocks_file
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::parse_codeblocks_file
+Build
+-----
 
-buildme.build_codeblocks
-^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::build_codeblocks
+buildme.create_parser
+^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::buildme::create_parser
 
 buildme.add_build_rules
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -112,13 +88,21 @@ buildme.add_project
 ^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::buildme::add_project
 
-buildme.get_projects
-^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::get_projects
+buildme.process_projects
+^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::buildme::process_projects
 
-buildme.process
-^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::buildme::process
+buildme.process_files
+^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::buildme::process_files
+
+buildme.process_directories
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::buildme::process_directories
+
+buildme.process_dependencies
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::buildme::process_dependencies
 
 buildme.main
 ^^^^^^^^^^^^

makeprojects/__init__.py

@@ -78,7 +78,7 @@
 ########################################
 
 # Current version of the library as a numeric tuple
-__numversion__ = (1, 0, 1)
+__numversion__ = (1, 1, 0)
 
 # Current version of the library
 __version__ = ".".join([str(num) for num in __numversion__])

makeprojects/validators.py

@@ -500,26 +500,23 @@ class VSIntegerProperty(object):
 
     Attributes:
         name: Name of the validator
-        switch: Value if enabled
         value: Integer value
     """
 
     value = IntegerProperty("_value")
 
-    def __init__(self, name, fallback=None, switch=None):
+    def __init__(self, name, fallback=None):
         """
         Initialize the default values.
         Set the name (Required), value and compiler switch.
 
         Args:
             name: Name of the validator
             fallback: Default value, ``None`` is acceptable
-            switch: Switch for integer found
         """
 
         # Init the defaults
         self.name = name
-        self.switch = switch
         self.value = fallback
 
     ########################################
@@ -538,6 +535,37 @@ def get_value(self):
 
     ########################################
 
+    @staticmethod
+    def vs_validate(key, configuration, fallback=None, prefix=None):
+        """
+        Check if there is an override with a vs_ prefix.
+        @details
+        Check if the configuration has a key of \"vs_\" + prefix + key in the
+        configuration and if not found or None, use the fallback as is.
+
+        Args:
+            key: Name of the XML attribute key
+            configuration: configuration to scan for an override
+            fallback: Value to use in case there is no override.
+            prefix: String to insert after "vs_"
+
+        Returns:
+            VSIntegerProperty instance
+        """
+
+        # Insert the optional prefix
+        new_key = "vs_"
+        if prefix:
+            new_key = new_key + prefix
+        new_key = new_key + key
+
+        value = configuration.get_chained_value(new_key)
+        if value is None:
+            return VSIntegerProperty(key, fallback)
+        return VSIntegerProperty(key, value)
+
+    ########################################
+
     def __repr__(self):
         """
         Convert to string.