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

change DESTDIR so brew can install properly #18

Closed
wants to merge 3 commits into from
Closed
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

CppBlockUtils.py
_CppBlockUtils.*
qrc_img_resources.py
/cppForSwig/CppBlockUtils_wrap.cxx
/cppForSwig/libcryptopp.a
/cppForSwig/cryptopp/a.out
Expand Down
2 changes: 2 additions & 0 deletions ArmoryQt.command
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
PYTHONPATH=`brew --prefix`/lib/python2.7/site-packages /usr/bin/python `brew --prefix wysenynja/bitcoin/armory-qt`/share/armory/ArmoryQt.py
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# All the actual Makefiles are deeper in the directory tree.
# I am just calling them, here.
DESTDIR ?= /usr

all :
cd cppForSwig; make swig
Expand All @@ -8,8 +9,8 @@ clean :
cd cppForSwig; make clean

install :
mkdir -p $(DESTDIR)/usr/share/armory/img
cp *.py *.so README LICENSE $(DESTDIR)/usr/share/armory/
cp img/* $(DESTDIR)/usr/share/armory/img
mkdir -p $(DESTDIR)/usr/share/applications
cp dpkgfiles/armory*.desktop $(DESTDIR)/usr/share/applications/
mkdir -p $(DESTDIR)/share/armory/img
cp *.py *.so README LICENSE $(DESTDIR)/share/armory/
cp img/* $(DESTDIR)/share/armory/img
mkdir -p $(DESTDIR)/share/applications
cp dpkgfiles/armory*.desktop $(DESTDIR)/share/applications/
32 changes: 26 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
#! /usr/bin/python
from distutils.core import setup
import py2exe
#!/usr/bin/env python
import sys
from setuptools import setup

try:
cmd = sys.argv[1]
except IndexError:
print 'Usage: setup.py install|py2exe|py2app|cx_freeze'
raise SystemExit

setup( windows = ['../ArmoryQt.py'] )
#options = {'py2exe': {'bundle_files': 1}}, \
#zipfile = None )
if cmd == 'py2exe':
import py2exe

setup( windows = ['../ArmoryQt.py'] )

elif cmd == 'py2app':
import py2app

APP = ['ArmoryQt.py']
DATA_FILES = []
OPTIONS = {'argv_emulation': False}

setup(
app=APP,
data_files=DATA_FILES,
options={'py2app': OPTIONS},
setup_requires=['py2app'],
)