remove make.files to .github

bgrabitmap · Jan 1, 2025 · 9edf65d · 9edf65d
1 parent 34c0d6e
commit 9edf65d
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 30 deletions.
diff --git a/make.ps1 → .github/workflows/make.ps1 b/make.ps1 → .github/workflows/make.ps1
@@ -9,35 +9,10 @@ Options:
 " | Out-Host
 }
 
-Function Request-File {
-    While ($Input.MoveNext()) {
-        New-Variable -Name VAR -Option Constant -Value @{
-            Uri = $Input.Current
-            OutFile = (Split-Path -Path $Input.Current -Leaf).Split('?')[0]
-        }
-        Invoke-WebRequest @VAR
-        Return $VAR.OutFile
-    }
-}
-
-Function Install-Program {
-    While ($Input.MoveNext()) {
-        Switch ((Split-Path -Path $Input.Current -Leaf).Split('.')[-1]) {
-            'msi' {
-                & msiexec /passive /package $Input.Current | Out-Null
-            }
-            Default {
-                & ".\$($Input.Current)" /SP- /VERYSILENT /SUPPRESSMSGBOXES /NORESTART | Out-Null
-            }
-        }
-        Remove-Item $Input.Current
-    }
-}
-
 Function Build-Project {
     New-Variable -Name VAR -Option Constant -Value @{
         Src = 'lazpaint'
-        Use = 'use'
+        Use = '.'
         Pkg = 'use\components.txt'
     }
     If (! (Test-Path -Path $Var.Src)) {
@@ -108,6 +83,31 @@ Function Build-Project {
     ).Sum
 }
 
+Function Request-File {
+    While ($Input.MoveNext()) {
+        New-Variable -Name VAR -Option Constant -Value @{
+            Uri = $Input.Current
+            OutFile = (Split-Path -Path $Input.Current -Leaf).Split('?')[0]
+        }
+        Invoke-WebRequest @VAR
+        Return $VAR.OutFile
+    }
+}
+
+Function Install-Program {
+    While ($Input.MoveNext()) {
+        Switch ((Split-Path -Path $Input.Current -Leaf).Split('.')[-1]) {
+            'msi' {
+                & msiexec /passive /package $Input.Current | Out-Null
+            }
+            Default {
+                & ".\$($Input.Current)" /SP- /VERYSILENT /SUPPRESSMSGBOXES /NORESTART | Out-Null
+            }
+        }
+        Remove-Item $Input.Current
+    }
+}
+
 Function Switch-Action {
     $ErrorActionPreference = 'stop'
     Set-PSDebug -Strict #-Trace 1

diff --git a/make.sh → .github/workflows/make.sh b/make.sh → .github/workflows/make.sh
@@ -13,7 +13,7 @@ function priv_lazbuild
 (
     declare -rA VAR=(
         [src]='lazpaint'
-        [use]='use'
+        [use]='.'
         [pkg]='use/components.txt'
     )
     if ! [[ -d "${VAR[src]}" ]]; then

diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
@@ -34,12 +34,12 @@ jobs:
     - name: Build on Linux
       if: runner.os == 'Linux'
       shell: bash
-      run: bash make.sh build
+      run: bash .github/workflows/make.sh build
 
     - name: Build on Windows
       if: runner.os == 'Windows'
       shell: powershell
-      run: pwsh -File make.ps1 build
+      run: pwsh -File .github/workflows/make.ps1 build
 
     - name: Archive
       if: runner.os == 'Windows'

diff --git a/use/lazpaintcontrols/lazpaintcontrols.lpk → lazpaintcontrols/lazpaintcontrols.lpk b/use/lazpaintcontrols/lazpaintcontrols.lpk → lazpaintcontrols/lazpaintcontrols.lpk
diff --git a/use/lazpaintcontrols/lazpaintcontrols.pas → lazpaintcontrols/lazpaintcontrols.pas b/use/lazpaintcontrols/lazpaintcontrols.pas → lazpaintcontrols/lazpaintcontrols.pas
diff --git a/use/lazpaintcontrols/lcresourcestring.pas → lazpaintcontrols/lcresourcestring.pas b/use/lazpaintcontrols/lcresourcestring.pas → lazpaintcontrols/lcresourcestring.pas
diff --git a/use/lazpaintcontrols/lcscaledpi.pas → lazpaintcontrols/lcscaledpi.pas b/use/lazpaintcontrols/lcscaledpi.pas → lazpaintcontrols/lcscaledpi.pas
diff --git a/use/lazpaintcontrols/lctoolbars.pas → lazpaintcontrols/lctoolbars.pas b/use/lazpaintcontrols/lctoolbars.pas → lazpaintcontrols/lctoolbars.pas
diff --git a/use/lazpaintcontrols/lcvectorclipboard.pas → lazpaintcontrols/lcvectorclipboard.pas b/use/lazpaintcontrols/lcvectorclipboard.pas → lazpaintcontrols/lcvectorclipboard.pas
diff --git a/use/lazpaintcontrols/lcvectorialfill.pas → lazpaintcontrols/lcvectorialfill.pas b/use/lazpaintcontrols/lcvectorialfill.pas → lazpaintcontrols/lcvectorialfill.pas
diff --git a/...zpaintcontrols/lcvectorialfillcontrol.pas → lazpaintcontrols/lcvectorialfillcontrol.pas b/...zpaintcontrols/lcvectorialfillcontrol.pas → lazpaintcontrols/lcvectorialfillcontrol.pas
diff --git a/...aintcontrols/lcvectorialfillinterface.pas → ...aintcontrols/lcvectorialfillinterface.pas b/...aintcontrols/lcvectorialfillinterface.pas → ...aintcontrols/lcvectorialfillinterface.pas
@@ -1407,6 +1407,6 @@ procedure TVectorialFillInterface.UpdateShapeFill(AShape: TVectorShape;
 end;
 
 begin
-  {$i ../../resources/fillimages.lrs}
+  {$i ../resources/fillimages.lrs}
 end.
 
diff --git a/use/lazpaintcontrols/lcvectormultishape.pas → lazpaintcontrols/lcvectormultishape.pas b/use/lazpaintcontrols/lcvectormultishape.pas → lazpaintcontrols/lcvectormultishape.pas
diff --git a/use/lazpaintcontrols/lcvectororiginal.pas → lazpaintcontrols/lcvectororiginal.pas b/use/lazpaintcontrols/lcvectororiginal.pas → lazpaintcontrols/lcvectororiginal.pas
diff --git a/use/lazpaintcontrols/lcvectorpolyshapes.pas → lazpaintcontrols/lcvectorpolyshapes.pas b/use/lazpaintcontrols/lcvectorpolyshapes.pas → lazpaintcontrols/lcvectorpolyshapes.pas
diff --git a/use/lazpaintcontrols/lcvectorrectshapes.pas → lazpaintcontrols/lcvectorrectshapes.pas b/use/lazpaintcontrols/lcvectorrectshapes.pas → lazpaintcontrols/lcvectorrectshapes.pas
diff --git a/use/lazpaintcontrols/lcvectorshapes.pas → lazpaintcontrols/lcvectorshapes.pas b/use/lazpaintcontrols/lcvectorshapes.pas → lazpaintcontrols/lcvectorshapes.pas
diff --git a/use/lazpaintcontrols/lcvectortextshapes.pas → lazpaintcontrols/lcvectortextshapes.pas b/use/lazpaintcontrols/lcvectortextshapes.pas → lazpaintcontrols/lcvectortextshapes.pas
-Original file line number
+Diff line change
@@ Expand Up @@
     end;
     begin
-      {$i ../../resources/fillimages.lrs}
+      {$i ../resources/fillimages.lrs}
     end.