Skip to content

Commit

Permalink
Prune Makefile targets, drop unused scripts
Browse files Browse the repository at this point in the history
Remove some unused Makefile targets, as well as scripts:

- build-debug-python
- clean-branches
- vagrant-test

We can also remove the `sdist` step as this is exercised by the
`package-source` job.
  • Loading branch information
jlaine committed Nov 2, 2023
1 parent 66b3a66 commit 4e5a7eb
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 220 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ jobs:
. scripts/activate.sh ffmpeg-${{ matrix.config.ffmpeg }}
scripts/test examples
- name: Source Distribution
if: matrix.config.extras
run: |
. scripts/activate.sh ffmpeg-${{ matrix.config.ffmpeg }}
scripts/test sdist
windows:
name: "py-${{ matrix.config.python }} lib-${{ matrix.config.ffmpeg }} ${{matrix.config.os}}"
runs-on: ${{ matrix.config.os }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
# Testing.
*.spyderproject
.idea
/.vagrant
/sandbox
/tests/assets
/tests/samples
56 changes: 8 additions & 48 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,21 @@ PYAV_PYTHON ?= python
PYTHON := $(PYAV_PYTHON)


.PHONY: default build cythonize clean clean-all info lint test fate-suite test-assets docs
.PHONY: default build clean docs fate-suite lint test

default: build


build:
CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) $(PYTHON) setup.py build_ext --inplace --debug

cythonize:
$(PYTHON) setup.py cythonize



wheel: build-mingw32
$(PYTHON) setup.py bdist_wheel

build-mingw32:
# before running, set PKG_CONFIG_PATH to the pkgconfig dir of the ffmpeg build.
# set PKG_CONFIG_PATH=D:\dev\3rd\media-autobuild_suite\local32\bin-video\ffmpegSHARED\lib\pkgconfig
CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) $(PYTHON) setup.py build_ext --inplace -c mingw32
mv *.pyd av


clean:
- find av -name '*.so' -delete
- rm -rf build
- rm -rf sandbox
- rm -rf src
- rm -rf tmp
- make -C docs clean

fate-suite:
# Grab ALL of the samples from the ffmpeg site.
Expand All @@ -41,16 +33,6 @@ lint:
test:
$(PYTHON) setup.py test



vagrant:
vagrant box list | grep -q precise32 || vagrant box add precise32 http://files.vagrantup.com/precise32.box

vtest:
vagrant ssh -c /vagrant/scripts/vagrant-test



tmp/ffmpeg-git:
@ mkdir -p tmp/ffmpeg-git
git clone --depth=1 git://source.ffmpeg.org/ffmpeg.git tmp/ffmpeg-git
Expand All @@ -67,25 +49,3 @@ docs: tmp/tagfile.xml

deploy-docs: docs
./docs/upload docs




clean-build:
- rm -rf build
- find av -name '*.so' -delete

clean-sandbox:
- rm -rf sandbox/201*
- rm sandbox/last

clean-src:
- rm -rf src

clean-docs:
- rm tmp/Doxyfile
- rm tmp/tagfile.xml
- make -C docs clean

clean: clean-build clean-sandbox clean-src
clean-all: clean-build clean-sandbox clean-src clean-docs
33 changes: 0 additions & 33 deletions scripts/build-debug-python

This file was deleted.

120 changes: 0 additions & 120 deletions scripts/clean-branches

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ if istest main; then
$PYAV_PYTHON setup.py test
fi

if istest sdist; then
$PYAV_PYTHON setup.py build_ext
$PYAV_PYTHON setup.py sdist
fi

if istest doctest; then
make -C docs test
fi
Expand Down
7 changes: 0 additions & 7 deletions scripts/vagrant-test

This file was deleted.

0 comments on commit 4e5a7eb

Please sign in to comment.