Skip to content

Instantly share code, notes, and snippets.

@thiagodasilva
Last active December 20, 2016 20:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save thiagodasilva/d63c79d480b87803c1a35b2080082801 to your computer and use it in GitHub Desktop.
Save thiagodasilva/d63c79d480b87803c1a35b2080082801 to your computer and use it in GitHub Desktop.
merge liberasurecode and pyeclib
create libec repo (throw-away)
$ git clone libec
$ git rm README.md
$ git commit -m 'remove dummy README'
$ git remote add -f pyeclib https://github.com/openstack/pyeclib.git
$ git merge pyeclib/master
$ mkdir py
$ git mv src py/
$ git mv pyeclib py/
$ git mv test py/
$ git mv ChangeLog py/
$ git mv tools py/
$ git rm License.txt
$ git rm Makefile
$ git rm README.rst
$ git commit -m "merge pyeclib"
$ git remote add -f liberasurecode https://github.com/openstack/liberasurecode.git
$ git merge liberasurecode/master
manually merge files:
.gitignore
.gitreview
.mailmap
AUTHORS
bindep.txt
$ git add .gitreview .mailmap AUTHORS bindep.txt
*** build, test and install liberasurecode
$ ./autogen.sh
$ ./configure
$ make
$ make test
$ sudo make install
add /usr/local/lib to /etc/ld.so.conf
$sudo ldconfig
***
edit setup.py
edit tox.ini
edit .unittests
edit MANIFEST.in
$ sudo pip install -U bindep -r test-requirements.txt
$ sudo python setup.py install
$ .unittests
$ tox -e pep8
$ tox -e py27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment