Add 'Link' step to the Linux pipeline.

* Additionally fixed clang detection.

Author: Dandielo

.github/workflows/deploy.yaml

@@ -22,8 +22,8 @@ jobs:
         sudo apt install libc++-12-dev libc++abi-12-dev --fix-missing
     - name: Create (lua-5.1.5, clang-12)
       run: |
-        ~/.local/bin/conan create . ice-build-tools/0.6.0@iceshard/stable --profile clang-12.0-linux-x86_64 --build=missing
+        ~/.local/bin/conan create . ice-build-tools/0.7.0@iceshard/stable --profile clang-12.0-linux-x86_64 --build=missing
     - name: Deploy
       run: |
         ~/.local/bin/conan user iceshard -r conan-iceshard -p ${{ secrets.CONAN_PASSWORD }}
-        ~/.local/bin/conan upload -r conan-iceshard ice-build-tools/0.6.0@iceshard/stable --all
+        ~/.local/bin/conan upload -r conan-iceshard ice-build-tools/0.7.0@iceshard/stable --all

.github/workflows/validate.yml

@@ -21,7 +21,7 @@ jobs:
         sudo apt install libc++-12-dev libc++abi-12-dev --fix-missing
     - name: Create (lua-5.1.5, clang-12)
       run: |
-        ~/.local/bin/conan create . ice-build-tools/0.6.0@iceshard/stable --profile clang-12.0-linux-x86_64 --build=missing
+        ~/.local/bin/conan create . ice-build-tools/0.7.0@iceshard/stable --profile clang-12.0-linux-x86_64 --build=missing
     - name: Success
       run: |
         echo Validation successful

conanfile.py

@@ -4,7 +4,7 @@
 
 class IceBuildToolsConan(ConanFile):
     name = "ice-build-tools"
-    version = "0.6.0"
+    version = "0.7.0"
     license = "MIT"
     description = "IceShard - build tools base"
     url = "https://github.com/iceshard-engine/ice-build-tools"

scripts/fastbuild/base_pipelines.bff

@@ -94,7 +94,7 @@
 
     .PipelineTasks = {
         .Task_BuildSources
-        // .Task_LinkExecutable // Still heavy WIP
+        .Task_LinkExecutable
     }
 ]
 

source/ice/generators/fastbuild.moon

@@ -55,7 +55,11 @@ class FastBuildGenerator
         @\line_raw "#include \"#{path}\""
 
     line: (value) =>
-        @file\write "#{@indent}#{value or ''}\n"
+        if value
+            @file\write "#{@indent}#{value or ''}\n"
+        else
+            @file\write '\n'
+
 
     line_raw: (value) =>
         @file\write "#{value or ''}\n"

source/ice/toolchain/clang.moon

@@ -1,7 +1,7 @@
 import Where, Exec from require "ice.tools.exec"
 
 toolchain_definitions = {
-    '9.0.0': {
+    '9': {
         name: 'clang-9.0.0'
         struct_name: 'Toolchain_Clang_x64_900'
         compiler_name: 'compiler-clang-x64-900'
@@ -31,7 +31,7 @@ toolchain_definitions = {
                     { 'ToolchainLibs', { } }
                 }
     }
-    '10.0.0': {
+    '10': {
         name: 'clang-10.0.0'
         struct_name: 'Toolchain_Clang_x64_1000'
         compiler_name: 'compiler-clang-x64-1000'
@@ -61,7 +61,7 @@ toolchain_definitions = {
                     { 'ToolchainLibs', { } }
                 }
     }
-    '11.0.0': {
+    '11': {
         name: 'clang-11.0.0'
         struct_name: 'Toolchain_Clang_x64_1100'
         compiler_name: 'compiler-clang-x64-1100'
@@ -91,7 +91,7 @@ toolchain_definitions = {
                     { 'ToolchainLibs', { } }
                 }
     }
-    '12.0.0': {
+    '12': {
         name: 'clang-12.0.0'
         struct_name: 'Toolchain_Clang_x64_1200'
         compiler_name: 'compiler-clang-x64-1200'
@@ -123,39 +123,39 @@ toolchain_definitions = {
     }
 }
 
-detect_compilers = (ver_major) ->
-    binaries = {
-        '9': {
-            clang_path: Where\path 'clang++-9'
-            ar_path: Where\path 'ar'
-        },
-        '10': {
-            clang_path: Where\path 'clang++-10'
-            ar_path: Where\path 'ar'
-        },
-        '11': {
-            clang_path: Where\path 'clang++-11'
-            ar_path: Where\path 'ar'
-        },
-        '12': {
-            clang_path: Where\path 'clang++-12'
-            ar_path: Where\path 'ar'
-        }
-    }
-    return binaries[tostring ver_major] or { }
+detect_compilers = (ver_major , log_file) ->
+    versions = { '9', '10', '11', '12', '13' }
+    results = { }
+
+    ar_path = Where\path 'ar', log_file
+    unless os.isfile ar_path
+        return { }
+
+    for ver in *versions
+        clang_path = Where\path "clang++#{ver}", log_file
+        if clang_path
+            results[ver] = {
+                :clang_path
+                :ar_path
+            }
+
+    return results[ver_major] or { }
 
 class Clang
-    @detect: (conan_profile) =>
+    @detect: (conan_profile, log_file) =>
         toolchain_list = { }
 
         if conan_profile and conan_profile.compiler and conan_profile.compiler.version
             ver_major = conan_profile.compiler.version
 
-            compiler = detect_compilers ver_major
+            compiler = detect_compilers ver_major, log_file
             if compiler.clang_path and compiler.ar_path
 
                 clang_exe = compiler.clang_path
-                clang_ver = (((Exec clang_exe)\lines '--version')[1]\gmatch "version (%d+.%d+.%d+)")!
+                clang_ver = (((Exec clang_exe)\lines '--version')[1]\gmatch "version (%d+).(%d+).(%d+)")!
+
+                unless clang_ver == ver_major
+                    return
 
                 if toolchain_definition = toolchain_definitions[clang_ver]
                     table.insert toolchain_list, {

source/ice/toolchain/gcc.moon

@@ -33,27 +33,29 @@ toolchain_definitions = {
     }
 }
 
-detect_compilers = (ver_major) ->
+detect_compilers = (ver_major, log_file) ->
     {
-        gcc_path: Where\path 'g++'
-        ar_path: Where\path 'ar'
+        gcc_path: Where\path 'g++', log_file
+        ar_path: Where\path 'ar', log_file
     }
 
 class Gcc
-    @detect: (conan_profile) =>
+    @detect: (conan_profile, log_file) =>
         toolchain_list = { }
 
         if conan_profile and conan_profile.compiler and conan_profile.compiler.version
             ver_major = conan_profile.compiler.version
 
-
-            compiler = detect_compilers ver_major
+            compiler = detect_compilers ver_major, log_file
             if compiler.gcc_path and compiler.ar_path
 
                 gcc_exe = compiler.gcc_path
                 gcc_ver_lines = ((Exec gcc_exe)\lines '--version')
                 gcc_major, gcc_minor, gcc_patch = (gcc_ver_lines[1]\gmatch "(%d+).(%d+).(%d+)")!
 
+                unless gcc_major == ver_major
+                    return
+
                 if toolchain_definition = toolchain_definitions[gcc_major]
                     table.insert toolchain_list, {
                         name: toolchain_definition.name

source/ice/tools/exec.moon

@@ -26,7 +26,11 @@ class Exec
 
 class Where extends Exec
     @exec = os.iswindows and 'where.exe' or 'which'
-    @path: (name) => (Where!\lines name)[1] or name
+    @path: (name, err_log) =>
+        args = name
+        args ..= " 2>>#{err_log}" if err_log
+
+        (Where!\lines args)[1]
 
     new: => @exec = @@exec
 

source/ice/workspace/project.moon

@@ -115,6 +115,9 @@ install_conan_dependencies = (profile, force_update) ->
                 build_policy:'missing'
 
 generate_fastbuild_variables_script = (profile, locators, output_dir, force_update) ->
+    log_file = 'build/compiler_detection.log'
+
+    os.remove log_file
 
     execute_locators = (locator_type, detected_info) ->
         for locator in *locators[locator_type]
@@ -137,11 +140,11 @@ generate_fastbuild_variables_script = (profile, locators, output_dir, force_upda
         table.insert detected_info.toolchains, toolchain for toolchain in *clang_toolchains or { }
 
     if os.isunix
-        -- #TODO (#6): https://github.com/iceshard-engine/ice-build-tools/issues/6
-        -- clang_toolchains = Clang\detect profile
-        clang_toolchains = Gcc\detect profile
+        clang_toolchains = Clang\detect profile, log_file
+        gcc_toolchains = Gcc\detect profile, log_file
 
         table.insert detected_info.toolchains, toolchain for toolchain in *clang_toolchains or { }
+        table.insert detected_info.toolchains, toolchain for toolchain in *gcc_toolchains or { }
 
 
     -- execute_locators Locator.Type.Toolchain, toolchains -- Currently unused