add suggestions from ehashman

pull/34/head
Max Erenberg 1 year ago
parent 2493bb1a6b
commit 3218938909
  1. 10
      Makefile
  2. 4
      README.md
  3. 1
      debian/control
  4. 3
      debian/gbp.conf

@ -1,22 +1,21 @@
#!/usr/bin/make -f
SCDFILES = $(wildcard docs/*.scd)
MANPAGES = $(patsubst docs/%.scd,docs/%,${SCDFILES})
CEO_HOME = /var/lib/ceo
all: build
build: docs venv
venv:
python3 -m venv venv && \
. venv/bin/activate && \
pip install -r dev-requirements.txt && \
pip install setuptools wheel && \
pip install -r requirements.txt && \
python setup.py install
install:
@# Prepare the virtualenv to be moved (dangerous!)
@# Make sure you don't have '|' in your paths
grep -IRl $(CURDIR)/venv venv | \
grep -IRl $(CURDIR)/venv venv/bin | \
xargs perl -pe 's|\Q$(CURDIR)/venv\E|$(CEO_HOME)/venv|g' -i
mkdir -p $(DESTDIR)$(CEO_HOME)
mv venv $(DESTDIR)$(CEO_HOME)
@ -29,5 +28,6 @@ docs:
clean:
rm -f ${MANPAGES}
rm -rf venv
rm -rf debian/{ceo,ceod,ceo-common,tmp}
.PHONY: all build docs clean venv install
.PHONY: build docs clean venv install

@ -239,14 +239,14 @@ Make sure you git commit your changes *before* building the packages.
To build unsigned packages:
```sh
gbp buildpackage --git-ignore-new --git-upstream-tree=BRANCH --git-upstream-branch=master -uc -us
gbp buildpackage --git-upstream-branch=master -uc -us
```
To build signed packages (for uploading), you need to have your GPG key ready, and it should also
be in the CSC mirror keyring.
Once you have done that, replace '-uc -us' by '-k<your_gpg_key_id>', e.g.
```sh
gbp buildpackage --git-ignore-new --git-upstream-tree=BRANCH --git-upstream-branch=master -k8E5568ABB0CF96BC367806ED127923BE10DA48DC
gbp buildpackage --git-upstream-branch=master -k8E5568ABB0CF96BC367806ED127923BE10DA48DC
```
This will create a bunch of files (deb, dsc, tar.gz, etc.) in the parent directory.

1
debian/control vendored

@ -4,6 +4,7 @@ Section: admin
Priority: optional
Standards-Version: 4.3.0
Vcs-Git: https://git.csclub.uwaterloo.ca/public/pyceo.git
Vcs-Browser: https://git.csclub.uwaterloo.ca/public/pyceo
Uploaders: Max Erenberg <merenber@csclub.uwaterloo.ca>
Build-Depends: debhelper (>= 12.1.1),
python3-dev (>= 3.7),

3
debian/gbp.conf vendored

@ -0,0 +1,3 @@
[buildpackage]
ignore-new = True
upstream-tree = BRANCH
Loading…
Cancel
Save