graffy
/
lipase
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

fixed bug introduced today that caused the package file to not contain jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar

This commit is contained in:
Guillaume Raffy 2020-04-10 17:21:12 +02:00
parent 81c0e91897
commit d382139a0d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -3,12 +3,13 @@ FIJI_ROOT_PATH:=~/soft/Fiji.app
FIJI_EXE_PATH=$(FIJI_ROOT_PATH)/ImageJ-linux64 FIJI_EXE_PATH=$(FIJI_ROOT_PATH)/ImageJ-linux64
# RAW_IMAGES_ROOT_PATH:='/opt/ipr/cluster/work.global/graffy/jenkins-store/lipase/raw-images' # RAW_IMAGES_ROOT_PATH:='/opt/ipr/cluster/work.global/graffy/jenkins-store/lipase/raw-images'
RAW_IMAGES_ROOT_PATH:=$(shell echo ~/work/lipase/raw-images) RAW_IMAGES_ROOT_PATH:=$(shell echo ~/work/lipase/raw-images)
TESTS_OUTPUT_DATA_PATH:=$(shell echo ~/work/lipase/tmp) TEMP_PATH:=$(shell echo ~/work/lipase/tmp)
TESTS_OUTPUT_DATA_PATH:=$(TEMP_PATH)
LIB_SRC_FILES=$(shell find ./src/lipase -name "*.py") LIB_SRC_FILES=$(shell find ./src/lipase -name "*.py")
PLUGINS_SRC_FILES=$(shell find ./src/ij-plugins -name "*.py") PLUGINS_SRC_FILES=$(shell find ./src/ij-plugins -name "*.py")
LIPASE_VERSION=1.01 LIPASE_VERSION=1.01
BUILD_ROOT_PATH:=$(shell pwd)/build BUILD_ROOT_PATH:=$(TEMP_PATH)/build
PACKAGE_FILE_PATH=$(BUILD_ROOT_PATH)/lipase-$(LIPASE_VERSION).zip PACKAGE_FILE_PATH=$(BUILD_ROOT_PATH)/lipase-$(LIPASE_VERSION).zip
.PHONY: all .PHONY: all
@ -25,9 +26,9 @@ clean_doc:
$(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar: $(LIB_SRC_FILES) $(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar: $(LIB_SRC_FILES)
pushd ./src; \ pushd ./src; \
mkdir -p $(BUILD_ROOT_PATH)/jars/Lib ; \ mkdir -p $(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib ; \
find ./lipase -name "*.py" > /tmp/files.txt ; \ find ./lipase -name "*.py" > /tmp/files.txt ; \
jar cvf $(BUILD_ROOT_PATH)/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar @/tmp/files.txt ; \ jar cvf $(BUILD_ROOT_PATH)/ij_zip_source/jars/Lib/fr.univ-rennes1.ipr.lipase.lib.jar @/tmp/files.txt ; \
popd popd
.PHONY: install_ij_opencv .PHONY: install_ij_opencv