0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Ports: Move packages.db from Ports/ to Build/

Browse source 
When removing and recreating the Build directory, it's quite annoying
having to edit/remove Ports/packages.db as the installer won't install
previously installed port dependencies again if they're still listed.
This problem is easily solved by just considering packages.db a
build-specific file.
This commit is contained in:
Linus Groh 2021-02-01 19:36:18 +01:00 • committed by Andreas Kling
parent 878d353c3d
commit 02520f16e3
Notes: sideshowbarker 2024-07-18 22:38:50 +09:00
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -37,7 +37,6 @@ compile_commands.json
.clang_complete
.clangd
*Endpoint.h
Ports/packages.db
.idea/
cmake-build-debug/
sync-local.sh

24
Ports/.port_include.sh
View file

@ -3,7 +3,7 @@ set -eu
SCRIPT=`dirname $0`
export SERENITY_ROOT=`realpath $SCRIPT/../`
prefix=$SERENITY_ROOT/Ports
packagesdb="$SERENITY_ROOT/Build/packages.db"
export CC=i686-pc-serenity-gcc
export CXX=i686-pc-serenity-g++
@ -186,18 +186,18 @@ func_defined clean_all || clean_all() {
done
}
addtodb() {
if [ ! -f "$prefix"/packages.db ]; then
echo "Note: $prefix/packages.db does not exist. Creating."
touch "$prefix"/packages.db
if [ ! -f "$packagesdb" ]; then
echo "Note: $packagesdb does not exist. Creating."
touch "$packagesdb"
fi
if ! grep -E "^(auto|manual) $port $version" "$prefix"/packages.db > /dev/null; then
if ! grep -E "^(auto|manual) $port $version" "$packagesdb" > /dev/null; then
echo "Adding $port $version to database of installed ports!"
if [ "${1:-}" = "--auto" ]; then
echo "auto $port $version" >> "$prefix"/packages.db
echo "auto $port $version" >> "$packagesdb"
else
echo "manual $port $version" >> "$prefix"/packages.db
echo "manual $port $version" >> "$packagesdb"
if [ ! -z "${dependlist:-}" ]; then
echo "dependency $port$dependlist" >> "$prefix/packages.db"
echo "dependency $port$dependlist" >> "$packagesdb"
fi
fi
else
@ -209,13 +209,13 @@ installdepends() {
dependlist="${dependlist:-} $depend"
done
for depend in $depends; do
if ! grep "$depend" "$prefix"/packages.db > /dev/null; then
if ! grep "$depend" "$packagesdb" > /dev/null; then
(cd "../$depend" && ./package.sh --auto)
fi
done
}
uninstall() {
if grep "^manual $port " "$prefix"/packages.db > /dev/null; then
if grep "^manual $port " "$packagesdb" > /dev/null; then
if [ -f plist ]; then
for f in `cat plist`; do
case $f in
@ -228,8 +228,8 @@ uninstall() {
esac
done
# Without || true, mv will not be executed if you are uninstalling your only remaining port.
grep -v "^manual $port " "$prefix"/packages.db > packages.dbtmp || true
mv packages.dbtmp "$prefix"/packages.db
grep -v "^manual $port " "$packagesdb" > packages.db.tmp || true
mv packages.db.tmp "$packagesdb"
else
>&2 echo "Error: This port does not have a plist yet. Cannot uninstall."
fi

5
Ports/README.md
View file

@ -20,7 +20,10 @@ configuration/compilation options, and some other things (see
To install a certain port, `cd` into its directory and run `./package.sh`
Installed ports are being tracked in `Ports/packages.db` (a simple text file).
Installed ports are being tracked in `Build/packages.db` (a simple text file).
You can delete this file at any time, in fact it must be edited or removed
when clearing the build directory as port dependencies may not be installed
again otherwise.
Not giving an option is equivalent to `installdepends`, `fetch`, `patch`,
`configure`, `build` and `install`, in that order. This is recommended for a