Use ide-gen for Xcode

Author: burgerbecky

README.rst

@@ -24,8 +24,8 @@ Compatibility
 Installation
 ------------
 
-Type in ``pip install -U makeprojects``. Some platforms may require the ``sudo``
-prefix.
+Type in ``pip install -U makeprojects``. Some platforms may require the
+``sudo`` prefix.
 
 Bugs
 ----

docs/functions.rst

@@ -307,10 +307,6 @@ 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

makeprojects/enums.py

@@ -552,6 +552,8 @@ class IDETypes(IntEnum):
         xcode12: XCode 12
         xcode13: XCode 13
         xcode14: XCode 14
+        xcode15: XCode 15
+        xcode16: XCode 16
 
         codeblocks: Codeblocks
 
@@ -597,20 +599,22 @@ class IDETypes(IntEnum):
     xcode12 = 23
     xcode13 = 24
     xcode14 = 25
+    xcode15 = 26
+    xcode16 = 27
 
-    codeblocks = 26
+    codeblocks = 28
 
-    nmake = 27
+    nmake = 29
 
-    make = 28
+    make = 30
 
-    bazel = 29
+    bazel = 31
 
-    mpw = 30
+    mpw = 32
 
-    buck = 31
+    buck = 33
 
-    ninja = 32
+    ninja = 34
 
     ########################################
 
@@ -657,7 +661,7 @@ def is_xcode(self):
             IDETypes.xcode3, IDETypes.xcode4, IDETypes.xcode5, IDETypes.xcode6,
             IDETypes.xcode7, IDETypes.xcode8, IDETypes.xcode9, IDETypes.xcode10,
             IDETypes.xcode11, IDETypes.xcode12, IDETypes.xcode13,
-            IDETypes.xcode14)
+            IDETypes.xcode14, IDETypes.xcode15, IDETypes.xcode16)
 
     ########################################
 
@@ -807,6 +811,8 @@ def __str__(self):
     IDETypes.xcode12: "x12",
     IDETypes.xcode13: "x13",
     IDETypes.xcode14: "x14",
+    IDETypes.xcode15: "x15",
+    IDETypes.xcode16: "x16",
     IDETypes.codeblocks: "cdb",             # Codeblocks
     IDETypes.nmake: "nmk",                  # nmake
     IDETypes.make: "mak",                   # make
@@ -843,6 +849,8 @@ def __str__(self):
     IDETypes.xcode12: "XCode 12",
     IDETypes.xcode13: "XCode 13",
     IDETypes.xcode14: "XCode 14",
+    IDETypes.xcode15: "XCode 15",
+    IDETypes.xcode16: "XCode 16",
     IDETypes.codeblocks: "CodeBlocks 13.12",
     IDETypes.nmake: "GNU make",
     IDETypes.make: "Linux make",
@@ -899,6 +907,8 @@ def get_installed_xcode():
     """
 
     xcode_table = (
+        (16, IDETypes.xcode16),
+        (15, IDETypes.xcode15),
         (14, IDETypes.xcode14),
         (13, IDETypes.xcode13),
         (12, IDETypes.xcode12),

makeprojects/makefile.py

@@ -189,7 +189,7 @@ def match(filename):
 
 
 def create_build_object(file_name, priority=50,
-                 configurations=None, verbose=False):
+                        configurations=None, verbose=False):
     """
     Create BuildMakeFile build records for every desired configuration
 
@@ -219,7 +219,7 @@ def create_build_object(file_name, priority=50,
 
 
 def create_clean_object(file_name, priority=50,
-                 configurations=None, verbose=False):
+                        configurations=None, verbose=False):
     """
     Create BuildMakeFile build records for every desired configuration
 
@@ -377,8 +377,8 @@ def __init__(self, solution):
 
                 # Get the rule list
                 rule_list = (configuration.custom_rules,
-                    configuration.parent.custom_rules,
-                    configuration.parent.parent.custom_rules)
+                             configuration.parent.custom_rules,
+                             configuration.parent.parent.custom_rules)
                 get_custom_list(custom_list, rule_list, codefiles)
 
         self.custom_list = custom_list
@@ -998,7 +998,7 @@ def _setlinkerflags(self, line_list):
                 lib_list = configuration.get_unique_chained_list(
                     "library_folders_list")
                 for item in lib_list:
-                    entries.append("-L" + item)
+                    entries.append("-L" + convert_to_linux_slashes(item))
 
             line_list.append(" ".join(entries))
 
@@ -1209,7 +1209,7 @@ def write_all_target(self, line_list):
                 line_list.extend(
                     ("",
                      "$(TEMP_DIR)/{0}.o: {1} ; $({2})".format(entry,
-                        item, build_cpp)
+                                                              item, build_cpp)
                      ))
         return 0
 

makeprojects/visual_studio.py

@@ -44,6 +44,7 @@
 from burger import save_text_file_if_newer, convert_to_windows_slashes, \
     escape_xml_cdata, escape_xml_attribute, where_is_visual_studio, \
     load_text_file, string_to_bool, delete_file
+from ide_gen import vs_calcguid
 
 try:
     from wslwinreg import convert_to_windows_path
@@ -58,7 +59,7 @@
 from .glsl_support import make_glsl_command
 from .masm_support import MASM_ENUMS, make_masm_command
 from .build_objects import BuildObject, BuildError
-from .visual_studio_utils import get_uuid, get_path_property, \
+from .visual_studio_utils import get_path_property, \
     convert_file_name_vs2010, add_masm_support, create_deploy_script, \
     generate_solution_file, wiiu_props
 from .visual_studio_2010 import VS2010vcproj, VS2010vcprojfilter
@@ -8240,7 +8241,7 @@ def generate(solution):
         # Set the project UUID
         item = getattr(project, "vs_uuid", None)
         if not item:
-            project.vs_uuid = get_uuid(project.vs_output_filename)
+            project.vs_uuid = vs_calcguid(project.vs_output_filename)
 
         for configuration in project.configuration_list:
 

makeprojects/visual_studio_2010.py

@@ -20,10 +20,11 @@
 import os
 from burger import convert_to_windows_slashes, escape_xml_cdata, \
     escape_xml_attribute, packed_paths, truefalse
+from ide_gen import vs_calcguid
 
 from .enums import FileTypes, ProjectTypes, IDETypes, PlatformTypes, \
     source_file_filter
-from .visual_studio_utils import get_toolset_version, get_uuid, \
+from .visual_studio_utils import get_toolset_version, \
     create_deploy_script
 
 ########################################
@@ -1830,7 +1831,7 @@ def __init__(self, project):
         # Output the group list
         for item in groupset:
             item = convert_to_windows_slashes(item)
-            groupuuid = get_uuid(
+            groupuuid = vs_calcguid(
                 project.vs_output_filename + item)
             filterxml = VS2010XML("Filter", {"Include": item})
             self.main_element.add_element(filterxml)

makeprojects/visual_studio_utils.py

@@ -106,26 +106,6 @@
 ########################################
 
 
-def get_uuid(input_str):
-    """
-    Convert a string to a UUID.
-
-    Given a project name string, create a 128 bit unique hash for
-    Visual Studio.
-
-    Args:
-        input_str: Unicode string of the filename to convert into a hash
-    Returns:
-        A string in the format of CF994A05-58B3-3EF5-8539-E7753D89E84F
-    """
-
-    # Generate using md5 with NAMESPACE_DNS as salt
-    temp_md5 = md5(NAMESPACE_DNS.bytes + input_str.encode("utf-8")).digest()
-    return str(UUID(bytes=temp_md5[:16], version=3)).upper()
-
-########################################
-
-
 def get_path_property(ide, pathname):
     """
     If a path is relative, return the proper object