add category to language menu

9 files changed, 64 insertions, 72 deletions

diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua
index e443b8cb3..75821bf75 100644
--- a/xmake/actions/config/xmake.lua
+++ b/xmake/actions/config/xmake.lua
@@ -127,7 +127,6 @@ task("config")
                                                           , "    - sdk/include"                                             }
 
                     -- show language menu options
-                ,   {category = "Language Options Configuration"}
                 ,   function () 
 
                         -- import language menu
diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua
index 912e52961..0e55544c6 100644
--- a/xmake/languages/asm/xmake.lua
+++ b/xmake/languages/asm/xmake.lua
@@ -118,27 +118,23 @@ language("asm")
     set_menu {
                 config = 
                 {   
-                    {}
-                ,   {nil, "as",         "kv", nil,          "The Assembler"                         }
-                ,   {nil, "asflags",    "kv", nil,          "The Assembler Flags"                   }
+                    {category = "Compiler and Linker Configuration"                           }
+                ,   {nil, "as",         "kv", nil,          "The Assembler"                   }
+                ,   {nil, "ar",         "kv", nil,          "The Static Library Linker"       }
+                ,   {nil, "ld",         "kv", nil,          "The Linker"                      }
+                ,   {nil, "sh",         "kv", nil,          "The Shared Library Linker"       }
 
-                ,   {}
-                ,   {nil, "ld",         "kv", nil,          "The Linker"                            }
-                ,   {nil, "ldflags",    "kv", nil,          "The Binary Linker Flags"               }
+                ,   {category = "Compiler and Linker Flags Configuration"                     }
+                ,   {nil, "asflags",    "kv", nil,          "The Assembler Flags"             }
+                ,   {nil, "ldflags",    "kv", nil,          "The Binary Linker Flags"         }
+                ,   {nil, "arflags",    "kv", nil,          "The Static Library Linker Flags" }
+                ,   {nil, "shflags",    "kv", nil,          "The Shared Library Linker Flags" }
 
-                ,   {}
-                ,   {nil, "ar",         "kv", nil,          "The Static Library Linker"             }
-                ,   {nil, "arflags",    "kv", nil,          "The Static Library Linker Flags"       }
-
-                ,   {}
-                ,   {nil, "sh",         "kv", nil,          "The Shared Library Linker"             }
-                ,   {nil, "shflags",    "kv", nil,          "The Shared Library Linker Flags"       }
-
-                ,   {}
-                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                    }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"           }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"        }
-                }
+                ,   {                                                                         }
+                ,   {nil, "links",      "kv", nil,          "The Link Libraries"              }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"     }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"  }
+                                                                                              }
             }
 
 
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
index 863374e05..35ed72825 100644
--- a/xmake/languages/c++/xmake.lua
+++ b/xmake/languages/c++/xmake.lua
@@ -147,25 +147,22 @@ language("c++")
     set_menu {
                 config = 
                 {   
-                    {                                                                                               }
+                    {category = "Compiler and Linker Configuration"                                                 }
                 ,   {nil, "cc",            "kv", nil,          "The C Compiler"                                     }
                 ,   {nil, "cxx",           "kv", nil,          "The C++ Compiler"                                   }
+                ,   {nil, "ld",            "kv", nil,          "The Linker"                                         }
+                ,   {nil, "ar",            "kv", nil,          "The Static Library Linker"                          }
+                ,   {nil, "sh",            "kv", nil,          "The Shared Library Linker"                          }
+
+                ,   {category = "Compiler and Linker Flags Configuration"                                           }
                 ,   {nil, "cflags",        "kv", nil,          "The C Compiler Flags"                               }
                 ,   {nil, "cxflags",       "kv", nil,          "The C/C++ compiler Flags"                           }
                 ,   {nil, "cxxflags",      "kv", nil,          "The C++ Compiler Flags"                             }
 
                 ,   {                                                                                               }
-                ,   {nil, "ld",            "kv", nil,          "The Linker"                                         }
                 ,   {nil, "ldflags",       "kv", nil,          "The Binary Linker Flags"                            }
-
-                ,   {                                                                                               }
-                ,   {nil, "ar",            "kv", nil,          "The Static Library Linker"                          }
                 ,   {nil, "arflags",       "kv", nil,          "The Static Library Linker Flags"                    }
-
-                ,   {                                                                                               }
-                ,   {nil, "sh",            "kv", nil,          "The Shared Library Linker"                          }
                 ,   {nil, "shflags",       "kv", nil,          "The Shared Library Linker Flags"                    }
-
                 ,   {                                                                                               }
                 ,   {nil, "links",         "kv", nil,          "The Link Libraries"                                 }
                 ,   {nil, "linkdirs",      "kv", nil,          "The Link Search Directories"                        }
diff --git a/xmake/languages/dlang/xmake.lua b/xmake/languages/dlang/xmake.lua
index 0179dfcd8..7f1dd7c07 100644
--- a/xmake/languages/dlang/xmake.lua
+++ b/xmake/languages/dlang/xmake.lua
@@ -102,16 +102,16 @@ language("dlang")
     set_menu {
                 config = 
                 {   
-                    {                                                                                 }
-                ,   {nil, "dc",         "kv", nil,          "The Dlang Compiler"                      }
-                ,   {nil, "dc-ld",      "kv", nil,          "The Dlang Linker"                        }
-                ,   {nil, "dc-ar",      "kv", nil,          "The Dlang Static Library Archiver"       }
-                ,   {nil, "dc-sh",      "kv", nil,          "The Dlang Shared Library Linker"         }
+                    {category = "Compiler and Linker Configuration"                             }
+                ,   {nil, "dc",         "kv", nil,          "The Dlang Compiler"                }
+                ,   {nil, "dc-ld",      "kv", nil,          "The Dlang Linker"                  }
+                ,   {nil, "dc-ar",      "kv", nil,          "The Dlang Static Library Archiver" }
+                ,   {nil, "dc-sh",      "kv", nil,          "The Dlang Shared Library Linker"   }
 
-                ,   {                                                                                 }
-                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                      }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"             }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"          }
-                }
+                ,   {category = "Compiler and Linker Flags Configuration"                       }
+                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"       }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"    }
+                                                                                                }
             } 
 
diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua
index 517c5b816..b6ab48b6c 100644
--- a/xmake/languages/golang/xmake.lua
+++ b/xmake/languages/golang/xmake.lua
@@ -98,15 +98,15 @@ language("golang")
     set_menu {
                 config = 
                 {   
-                    {                                                                                }
-                ,   {nil, "go",         "kv", nil,          "The Golang Compiler"                    }
-                ,   {nil, "gc-ld",      "kv", nil,          "The Golang Linker"                      }
-                ,   {nil, "go-ar",      "kv", nil,          "The Golang Static Library Linker"       }
+                    {category = "Compiler and Linker Configuration"                            }
+                ,   {nil, "go",         "kv", nil,          "The Golang Compiler"              }
+                ,   {nil, "gc-ld",      "kv", nil,          "The Golang Linker"                }
+                ,   {nil, "go-ar",      "kv", nil,          "The Golang Static Library Linker" }
 
-                ,   {                                                                                }
-                ,   {nil, "links",      "kv", nil,          "The Link Libraries"                     }
-                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"            }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"         }
-                }
-            } 
+                ,   {category = "Compiler and Linker Flags Configuration"                      }
+                ,   {nil, "links",      "kv", nil,          "The Link Libraries"               }
+                ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"      }
+                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"   }
+                                                                                               }
+                                                                                               }
 
diff --git a/xmake/languages/msrc/xmake.lua b/xmake/languages/msrc/xmake.lua
index d970304e9..f1786a20d 100644
--- a/xmake/languages/msrc/xmake.lua
+++ b/xmake/languages/msrc/xmake.lua
@@ -63,8 +63,10 @@ language("msrc")
     set_menu {
                 config = 
                 {   
-                    {                                                                         }
+                    {category = "Compiler and Linker Configuration"                           }
                 ,   {nil, "mrc",        "kv", nil,          "The Microsoft Resource Compiler" }
+
+                ,   {category = "Compiler and Linker Flags Configuration"                     }
                 ,   {nil, "mrcflags",   "kv", nil,          "The Microsoft Resource Flags"    }
 
                 ,   {                                                                         }
diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua
index ba12bc92a..2f80969cd 100644
--- a/xmake/languages/objc++/xmake.lua
+++ b/xmake/languages/objc++/xmake.lua
@@ -147,23 +147,21 @@ language("objc++")
     set_menu {
                 config = 
                 {   
-                    {                                                                                               }
+                    {category = "Compiler and Linker Configuration"                                                 }
                 ,   {nil, "mm",            "kv", nil,          "The Objc Compiler"                                  }
                 ,   {nil, "mxx",           "kv", nil,          "The Objc++ Compiler"                                }
+                ,   {nil, "ld",            "kv", nil,          "The Linker"                                         }
+                ,   {nil, "ar",            "kv", nil,          "The Static Library Linker"                          }
+                ,   {nil, "sh",            "kv", nil,          "The Shared Library Linker"                          }
+
+                ,   {category = "Compiler and Linker Flags Configuration"                                           }
                 ,   {nil, "mflags",        "kv", nil,          "The Objc Compiler Flags"                            }
                 ,   {nil, "mxflags",       "kv", nil,          "The Objc/c++ Compiler Flags"                        }
                 ,   {nil, "mxxflags",      "kv", nil,          "The Objc++ Compiler Flags"                          }
 
                 ,   {                                                                                               }
-                ,   {nil, "ld",            "kv", nil,          "The Linker"                                         }
                 ,   {nil, "ldflags",       "kv", nil,          "The Binary Linker Flags"                            }
-
-                ,   {                                                                                               }
-                ,   {nil, "ar",            "kv", nil,          "The Static Library Linker"                          }
                 ,   {nil, "arflags",       "kv", nil,          "The Static Library Linker Flags"                    }
-
-                ,   {                                                                                               }
-                ,   {nil, "sh",            "kv", nil,          "The Shared Library Linker"                          }
                 ,   {nil, "shflags",       "kv", nil,          "The Shared Library Linker Flags"                    }
 
                 ,   {                                                                                               }
diff --git a/xmake/languages/rust/xmake.lua b/xmake/languages/rust/xmake.lua
index 644bdb45f..942a30cfa 100644
--- a/xmake/languages/rust/xmake.lua
+++ b/xmake/languages/rust/xmake.lua
@@ -91,13 +91,13 @@ language("rust")
     set_menu {
                 config = 
                 {   
-                    {                                                                          }
+                    {category = "Compiler and Linker Configuration"                            }
                 ,   {nil, "rc",         "kv", nil,          "The Rust Compiler"                }
                 ,   {nil, "rc-ld",      "kv", nil,          "The Rust Linker"                  }
                 ,   {nil, "rc-ar",      "kv", nil,          "The Rust Static Library Archiver" }
                 ,   {nil, "rc-sh",      "kv", nil,          "The Rust Shared Library Linker"   }
 
-                ,   {                                                                          }
+                ,   {category = "Compiler and Linker Flags Configuration"                      }
                 ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"      }
                 }
             } 
diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua
index cef5d1cb5..dddc235ab 100644
--- a/xmake/languages/swift/xmake.lua
+++ b/xmake/languages/swift/xmake.lua
@@ -141,19 +141,19 @@ language("swift")
     -- set menu
     set_menu {
                 config = 
-                {   
-                  {                                                                                               }
-                , {nil, "sc",            "kv", nil,          "The Swift Compiler"                                 }
-                , {nil, "sc-ld",         "kv", nil,          "The Swift Linker"                                   }
-                , {nil, "sc-sh",         "kv", nil,          "The Swift Shared Library Linker"                    }
+                {
+                    { category = "Compiler and Linker Configuration"                                                 }
+                ,   { nil, "sc",            "kv", nil,          "The Swift Compiler"                                 }
+                ,   { nil, "sc-ld",         "kv", nil,          "The Swift Linker"                                   }
+                ,   { nil, "sc-sh",         "kv", nil,          "The Swift Shared Library Linker"                    }
 
-                , {                                                                                               }
-                , {nil, "links",         "kv", nil,          "The Link Libraries"                                 }
-                , {nil, "linkdirs",      "kv", nil,          "The Link Search Directories"                        }
-                , {nil, "includedirs",   "kv", nil,          "The Include Search Directories"                     }
-                , {nil, "frameworks",    "kv", nil,          "The Include and Link Frameworks"                    }
-                , {nil, "frameworkdirs", "kv", nil,          "The Include and Link Frameworks Search Directories" }
-                }
+                ,   { category = "Compiler and Linker Flags Configuration"                                           }
+                ,   { nil, "links",         "kv", nil,          "The Link Libraries"                                 }
+                ,   { nil, "linkdirs",      "kv", nil,          "The Link Search Directories"                        }
+                ,   { nil, "includedirs",   "kv", nil,          "The Include Search Directories"                     }
+                ,   { nil, "frameworks",    "kv", nil,          "The Include and Link Frameworks"                    }
+                ,   { nil, "frameworkdirs", "kv", nil,          "The Include and Link Frameworks Search Directories" }
+                                                                                                                     }
             }