diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index 58aa0a1..007223f 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -8,6 +8,7 @@ on:
pull_request:
branches:
- master
+ - main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.gitignore b/.gitignore
index c2c1ee0..8091212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.so
# Unit test / coverage reports
+use/*/
htmlcov/
.tox/
.coverage
@@ -27,3 +28,4 @@ docs/_build/
*.bak
*.ppu
*.old
+**.compiled
diff --git a/clean.sh b/clean.sh
deleted file mode 100644
index bed3aa8..0000000
--- a/clean.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# Clean up all temporary files
-find . -iname '*.compiled' -delete
-find . -iname '*.ppu' -delete
-find . -iname '*.o' -delete
-find src/ -iname '*.bak' -delete
-find src/ -iname '*.or' -delete
-
-rm -f src/lazview.res lazview
-rm -f tools/extractdwrflnfo
-rm -rf src/lib
-rm -rf src/backup
-rm -r units/*
-rm -f src/versionitis
-
-# Remove debug files
-rm -f awgg.dbg
-rm -rf awgg.dSYM
-rm -f awgg
diff --git a/make.sh b/make.sh
index 9c812b2..5fa8b6d 100644
--- a/make.sh
+++ b/make.sh
@@ -9,6 +9,23 @@ Options:
EOF
)
+function priv_clean
+(
+ # Clean up all temporary files
+ find . -iname '*.compiled' -delete
+ find . -iname '*.ppu' -delete
+ find . -iname '*.o' -delete
+ find src/ -iname '*.bak' -delete
+ find src/ -iname '*.or' -delete
+
+ rm -f src/lazview.res lazview
+ rm -f tools/extractdwrflnfo
+ rm -rf src/lib
+ rm -rf src/backup
+ rm -r units/*
+ rm -f src/versionitis
+)
+
function priv_lazbuild
(
if ! (which lazbuild); then
@@ -16,31 +33,34 @@ function priv_lazbuild
case ${ID:?} in
debian | ubuntu)
sudo apt-get update
- sudo apt-get install -y lazarus
+ sudo apt-get install -y lazarus{-ide-qt5,}
;;
esac
fi
- if [[ -f 'use/components.txt' ]]; then
- git submodule update --init --recursive
- git submodule update --recursive --remote
- while read -r; do
- if [[ -n "${REPLY}" ]] &&
- ! (lazbuild --verbose-pkgsearch "${REPLY}") &&
- ! (lazbuild --add-package "${REPLY}") &&
- ! [[ -e "use/${REPLY}" ]]; then
- declare -A VAR=(
- [url]="https://packages.lazarus-ide.org/${REPLY}.zip"
- [out]=$(mktemp)
- )
- wget --output-document "${VAR[out]}" "${VAR[url]}" 2>/dev/null
- unzip -o "${VAR[out]}" -d "use/${REPLY}"
- rm --verbose "${VAR[out]}"
- fi
- done < 'use/components.txt'
- find 'use' -type 'f' -name '*.lpk' -exec lazbuild --add-package-link {} +
+ declare -r COMPONENTS='use/components.txt'
+ if [[ -d "${COMPONENTS%%/*}" ]]; then
+ git submodule update --init --recursive --force --remote
+ if [[ -f "${COMPONENTS}" ]]; then
+ while read -r; do
+ if [[ -n "${REPLY}" ]] &&
+ ! (lazbuild --verbose-pkgsearch "${REPLY}") &&
+ ! (lazbuild --add-package "${REPLY}") &&
+ ! [[ -d "${COMPONENTS%%/*}/${REPLY}" ]]; then
+ declare -A VAR=(
+ [url]="https://packages.lazarus-ide.org/${REPLY}.zip"
+ [out]=$(mktemp)
+ )
+ wget --output-document "${VAR[out]}" "${VAR[url]}" >/dev/null
+ unzip -o "${VAR[out]}" -d "${COMPONENTS%%/*}/${REPLY}"
+ rm --verbose "${VAR[out]}"
+ fi
+ done < "${COMPONENTS}"
+ fi
+ find "${COMPONENTS%%/*}" -type 'f' -name '*.lpk' -exec \
+ lazbuild --add-package-link {} +
fi
- find 'src' -type 'f' -name '*.lpi' \
- -exec lazbuild --no-write-project --recursive --no-write-project --build-mode=release {} + 1>&2
+ find 'src' -type 'f' -name '*.lpi' -exec \
+ lazbuild --no-write-project --recursive --no-write-project --widgetset=qt5 --build-mode=release {} + 1>&2
)
function priv_main
@@ -49,6 +69,7 @@ function priv_main
if ((${#})); then
case ${1} in
build) priv_lazbuild ;;
+ clean) priv_clean ;;
*) priv_clippit ;;
esac
else
diff --git a/src/lazview.res b/src/lazview.res
deleted file mode 100644
index 0912df0..0000000
Binary files a/src/lazview.res and /dev/null differ
diff --git a/use/PasLibVlc/Lazarus/Makefile.compiled b/use/PasLibVlc/Lazarus/Makefile.compiled
deleted file mode 100644
index 4a90bfd..0000000
--- a/use/PasLibVlc/Lazarus/Makefile.compiled
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/use/PasLibVlc/Lazarus/PasLibVlcPlayer.compiled b/use/PasLibVlc/Lazarus/PasLibVlcPlayer.compiled
deleted file mode 100644
index d5d7170..0000000
--- a/use/PasLibVlc/Lazarus/PasLibVlcPlayer.compiled
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/use/PasLibVlc/Lazarus/lib/x86_64-linux/paslibvlcplayer.compiled b/use/PasLibVlc/Lazarus/lib/x86_64-linux/paslibvlcplayer.compiled
deleted file mode 100644
index 6d9404a..0000000
--- a/use/PasLibVlc/Lazarus/lib/x86_64-linux/paslibvlcplayer.compiled
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/use/PasLibVlc/Lazarus/lib/x86_64-win64/PasLibVlcPlayer.compiled b/use/PasLibVlc/Lazarus/lib/x86_64-win64/PasLibVlcPlayer.compiled
deleted file mode 100644
index 3bb966f..0000000
--- a/use/PasLibVlc/Lazarus/lib/x86_64-win64/PasLibVlcPlayer.compiled
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/use/vlc/lib/x86_64-linux/lazvlc.compiled b/use/vlc/lib/x86_64-linux/lazvlc.compiled
deleted file mode 100755
index 7938024..0000000
--- a/use/vlc/lib/x86_64-linux/lazvlc.compiled
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-