Sl star 6603 (#4)

* Updating CTP and DicomAnonymizer submodules to use forks * Added new commits from the CTP and DicomAnonymizerTool submodules * One more try * Deleting build artifacts * Cleaned up tools repo * Cleaned up tools repo * Resolving conflicts --------- Co-authored-by: smitalimaye <[email protected]>
susom · Feb 17, 2023 · eaffcd9 · eaffcd9
1 parent 2c51840
commit eaffcd9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,9 @@ local.*
 
 # Emacs backup files
 *~
+DAT/CTP.jar
+DAT/DAT.jar
+DAT/dcm4che.jar
+DAT/log4j.jar
+DAT/pixelmed_codec.jar
+DAT/util.jar
diff --git a/DAT/slf4j-api-1.7.9.jar b/DAT/slf4j-api-1.7.9.jar
diff --git a/DAT/slf4j-simple-1.7.9.jar b/DAT/slf4j-simple-1.7.9.jar
diff --git a/Makefile b/Makefile
@@ -0,0 +1,28 @@
+TARGET = install
+VERSION = 1.0.0
+
+.PHONY: clean
+
+all: clean install docker
+
+docker:
+	docker build -f Dockerfile --pull -t starr-radio:$(VERSION) .
+
+install: 
+	git submodule update --init --recursive
+	git submodule update --remote --merge
+	cd CTP
+	git fetch
+	cd ..
+	cd DicomAnonymizerTool
+	git fetch
+	cd ..
+	$(MAKE) -C CTP
+	ant
+
+check: 
+	$(MAKE) -C tests check
+
+all: clean install
+
+
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
 
 	<property name="build" value="${toolbasedir}/build"/>
 	<property name="products" value="DAT"/>
-	<property name="libraries" value="${toolbasedir}/libraries"/>
+	<property name="libraries" value="${toolbasedir}/libraries/libraries"/>
 	<property name="documentation" value="${toolbasedir}/documentation"/>
 
 	<property name="toolsource" value="${toolbasedir}/source"/>