n4chung
/
pyceo
forked from public/pyceo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add suggestions from ehashman

This commit is contained in:
Max Erenberg 2021-10-28 21:53:51 -04:00
parent 2493bb1a6b
commit 3218938909
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

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

4
README.md
View File

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

1
debian/control vendored
View File

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

3
debian/gbp.conf vendored Normal file
View File

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