Skip to content

Commit

Permalink
Merge pull request #51 from JoeLametta/setuptools
Browse files Browse the repository at this point in the history
use setuptools, remove autohell, use raw make for src/
  • Loading branch information
JoeLametta authored Oct 20, 2016
2 parents b2ca316 + 2dae462 commit 042abce
Show file tree
Hide file tree
Showing 30 changed files with 99 additions and 923 deletions.
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

0 comments on commit 042abce

Please sign in to comment.