Merged Visual Studio generators

Author: burgerbecky

docs/functions.rst

@@ -315,18 +315,6 @@ visual_studio.test
 ^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::visual_studio::test
 
-visual_studio.get_uuid
-^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::visual_studio::get_uuid
-
-visual_studio.create_copy_file_script
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::visual_studio::create_copy_file_script
-
-visual_studio.create_deploy_script
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-.. doxygenfunction:: makeprojects::visual_studio::create_deploy_script
-
 visual_studio.do_filter_tree
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::visual_studio::do_filter_tree
@@ -335,6 +323,10 @@ visual_studio.generate
 ^^^^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::visual_studio::generate
 
+visual_studio_utils.get_uuid
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::visual_studio_utils::get_uuid
+
 visual_studio_utils.get_path_property
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::visual_studio_utils::get_path_property
@@ -363,6 +355,14 @@ visual_studio_utils.generate_solution_file
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. doxygenfunction:: makeprojects::visual_studio_utils::generate_solution_file
 
+visual_studio_utils.create_copy_file_script
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::visual_studio_utils::create_copy_file_script
+
+visual_studio_utils.create_deploy_script
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. doxygenfunction:: makeprojects::visual_studio_utils::create_deploy_script
+
 Watcom
 ------
 

makeprojects/core.py

@@ -1490,14 +1490,12 @@ def generate(self, ide=None):
         import makeprojects.watcom
         import makeprojects.makefile
         import makeprojects.visual_studio
-        import makeprojects.visual_studio_2010
         import makeprojects.codewarrior
         import makeprojects.xcode
         import makeprojects.codeblocks
 
         generator_list = (
             makeprojects.visual_studio,
-            makeprojects.visual_studio_2010,
             makeprojects.watcom,
             makeprojects.makefile,
             makeprojects.codewarrior,