Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use setuptools, remove autohell, use raw make for src/ #51

Merged
merged 2 commits into from
Oct 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
*.pyc
INSTALL
Makefile
Makefile.in
aclocal.m4
autom4te.cache
autoregen.sh
config.log
config.status
configure
!*/configure
install-sh
missing
morituri.spec
py-compile
REVISION
*.o
.deps
/compile
/depcomp

# For Python development using Eclipse IDE
.project
Expand Down
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@ install:
- sudo apt-get install -qq gstreamer0.10-tools python-gst0.10
- sudo pip install twisted

# Checkout
- ./autogen.sh

# Building
- ./configure
- make
# Build bundled C utils
- cd src
- sudo make install
- cd ..

# Installing
- sudo make install
- sudo python setup.py install

script:
- python -m unittest discover
50 changes: 0 additions & 50 deletions Makefile.am

This file was deleted.

20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,22 @@ use whipper installed or uninstalled.
git submodule init
git submodule update
export PYTHON=$(which python2)
./autogen.sh

- building:
- building bundled dependencies

./configure
make
This is only needed if you do not have the 'accuraterip-checksum' package installed on
your system. whipper packages this for your convenience:

- you can now choose to install it or run it uninstalled.
You can edit the install path in `config.mk`.

- installing:
cd src
make
sudo make install
cd ..

make install
- installation

- running uninstalled (within the make directory):

./misc/morituri-uninstalled rip <commands>
python2 setup.py install

RUNNING WHIPPER
----------------
Expand Down
13 changes: 0 additions & 13 deletions autogen.sh

This file was deleted.

1 change: 0 additions & 1 deletion bin/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions bin/Makefile.am

This file was deleted.

38 changes: 0 additions & 38 deletions bin/rip.in

This file was deleted.

89 changes: 0 additions & 89 deletions configure.ac

This file was deleted.

1 change: 0 additions & 1 deletion etc/Makefile.am

This file was deleted.

13 changes: 0 additions & 13 deletions etc/bash_completion.d/Makefile.am

This file was deleted.

Loading