Skip to content
Extraits de code Groupes Projets
Vérifiée Valider b8558556 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Trying again to do things in the docker build

parent 46ff6937
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!197Draft: Refactor the whole code.
.build/ .build/
.build.*/ .build.*/
.dockerignore .dockerignore
*.AppImage
target/ target/
appimage/ appimage/
......
...@@ -7,10 +7,7 @@ mod listen; ...@@ -7,10 +7,7 @@ mod listen;
mod mpris; mod mpris;
mod routes; mod routes;
pub use app::*; pub use self::{app::*, config::*, error::*, listen::*};
pub use config::*;
pub use error::*;
pub use listen::*;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use cmd::SubCommand; use cmd::SubCommand;
......
#!/usr/bin/env bash #!/usr/bin/env bash
set -xe set -e
[ ! -f /build/.gitignore ] && { [ ! -f /build/.gitignore ] && {
echo "The appimage folder is not mounted in the docker" echo "The appimage folder is not mounted in the docker"
exit 1 exit 1
......
...@@ -22,5 +22,4 @@ else ...@@ -22,5 +22,4 @@ else
for PKG in kurisu_api lektor_* lkt amadeus lektord; do for PKG in kurisu_api lektor_* lkt amadeus lektord; do
cargo clean -p ${PKG} cargo clean -p ${PKG}
done done
rm -rf kurisu_api lektor_* lkt amadeus lektord
fi fi
#!/usr/bin/env bash #!/usr/bin/env bash
set -xe set -e
ARCH=$(arch) ARCH=$(arch)
PKG_BASE="make libmpv-dev cmake clang clang-format manpages man-db" PKG_BASE="make libmpv-dev cmake clang clang-format manpages man-db"
......
...@@ -7,10 +7,11 @@ shopt -s globstar ...@@ -7,10 +7,11 @@ shopt -s globstar
exit 1 exit 1
} }
# Remove the thing we used to setup the build cache...
rm -rf kurisu_api lektor_* lkt amadeus lektord
# Get the sources... # Get the sources...
for THING in /src/*; do for SOURCE in /src/**; do
cp -rf ${THING} . [ -f ${SOURCE} ] \
&& [[ ! ${SOURCE} == "/src/build"* ]] \
&& [[ ! ${SOURCE} == "/src/utils"* ]] \
&& [[ ! ${SOURCE} == "/src/compile_commands.json" ]] \
&& install -CD ${SOURCE} $(realpath --relative-base=/src/ ${SOURCE})
done done
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter