From 8790f89e085ca1c475b36e9be065d3115a251e78 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 26 Apr 2023 18:40:47 +0000 Subject: [PATCH] fix installing from source tarball --- docs/devnotes.md | 22 ++++++++++++++++++++++ scripts/make-tgz-release.sh | 4 +++- scripts/rls.sh | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/docs/devnotes.md b/docs/devnotes.md index 8920ddb4..ce5cf826 100644 --- a/docs/devnotes.md +++ b/docs/devnotes.md @@ -17,6 +17,7 @@ * [building](#building) * [dev env setup](#dev-env-setup) * [just the sfx](#just-the-sfx) + * [build from release tarball](#build-from-release-tarball) - uses the included prebuilt webdeps * [complete release](#complete-release) * [todo](#todo) - roughly sorted by priority * [discarded ideas](#discarded-ideas) @@ -255,10 +256,31 @@ then build the sfx using any of the following examples: ``` +## build from release tarball + +uses the included prebuilt webdeps + +if you downloaded a [release](https://github.com/9001/copyparty/releases) source tarball from github (for example [copyparty-1.6.15.tar.gz](https://github.com/9001/copyparty/releases/download/v1.6.15/copyparty-1.6.15.tar.gz) so not the autogenerated one) you can build it like so, + +```bash +python3 setup.py install --user +``` + +or if you're packaging it for a linux distro (nice), maybe something like + +```bash +bash scripts/run-tests.sh python3 # optional +python3 setup.py build +python3 setup.py install --skip-build --prefix=/usr --root=$HOME/pe/copyparty +``` + + ## complete release also builds the sfx so skip the sfx section above +does everything completely from scratch, straight from your local repo + in the `scripts` folder: * run `make -C deps-docker` to build all dependencies diff --git a/scripts/make-tgz-release.sh b/scripts/make-tgz-release.sh index eafae00d..457bb3f7 100755 --- a/scripts/make-tgz-release.sh +++ b/scripts/make-tgz-release.sh @@ -64,6 +64,8 @@ git archive hovudstraum | tar -xC "$rls_dir" echo ">>> export untracked deps" tar -c copyparty/web/deps | tar -xC "$rls_dir" +scripts/genlic.sh "$rls_dir/copyparty/res/COPYING.txt" + cd "$rls_dir" find -type d -exec chmod 755 '{}' \+ find -type f -exec chmod 644 '{}' \+ @@ -93,7 +95,7 @@ rm \ .gitattributes \ .gitignore -mv LICENSE LICENSE.txt +cp -pv LICENSE LICENSE.txt # the regular cleanup memes find -name '*.pyc' -delete diff --git a/scripts/rls.sh b/scripts/rls.sh index 735326f2..c9ea9f92 100755 --- a/scripts/rls.sh +++ b/scripts/rls.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -parallel=2 +parallel=1 [ -e make-sfx.sh ] || cd scripts [ -e make-sfx.sh ] && [ -e deps-docker ] || {