Skip to content

Commit

Permalink
Add html assets to everything, mark a few programs that need full builds
Browse files Browse the repository at this point in the history
  • Loading branch information
lppekows committed Oct 20, 2015
1 parent 0aee983 commit 2d5e51f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 14 deletions.
1 change: 1 addition & 0 deletions tools/static/cant_be_built
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pycbc_calculate_likelihood
pycbc_plot_hwinj
pycbc_mvsc_dag
pycbc_inspinjfind
pycbc_get_loudest_params
25 changes: 11 additions & 14 deletions tools/static/hooks/hook-pycbc.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import os
from PyInstaller.hooks.hookutils import (collect_data_files, collect_submodules)

# Executables that need the html assets
needs_assets = ['pycbc_make_html_page', 'pycbc_make_coinc_search_workflow']

# Executables that need MKL
needs_mkl = ['pycbc_inspiral','pycbc_single_template']

Expand Down Expand Up @@ -61,18 +58,18 @@ def find_lib_path(libname, packages):

datas = []

if os.environ["NOW_BUILDING"] in needs_assets:
cwd = os.getcwd()
basedir = cwd.replace('tools/static','')
rootdir = basedir + 'pycbc/results'
# Add html assets to all executables
cwd = os.getcwd()
basedir = cwd.replace('tools/static','')
rootdir = basedir + 'pycbc/results'

for root, subdirs, files in os.walk(rootdir):
for filename in files:
if not filename.endswith('.py') and not filename.endswith('.pyc'):
file_path = os.path.join(root, filename)
store_path = '/'.join(file_path.split('/')[:-1])
store_path = store_path.replace(basedir, '')
datas.append( (file_path, store_path) )
for root, subdirs, files in os.walk(rootdir):
for filename in files:
if not filename.endswith('.py') and not filename.endswith('.pyc'):
file_path = os.path.join(root, filename)
store_path = '/'.join(file_path.split('/')[:-1])
store_path = store_path.replace(basedir, '')
datas.append( (file_path, store_path) )

if os.environ["NOW_BUILDING"] in needs_mkl:
# pull in all the mkl .so files
Expand Down
14 changes: 14 additions & 0 deletions tools/static/needs_full_build
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,17 @@ pycbc_sngl_minifollowup
pycbc_page_injinfo
pycbc_page_snglinfo
pycbc_injection_minifollowup
pycbc_coinc_trig2hdf
pycbc_coinc_bank2hdf
pycbc_page_segments
pycbc_page_ifar
pycbc_coinc_mergetrigs
pycbc_sqlite_simplify
pycbc_splitbank
pycbc_timeslides
pycbc_combine_likelihood
pycbc_pickle_horizon_distances
pycbc_pipedown_plots
pycbc_run_sqlite
pycbc_page_foreground

0 comments on commit 2d5e51f

Please sign in to comment.