Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MAINT: Move CellProfiler-Analyst launcher into main Makefile
  • Loading branch information
pan14001 committed Mar 23, 2017
1 parent 62415b2 commit 12d414a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 181 deletions.
17 changes: 15 additions & 2 deletions Makefile
Expand Up @@ -8,6 +8,7 @@

# Overwritable paths to executables
CELLPROFILER := cellprofiler
CELLPROFILERANALYST := cellprofiler-analyst
PARALLEL := parallel --eta
PYTHON := python
RSCRIPT := Rscript
Expand Down Expand Up @@ -35,6 +36,10 @@ SOURCES_cellprofiler_headless := $(TARGETS_cellprofiler_commands)
TARGETS_cellprofiler_db := results/cellprofiler/rnai-screen-tf.db
TARGETS_cellprofiler_prop := $(TARGETS_cellprofiler_db:.db=.properties)
TARGETS_cellprofiler := $(TARGETS_cellprofiler_db) $(TARGETS_cellprofiler_prop)
SOURCES_cellprofileranalyst_patch := $(TARGETS_cellprofiler_prop)
TARGETS_cellprofileranalyst_patch := \
$(SOURCES_cellprofileranalyst_patch:.properties=_patched.properties)
SOURCES_cellprofileranalyst := $(TARGETS_cellprofileranalyst_patch)
define CELLPROFILER_OPTS_COMMON
--file-list=$(SOURCES_cellprofiler_filelist) \
--output-directory=$(dir $(TARGETS_cellprofiler_db))
Expand Down Expand Up @@ -101,10 +106,18 @@ $(TARGETS_cellprofiler_commands) : $(SOURCES_cellprofiler_commands)
$(TARGETS_cellprofiler_batch) : $(SOURCES_cellprofiler)
$(CELLPROFILER) $(CELLPROFILER_OPTS_BATCH)

.PHONY : gui-cellprofiler
gui-cellprofiler : $(SOURCES_cellprofiler) ## Interactively run CellProfiler.
.PHONY : gui-cp
gui-cp : $(SOURCES_cellprofiler) ## Interactively run CellProfiler.
$(CELLPROFILER) $(CELLPROFILER_OPTS_GUI)

.PHONY : gui-cpa
gui-cpa : $(SOURCES_cellprofileranalyst) ## Interactively run CellProfiler Analyst.
cd $(<D); $(CELLPROFILERANALYST) $(<F)

$(TARGETS_cellprofileranalyst_patch) : $(SOURCES_cellprofileranalyst_patch)
@echo "Removing database path"
sed -E 's#^(db_sqlite_file[[:space:]]+=[[:space:]]).*/([^/]+)$$#\1\2#' $< > $@

$(TARGETS_img_filelist) : $(abspath $(SOURCES_img_filelist))
find $< -type f | sort > $@

Expand Down
3 changes: 0 additions & 3 deletions results/cellprofiler/2017-01-04/Makefile

This file was deleted.

176 changes: 0 additions & 176 deletions results/cellprofiler/2017-01-04/all-plates.properties

This file was deleted.

0 comments on commit 12d414a

Please sign in to comment.