Fix some tasks about Latex (#20)

* check new latex find

* latex updates

* revert script

* fix gha

* fix gha 2

* fix gha 2

* fix gha 3

* fix gha 4

* Update main.yml

* Update main.yml

* Update main.yml

* Update main.yml

* Update main.yml

* change dir layout

Author: allnes

.github/workflows/main.yml

@@ -13,14 +13,13 @@ jobs:
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
+        sudo apt-get install ninja-build
         sudo apt-get install texlive*
     - name: Build
       run: |
         mkdir build
-        cd build
-        cmake -D USE_LATEX=ON  ..
-        cmake --build . 
-        cd ..
+        cmake -G Ninja -S . -B build -D USE_LATEX=ON
+        cmake --build build
       shell: bash
     - uses: actions/upload-artifact@v4
       with:
@@ -34,17 +33,37 @@ jobs:
         submodules: true
     - name: Setup environment
       run: |
-        choco install texlive --params="'/scheme:full'" --execution-timeout=10000
+        scripts\miktex_install.ps1
+      shell: pwsh
     - name: Build
       run: |
         Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
         refreshenv
         mkdir build
-        cd build
-        cmake -D USE_LATEX=ON  ..
-        cmake --build .
-        cd ..
+        cmake -S . -B build -D USE_LATEX=ON
+        cmake --build build
+      shell: pwsh
     - uses: actions/upload-artifact@v4
       with:
         name: windows-artifacts
         path: build/bin/
+  macos-build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Setup environment
+      run: |
+        brew install --cask mactex
+        brew install ninja
+    - name: Build
+      run: |
+        eval "$(/usr/libexec/path_helper)"
+        mkdir build
+        cmake -G Ninja -S . -B build -D USE_LATEX=ON
+        cmake --build build
+    - uses: actions/upload-artifact@v4
+      with:
+        name: macos-artifacts
+        path: build/bin/

.gitmodules

@@ -1,13 +1,17 @@
-cmake_minimum_required( VERSION 3.13 )
+cmake_minimum_required( VERSION 3.27 )
 
 message( STATUS "Programming Course Reports" )
+project(programming_course_reports)
 
-include(${CMAKE_SOURCE_DIR}/cmake/Configure.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/configure.cmake)
 
 ############################### LATEX ###############################
 option(USE_LATEX OFF)
 if( USE_LATEX )
-    include( 3rdparty/UseLATEX/UseLATEX.cmake )
+    find_package(LATEX REQUIRED)
+    if(NOT (LATEX_FOUND AND LATEX_PDFLATEX_FOUND))
+        set(USE_LATEX OFF)
+    endif()
 endif( USE_LATEX )
 
 add_subdirectory(modules)

3rdparty/UseLATEX

@@ -0,0 +1,7 @@
+message(STATUS "Example tasks")
+
+SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
+
+foreach(subd ${subdirs})
+  add_subdirectory(${subd})
+endforeach()

CMakeLists.txt

@@ -0,0 +1,41 @@
+get_filename_component(ProjectId ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+
+set(LATEX_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+if (NOT EXISTS ${LATEX_OUTPUT_PATH})
+    file(MAKE_DIRECTORY ${LATEX_OUTPUT_PATH})
+endif ()
+
+if (USE_LATEX)
+    message( STATUS "-- " ${ProjectId} )
+    file(GLOB_RECURSE report_files "*.tex")
+
+    foreach (report ${report_files})
+        get_filename_component(report_name ${report} NAME_WE)
+        list(APPEND list_report_names ${report_name})
+    endforeach ()
+
+    add_custom_target( ${ProjectId}_prebuild
+            COMMAND ${PDFLATEX_COMPILER} -draftmode -interaction=nonstopmode ${report_files}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            DEPENDS ${report_files})
+
+    add_custom_target( ${ProjectId}_pdf
+            COMMAND ${PDFLATEX_COMPILER} ${report_files}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            DEPENDS  ${report_files})
+
+    add_custom_target(${ProjectId}_all_formats ALL)
+    add_dependencies(${ProjectId}_all_formats ${ProjectId}_pdf)
+
+    foreach (report_name ${list_report_names})
+            add_custom_command(
+                    TARGET ${ProjectId}_all_formats
+                    POST_BUILD
+                    COMMAND mv "${CMAKE_CURRENT_SOURCE_DIR}/${report_name}.aux" "${LATEX_OUTPUT_PATH}/${report_name}.aux"
+                    COMMAND mv "${CMAKE_CURRENT_SOURCE_DIR}/${report_name}.log" "${LATEX_OUTPUT_PATH}/${report_name}.log"
+                    COMMAND mv "${CMAKE_CURRENT_SOURCE_DIR}/${report_name}.pdf" "${LATEX_OUTPUT_PATH}/${report_name}.pdf"
+            )
+    endforeach ()
+else()
+    message( STATUS "-- ${ProjectId} - NOT BUILD!"  )
+endif()

cmake/Configure.cmake cmake/configure.cmake

@@ -1,4 +1,4 @@
-message(STATUS "Task 3")
+message(STATUS "MPI tasks")
 
 SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
 

modules/example/CMakeLists.txt

@@ -1,4 +1,4 @@
-message(STATUS "Task 2")
+message(STATUS "OpenMP tasks")
 
 SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
 

modules/example/latex/CMakeLists.txt

@@ -0,0 +1,7 @@
+message(STATUS "Sequential tasks")
+
+SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
+
+foreach(subd ${subdirs})
+  add_subdirectory(${subd})
+endforeach()

modules/test_tasks/test_latex/test_latex.tex modules/example/latex/test_latex.tex

@@ -1,4 +1,4 @@
-message(STATUS "Task 4")
+message(STATUS "STL tasks")
 
 SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
 

modules/task_3/CMakeLists.txt modules/mpi/CMakeLists.txt

@@ -1,4 +1,4 @@
-message(STATUS "Task 1")
+message(STATUS "TBB tasks")
 
 SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
 

modules/task_2/CMakeLists.txt modules/omp/CMakeLists.txt

@@ -0,0 +1,47 @@
+$ErrorActionPreference = "Stop"
+
+$scriptRoot = (Resolve-Path $(If ($PSScriptRoot) { $PSScriptRoot } Else { "." })).Path
+
+$installerPath = "$scriptRoot\basic-miktex-x64.exe"
+$installerUrl = 'https://mirrors.rit.edu/CTAN/systems/win32/miktex/setup/windows-x64/basic-miktex-23.10-x64.exe'
+
+(New-Object System.Net.WebClient).DownloadFile($installerUrl, $installerPath)
+
+$pinfo = New-Object System.Diagnostics.ProcessStartInfo
+$pinfo.FileName = $installerPath
+$pinfo.Arguments = "--unattended --shared --auto-install=yes --paper-size=A4"
+$pinfo.RedirectStandardError = $true
+$pinfo.RedirectStandardOutput = $true
+$pinfo.UseShellExecute = $false
+$pinfo.WorkingDirectory = $scriptRoot
+
+Write-Host "Starting MiKTeX installer"
+$p = New-Object System.Diagnostics.Process
+$p.StartInfo = $pinfo
+$p.Start() | Out-Null
+
+Write-Host "Waiting for MiKTeX installer to finish..."
+
+# Start async reads of output streams to avoid deadlock
+$p.BeginOutputReadLine()
+$p.BeginErrorReadLine()
+
+$p.WaitForExit()
+$exitCode = $p.ExitCode
+Write-Host "MiKTeX installer exited with code $exitCode"
+
+if ($exitCode -ne 0)
+{
+  throw "MiKTeX installer failed"
+}
+
+$env:Path = [System.Environment]::ExpandEnvironmentVariables(
+    [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' +
+    [System.Environment]::GetEnvironmentVariable('Path', 'User')
+)
+refreshenv
+
+initexmf --admin --enable-installer --verbose
+initexmf --admin --default-paper-size=a4 --verbose
+initexmf --admin --update-fndb --verbose
+initexmf --admin --mkmaps --verbose