[librsvg: 1/7] Switch to rsync for copy to exclude git
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 1/7] Switch to rsync for copy to exclude git
- Date: Wed, 25 Aug 2021 03:27:32 +0000 (UTC)
commit 4e83432c3152b39550ec8288d6cd4b35707e4856
Author: Madds H <madds hollandart io>
Date: Mon Aug 23 19:14:08 2021 -0500
Switch to rsync for copy to exclude git
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/579>
tools/docker/build-librsvg.sh | 2 +-
tools/docker/docker-test.sh | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/tools/docker/build-librsvg.sh b/tools/docker/build-librsvg.sh
index 490e2e5d..b0a3d0f8 100755
--- a/tools/docker/build-librsvg.sh
+++ b/tools/docker/build-librsvg.sh
@@ -1,4 +1,4 @@
#!/bin/bash
cd /tmp/librsvg/
sh /tmp/librsvg/autogen.sh
-make check
+cargo check
diff --git a/tools/docker/docker-test.sh b/tools/docker/docker-test.sh
index 3d019a81..d1f1de5b 100755
--- a/tools/docker/docker-test.sh
+++ b/tools/docker/docker-test.sh
@@ -27,7 +27,7 @@ function copy_build_script {
}
#Package librsvg for inclusion in the Docker image
-function package_librsvg {
+function prepare_librsvg {
echo "Packaging Librsvg"
if [[ ! -f "$SYS/librsvg.tar.gz" ]]
@@ -39,7 +39,9 @@ function package_librsvg {
mkdir $TMPDIR
echo "Copying librsvg to $TMPDIR"
- cp -r $LIBDIR/. $TMPDIR
+ rsync -av --exclude '.git' --exclude 'target' $LIBDIR/ $TMPDIR/
+ #Uncomment this line if your distro doesn't have rsync, it'll make a lot of text when copying
the git folder, but works
+ #cp -r $LIBDIR/. $TMPDIR
cd $TMPDIR
#Run autogen, this prepares librsvg for building, and allows make clean to be ran
@@ -231,7 +233,7 @@ function main {
check_dir
check_system
copy_build_script
- package_librsvg
+ prepare_librsvg
build_base_image
build_docker
run_docker
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]