diff --git a/Compile.ps1 b/Compile.ps1 index 62c6eef0..f28c5933 100644 --- a/Compile.ps1 +++ b/Compile.ps1 @@ -28,40 +28,6 @@ function Update-Progress { Write-Progress -Activity $Activity -Status $StatusMessage -PercentComplete $Percent } -function Do-PreProcessing { - param ( - [Parameter(Mandatory, position=0)] - [string]$ProgressStatusMessage, - - [Parameter(position=1)] - [string]$ProgressActivity = "Pre-Processing" - ) - - $excludedFiles = @('git\', '.gitignore', '.gitattributes', '.github\CODEOWNERS', 'LICENSE', 'winutil.ps1', 'docs\changelog.md', '*.png', '*.jpg', '*.jpeg', '*.exe') - - $files = Get-ChildItem $workingdir -Recurse -Exclude $excludedFiles -Attributes !Directory - $numOfFiles = $files.Count - - for ($i = 0; $i -lt $numOfFiles; $i++) { - $file = $files[$i] - # TODO: - # make more formatting rules, and document them in WinUtil Official Documentation - (Get-Content -Raw "$file").TrimEnd() ` - -replace ('\t', ' ') ` - -replace ('\)\{', ') {') ` - -replace ('\)\r?\n\s*{', ') {') ` - -replace ('Try \{', 'try {') ` - -replace ('try\{', 'try {') ` - -replace ('try\r?\n\s*\{', 'try {') ` - -replace ('}\r?\n\s*catch', '} catch') ` - -replace ('\} Catch', '} catch') ` - | Set-Content "$file" - Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished $i out of $numOfFiles" -PercentComplete (($i/$numOfFiles)*100) - } - - Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished Task Successfully" -Completed -} - $header = @" ################################################################################################################ ### ### @@ -71,6 +37,8 @@ $header = @" "@ if (-NOT $SkipPreprocessing) { + # Dot source the 'Do-PreProcessing' Function from 'tools/Do-PreProcessing.ps1' Function + . "$workingdir\tools\Do-PreProcessing.ps1" $msg = "Pre-req: Code Formatting" Update-Progress "Pre-req: Allocating Memory" 0 Do-PreProcessing $msg diff --git a/tools/Do-PreProcessing.ps1 b/tools/Do-PreProcessing.ps1 new file mode 100644 index 00000000..cd29f506 --- /dev/null +++ b/tools/Do-PreProcessing.ps1 @@ -0,0 +1,33 @@ +function Do-PreProcessing { + param ( + [Parameter(Mandatory, position=0)] + [string]$ProgressStatusMessage, + + [Parameter(position=1)] + [string]$ProgressActivity = "Pre-Processing" + ) + + $excludedFiles = @('git\', '.gitignore', '.gitattributes', '.github\CODEOWNERS', 'LICENSE', 'winutil.ps1', 'docs\changelog.md', '*.png', '*.jpg', '*.jpeg', '*.exe') + + $files = Get-ChildItem $workingdir -Recurse -Exclude $excludedFiles -Attributes !Directory + $numOfFiles = $files.Count + + for ($i = 0; $i -lt $numOfFiles; $i++) { + $file = $files[$i] + # TODO: + # make more formatting rules, and document them in WinUtil Official Documentation + (Get-Content -Raw "$file").TrimEnd() ` + -replace ('\t', ' ') ` + -replace ('\)\{', ') {') ` + -replace ('\)\r?\n\s*{', ') {') ` + -replace ('Try \{', 'try {') ` + -replace ('try\{', 'try {') ` + -replace ('try\r?\n\s*\{', 'try {') ` + -replace ('}\r?\n\s*catch', '} catch') ` + -replace ('\} catch', '} catch') ` + | Set-Content "$file" + Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished $i out of $numOfFiles" -PercentComplete (($i/$numOfFiles)*100) + } + + Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished Task Successfully" -Completed +}