Merge pull request #285 from papundekel/284-better-directory-layout

284 better directory layout

.github/workflows/test.yml

@@ -178,7 +178,7 @@ jobs:
  - name: Install fakealpm dependencies
  uses: awalsh128/[email protected]
  with:
- packages: libarchive-dev libalpm-dev gcc cmake ninja-build libboost-dev nlohmann-json3-dev
+ packages: libarchive-dev libalpm-dev gcc cmake ninja-build libboost-all-dev nlohmann-json3-dev
 
  - name: Build fakelpm
- run: ./installer/pacman/fakealpm/build.sh installer/pacman/fakealpm/ installer/pacman/fakealpm/build/ /usr/local
+ run: ./src/installer/pacman/fakealpm/build.sh src/installer/pacman/fakealpm/ build/fakealpm/ /usr/local

Dockerfile

@@ -15,7 +15,7 @@ RUN pacman --noconfirm -S ninja
 RUN pacman --noconfirm -S boost
 RUN pacman --noconfirm -S nlohmann-json
 
-COPY installer/pacman/fakealpm/ /workdir/fakealpm
+COPY src/installer/pacman/fakealpm/ /workdir/fakealpm
 RUN ./fakealpm/build.sh fakealpm/ fakealpm/build/ /usr/local
 
 # -----------------------------------------------------------------------------
@@ -34,45 +34,45 @@ RUN pip install --upgrade pip
 
 FROM base-python AS updater
 
-COPY utils/async/ /workdir/utils/async
+COPY src/utils/async/ /workdir/utils/async
 RUN pip install utils/async
 
-COPY repository-driver/interface/ /workdir/repository-driver/interface
+COPY src/repository-driver/interface/ /workdir/repository-driver/interface
 RUN pip install repository-driver/interface/
 
 
 
-COPY utils/json /workdir/utils/json
+COPY src/utils/json /workdir/utils/json
 RUN pip install utils/json
 
-COPY utils/cli /workdir/utils/cli
+COPY src/utils/cli /workdir/utils/cli
 RUN pip install utils/cli
 
-COPY utils/python /workdir/utils/python
+COPY src/utils/python /workdir/utils/python
 RUN pip install utils/python
 
-COPY repository-driver/update/ /workdir/repository-driver/update
+COPY src/repository-driver/update/ /workdir/repository-driver/update
 RUN pip install repository-driver/update/
 
 
 
-COPY utils/file/ /workdir/utils/file
+COPY src/utils/file/ /workdir/utils/file
 RUN pip install utils/file
 
-COPY utils/lock/ /workdir/utils/lock
+COPY src/utils/lock/ /workdir/utils/lock
 RUN pip install utils/lock
 
-COPY repository-driver/pacman/ /workdir/repository-driver/pacman
+COPY src/repository-driver/pacman/ /workdir/repository-driver/pacman
 RUN pip install repository-driver/pacman/
 
 
 
-COPY repository-driver/AUR/ /workdir/repository-driver/AUR
+COPY src/repository-driver/AUR/ /workdir/repository-driver/AUR
 RUN pip install repository-driver/AUR/
 
 
 
-COPY repository-driver/conan/ /workdir/repository-driver/conan
+COPY src/repository-driver/conan/ /workdir/repository-driver/conan
 RUN pip install repository-driver/conan/
 
 
@@ -101,7 +101,7 @@ RUN pacman --noconfirm -S jdk-openjdk
 
 COPY --from=sat4j /workdir/sat4j/ /workdir/sat4j
 
-COPY solver/ /workdir/solver
+COPY src/solver/ /workdir/solver
 
 RUN javac -classpath /workdir/sat4j/org.sat4j.core.jar /workdir/solver/Solver.java
 
@@ -116,77 +116,77 @@ ARG USER=root
 COPY --from=fakealpm /usr/local/bin/fakealpm /usr/local/bin/fakealpm
 COPY --from=fakealpm /usr/local/bin/fakealpm-executable /usr/local/bin/fakealpm-executable
 
-COPY utils/json /workdir/utils/json
+COPY src/utils/json /workdir/utils/json
 RUN pip install utils/json
 
-COPY utils/async /workdir/utils/async
+COPY src/utils/async /workdir/utils/async
 RUN pip install utils/async
 
-COPY utils/cli /workdir/utils/cli
+COPY src/utils/cli /workdir/utils/cli
 RUN pip install utils/cli
 
-COPY utils/container /workdir/utils/container
+COPY src/utils/container /workdir/utils/container
 RUN pip install utils/container
 
-COPY utils/file /workdir/utils/file
+COPY src/utils/file /workdir/utils/file
 RUN pip install utils/file
 
-COPY utils/lock /workdir/utils/lock
+COPY src/utils/lock /workdir/utils/lock
 RUN pip install utils/lock
 
-COPY utils/python /workdir/utils/python
+COPY src/utils/python /workdir/utils/python
 RUN pip install utils/python
 
-COPY utils/serialization /workdir/utils/serialization
+COPY src/utils/serialization /workdir/utils/serialization
 RUN pip install utils/serialization
 
 
 
-COPY repository-driver/interface/ /workdir/repository-driver/interface
+COPY src/repository-driver/interface/ /workdir/repository-driver/interface
 RUN pip install repository-driver/interface/
 
-COPY repository-driver/pacman/ /workdir/repository-driver/pacman
+COPY src/repository-driver/pacman/ /workdir/repository-driver/pacman
 RUN pip install repository-driver/pacman/
 
-COPY repository-driver/AUR/ /workdir/repository-driver/AUR
+COPY src/repository-driver/AUR/ /workdir/repository-driver/AUR
 RUN pip install repository-driver/AUR/
 
-COPY repository-driver/conan/ /workdir/repository-driver/conan
+COPY src/repository-driver/conan/ /workdir/repository-driver/conan
 RUN pip install repository-driver/conan/
 
 
 
-COPY translator/interface/ /workdir/translator/interface
+COPY src/translator/interface/ /workdir/translator/interface
 RUN pip install translator/interface/
 
-COPY translator/pacman/ /workdir/translator/pacman
+COPY src/translator/pacman/ /workdir/translator/pacman
 RUN pip install translator/pacman/
 
-COPY translator/conan/ /workdir/translator/conan
+COPY src/translator/conan/ /workdir/translator/conan
 RUN pip install translator/conan/
 
 
 
-COPY installer/interface/ /workdir/installer/interface
+COPY src/installer/interface/ /workdir/installer/interface
 RUN pip install installer/interface/
 
-COPY installer/pacman/ /workdir/installer/pacman
+COPY src/installer/pacman/ /workdir/installer/pacman
 RUN pip install installer/pacman/
 
-COPY installer/conan/ /workdir/installer/conan
+COPY src/installer/conan/ /workdir/installer/conan
 RUN pip install installer/conan/
 
 
 
-COPY generator/interface/ /workdir/generator/interface
+COPY src/generator/interface/ /workdir/generator/interface
 RUN pip install generator/interface/
 
-COPY generator/conan/ /workdir/generator/conan
+COPY src/generator/conan/ /workdir/generator/conan
 RUN pip install generator/conan/
 
 
 
-COPY metamanager/ /workdir/metamanager
+COPY src/metamanager/ /workdir/metamanager
 RUN pip install metamanager/
 
 ENTRYPOINT [ "python", "-m", "PPpackage.metamanager" ]

README.md

@@ -349,7 +349,7 @@ All examples use config `unix://$XDG_RUNTIME_DIR/podman/podman.sock` for the con
 The SAT solver the meta-manager uses is invoked as a container. Therefore the image for the solver needs to be built.
 
 ```bash
-./solver/image-build.sh $containerizer
+./image-build.sh $containerizer solver
 ```
 
 #### Native invocation
@@ -399,7 +399,8 @@ WARNING: `docker-compose` 1.X is not compatible. Use version 2.X.
 It is *optional* to build the images yourself. They are hosted on [dockerhub](https://hub.docker.com/).
 
 ```bash
-./images-build.sh $containerizer
+./image-build.sh $containerizer metamanager
+./image-build.sh $containerizer updater
 ```
 
 Docker requires more configuration because of how

image-build.sh

@@ -0,0 +1,13 @@
+usage="Usage: $0 [docker | podman] [solver | metamanager | updater]"
+
+if [ -z "$1" ] || ([ "$1" != "docker" ] && [ "$1" != "podman" ]); then
+ echo "$usage"
+ exit 1
+fi
+
+if [ -z "$2" ] || ([ "$2" != "solver" ] && [ "$2" != "metamanager" ] && [ "$2" != "updater" ]); then
+ echo "$usage"
+ exit 2
+fi
+
+"$1" build --target "$2" --tag "docker.io/fackop/pppackage-$2:latest" .

requirements-dev.txt

@@ -2,45 +2,45 @@ pre-commit
 hypercorn
 setuptools
 
--e ./utils/json --config-settings editable_mode=compat
--e ./utils/async --config-settings editable_mode=compat
--e ./utils/cli --config-settings editable_mode=compat
--e ./utils/container --config-settings editable_mode=compat
--e ./utils/file --config-settings editable_mode=compat
--e ./utils/lock --config-settings editable_mode=compat
--e ./utils/python --config-settings editable_mode=compat
--e ./utils/serialization --config-settings editable_mode=compat
+-e ./src/utils/json --config-settings editable_mode=compat
+-e ./src/utils/async --config-settings editable_mode=compat
+-e ./src/utils/cli --config-settings editable_mode=compat
+-e ./src/utils/container --config-settings editable_mode=compat
+-e ./src/utils/file --config-settings editable_mode=compat
+-e ./src/utils/lock --config-settings editable_mode=compat
+-e ./src/utils/python --config-settings editable_mode=compat
+-e ./src/utils/serialization --config-settings editable_mode=compat
 
 
 
--e ./repository-driver/interface/ --config-settings editable_mode=compat
+-e ./src/repository-driver/interface/ --config-settings editable_mode=compat
 
--e ./repository-driver/update/
+-e ./src/repository-driver/update/
 
--e ./repository-driver/conan/
--e ./repository-driver/pacman/
--e ./repository-driver/AUR/
+-e ./src/repository-driver/conan/
+-e ./src/repository-driver/pacman/
+-e ./src/repository-driver/AUR/
 
 
 
--e ./installer/interface/ --config-settings editable_mode=compat
+-e ./src/installer/interface/ --config-settings editable_mode=compat
 
--e ./installer/pacman/
--e ./installer/conan/
+-e ./src/installer/pacman/
+-e ./src/installer/conan/
 
 
 
--e ./translator/interface/ --config-settings editable_mode=compat
+-e ./src/translator/interface/ --config-settings editable_mode=compat
 
--e ./translator/pacman/
--e ./translator/conan/
+-e ./src/translator/pacman/
+-e ./src/translator/conan/
 
 
 
--e ./generator/interface/ --config-settings editable_mode=compat
+-e ./src/generator/interface/ --config-settings editable_mode=compat
 
--e ./generator/conan/
+-e ./src/generator/conan/
 
 
 
--e ./metamanager/
+-e ./src/metamanager/