Restructure directories (nbis inside nbis/, python-nbis is now src/)

.gitignore

@@ -1,12 +1,39 @@
 *.o
-*/bin/
-*/lib/
-*/obj/
-python_nbis/build/
-python_nbis/dist/
-python_nbis/*_wrap.c
-python_nbis/installedFiles.txt
-python_nbis/*.pyc
+bin/
+lib/
+obj/
 rules.mak
 p_rules.mak
 *egg*
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Distribution / packaging
+build/
+install_dir/
+
+tests/nistFinger_500_500*
+tests/testMINDTCT*
+
+pyNBIS/*.py
+pyNBIS/*_wrap.c
+
+installedFiles.txt
+
+# what happens on nbis/, stays on nbis/
+nbis/

Makefile

@@ -1,303 +1,31 @@
-#******************************************************************************
-# License: 
-# This software was developed at the National Institute of Standards and 
-# Technology (NIST) by employees of the Federal Government in the course 
-# of their official duties. Pursuant to title 17 Section 105 of the 
-# United States Code, this software is not subject to copyright protection 
-# and is in the public domain. NIST assumes no responsibility  whatsoever for 
-# its use by other parties, and makes no guarantees, expressed or implied, 
-# about its quality, reliability, or any other characteristic. 
-#
-# This software has been determined to be outside the scope of the EAR
-# (see Part 734.3 of the EAR for exact details) as it has been created solely
-# by employees of the U.S. Government; it is freely distributed with no
-# licensing requirements; and it is considered public domain.� Therefore,
-# it is permissible to distribute this software as a free download from the
-# internet.
-#
-# Disclaimer: 
-# This software was developed to promote biometric standards and biometric
-# technology testing for the Federal Government in accordance with the USA
-# PATRIOT Act and the Enhanced Border Security and Visa Entry Reform Act.
-# Specific hardware and software products identified in this software were used
-# in order to perform the software development.  In no case does such
-# identification imply recommendation or endorsement by the National Institute
-# of Standards and Technology, nor does it imply that the products and equipment
-# identified are necessarily the best available for the purpose.  
-#
-# ******************************************************************************
-# Project:		NIST Fingerprint Software
-# SubTree:		/NBIS/Main
-# Filename:		Makefile
-# Integrators:		Kenneth Ko
-# Organization:		NIST/ITL
-# Host System:		GNU GCC/GMAKE GENERIC (UNIX)
-# Date Created:		08/20/2006
-# Date Updated:		03/05/2007
-#                       11/28/2007
-#                       10/16/2008 Joseph C. Konczal
-#			05/04/2011 Kenneth Ko
-#			05/06/2011 Kenneth Ko			
-#
-# ******************************************************************************
-#
-# Top-level make file to build all of the NBIS source code
-# (libraries and binaries).
-#
-# ******************************************************************************
-#
-# config -- check to see if "nfis" have been installed by verifying
-#           that all DIR_INSTALL directories are present.
-#
-# it -- Create a "obj" directory and compile/generate all the .o, .a
-#       and executables under the "obj" directory.
-#
-# install -- Create "bin" and "lib" directories and install all the
-#            .a and and executables from "obj" directory.
-#
-# clean -- cleanup all .o, .a and executables.
-#
-# catalog -- Create catalog file for all the libaraies and 
-#            applications.
-#
-# help -- print help manual.
-#
-# ******************************************************************************
-include ./rules.mak
-#
-# ******************************************************************************
-# 
-# Target:   all:
-# Target to make all libraries and executables.
-# 
-# ******************************************************************************
-all: \
-	config \
-	it \
-	install \
-	catalog
-#
-# ******************************************************************************
-#
-# Target: config:
-# Target to verify all required project directories are present.
-#
-# ******************************************************************************
-config:
-	@echo "Start: Checking \"$(PROJ_NAME)\" directory structure...."
-	@for dir in $(PACKAGES); do \
-		echo "Verifying directory - \"$(DIR_ROOT)/$$dir\":"; \
-		if [ ! -d $$dir ]; then \
-			echo "[FAILED]"; \
-			echo "Please check out the missing directory: \"$(DIR_ROOT)/$$dir\"!"; \
-			date; \
-			exit 2;\
-		else \
-			echo "[PASSED]"; \
-		fi; \
-	done
-	@for dir in $(EXTRA_DIR) $(DOC_DIRS); do \
-		echo "Verifying directory - \"$$dir\":"; \
-		if [ ! -d $$dir ]; then \
-			echo "[FAILED]"; \
-			echo "Please check out the missing directory \"$$dir\"!"; \
-			date; \
-			exit 2;\
-		else \
-			echo "[PASSED]"; \
-		fi; \
-	done
-	@echo "End: Checking \"$(PROJ_NAME)\" directory structure."
-	@echo "Start: Checking exports and calatogs directories structure...."
-	@for dir in $(EXPORTS_DIRS) $(DOC_CATS_DIR); do \
-		status=0; \
-		if [ ! -d $$dir ]; then \
-			echo "Creating \"$$dir\" directory...."; \
-			status=1; \
-			$(MKDIR) $$dir; \
-			echo "[PASSED]"; \
-		fi; \
-		if [ -d $$dir ]; then \
-			if [ $$status = 0 ]; then \
-				echo "Directory \"$$dir\" already exist:"; \
-				echo "[PASSED]"; \
-			fi; \
-		else \
-			echo "[-FAILED]"; \
-			exit 2; \
-		fi; \
-	done
-	@echo "End: Checking exports and calatogs directories structure"
-	@echo "Start: Generating all the p_rules.mak."
-	@for package in $(PACKAGES); do \
-		echo "Generating $(DIR_ROOT)/$$package/p_rules.mak..."; \
-		$(CAT)  $(DIR_ROOT)/$$package/p_rules.mak.src | \
-		$(SED) 's,SED_RULES_STRING,'$(DIR_ROOT)/rules.mak',' \
-		> $$package/p_rules.mak; \
-	done
-	@echo "End: Generating all the p_rules.mak."
-	@for package in $(PACKAGES); do \
-		(cd $(DIR_ROOT)/$$package && $(MAKE) config) || exit 1; \
-	done
-#
-# ******************************************************************************
-#
-# Target: it:
-# Target to make all the .o, .a and executables in obj directory.
-#
-# ******************************************************************************
-it:
-	@for package in $(PACKAGES); do \
-		(cd $(DIR_ROOT)/$$package && $(MAKE) cpheaders) || exit 1; \
-	done 
-	@for package in $(PACKAGES); do \
-		(cd $(DIR_ROOT)/$$package && $(MAKE) libs) || exit 1; \
-	done
-	@for package in $(PACKAGES); do \
-		(cd $(DIR_ROOT)/$$package && $(MAKE) bins) || exit 1; \
-	done
-#
-# ******************************************************************************
-#
-# Target: install
-# Target to install the the .a in the lib and executables in the bin
-# directory.
-#
-# ******************************************************************************
-install:
-	@echo "Start: Checking Final Installation directories structure...."
-	@for dir in $(INSTALL_ROOT_INC_DIR) $(INSTALL_ROOT_BIN_DIR) $(INSTALL_ROOT_LIB_DIR) $(INSTALL_RUNTIME_DATA_DIR); do \
-		status=0; \
-		if [ ! -d $$dir ]; then \
-			echo "Creating \"$$dir\" directory...."; \
-			$(MKDIR) $$dir; \
-			echo "[PASSED]"; \
-			status=1; \
-		elif [ -d $$dir ]; then \
-			echo "Directory \"$$dir\" already exist:"; \
-			echo "[PASSED]"; \
-			status=1; \
-		fi; \
-		if [ $$status = 0 ]; then \
-			echo "[FAILED]"; \
-			exit 2; \
-		fi; \
-	done
-	@echo "End: Checking Final Installation directories structure."
-	@echo "Start: Copying header files for each package to \"$(INSTALL_ROOT_INC_DIR)\"...."
-	@for package in $(PACKAGES); do \
-		if [ $$package = "ijg" ]; then \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jpegb/*.h $(INSTALL_ROOT_INC_DIR)"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jpegb/*.h $(INSTALL_ROOT_INC_DIR)) || exit 1; \
-		elif [ $$package = "jpeg2k" ]; then \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jpeg2k/*.h $(INSTALL_ROOT_INC_DIR)"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/src/libjasper/include/jasper $(INSTALL_ROOT_INC_DIR)) || exit 1; \
-			$(RM) $(EXPORTS_INC_DIR)/jasper/Makefile*; \
-		elif [ $$package = "png" ]; then \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/png/*.h $(INSTALL_ROOT_INC_DIR)"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/png/*.h $(INSTALL_ROOT_INC_DIR)) || exit 1; \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/zlib/*.h $(INSTALL_ROOT_INC_DIR)"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/zlib/*.h $(INSTALL_ROOT_INC_DIR)) || exit 1; \
-		elif [ $$package = "openjp2" ]; then \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/openjp2/src/lib/openjp2/*.h $(INSTALL_ROOT_INC_DIR)/openjp2"; \
-			$(MKDIR) $(INSTALL_ROOT_INC_DIR)/openjp2; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/openjp2/src/lib/openjp2/*.h $(INSTALL_ROOT_INC_DIR)/openjp2) || exit 1; \
-		else \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/include/* $(INSTALL_ROOT_INC_DIR)"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/include/* $(INSTALL_ROOT_INC_DIR)) || exit 1; \
-		fi; \
-	done
-	$(RM) $(INSTALL_ROOT_INC_DIR)/little.h.src 
-	@echo "End: Copying header files for each package to \"$(INSTALL_RUNTIME_DATA_DIR)\"."
-	@echo "Start: Copying manual directory to \"$(FINAL_INSTALLATION_DIR)\"...."
-	@if [ ! -d $(FINAL_INSTALLATION_DIR)/man/man1 ]; then \
-		echo "Creating man/man1\" directory...."; \
-		$(MKDIR) $(FINAL_INSTALLATION_DIR)/man; \
-		$(MKDIR) $(FINAL_INSTALLATION_DIR)/man/man1; \
-	fi
-	@if [ "$(MAN_DIR)/man1" != "$(FINAL_INSTALLATION_DIR)/man/man1" ]; then \
-		echo "$(CP) -Rpf $(MAN_DIR)/man1 $(FINAL_INSTALLATION_DIR)/man/man1"; \
-		$(CP) -pf $(MAN_DIR)/man1/* $(FINAL_INSTALLATION_DIR)/man/man1; \
-	else \
-		echo "Copy ignored: identical files."; \
-	fi
-	@echo "End: Copying manual directory to \"$(FINAL_INSTALLATION_DIR)\"."
-	@echo "Start: Copying runtime data directories to \"$(INSTALL_RUNTIME_DATA_DIR)\"...."
-	@for datadir in $(RUNTIME_DATA_PACKAGES); do \
-		echo "$(CP) -Rf $(DIR_ROOT)/$$datadir/$(RUNTIME_DATA_DIR) $(INSTALL_RUNTIME_DATA_DIR)/$$datadir"; \
-		($(CP) -Rf \
-			$(DIR_ROOT)/$$datadir/$(RUNTIME_DATA_DIR) \
-			$(INSTALL_RUNTIME_DATA_DIR)/$$datadir) || exit 1; \
-	done
-	@echo "End: Copying runtime data directories to \"$(INSTALL_RUNTIME_DATA_DIR)\"."
-	@for package in $(PACKAGES); do \
-		if [ $$package = "jpeg2k" ]; then \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/bin/jasper $(FINAL_INSTALLATION_DIR)/bin/jp2codec"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/bin/jasper $(FINAL_INSTALLATION_DIR)/bin/jp2codec) || exit 1; \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/bin/imgcmp $(FINAL_INSTALLATION_DIR)/bin/imgcmp"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/bin/imgcmp $(FINAL_INSTALLATION_DIR)/bin/.) || exit 1; \
-			echo "$(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/bin/imginfo $(FINAL_INSTALLATION_DIR)/bin/imginfo"; \
-			($(CP) -Rpf $(DIR_ROOT)/$$package/src/lib/jasper/bin/imginfo $(FINAL_INSTALLATION_DIR)/bin/.) || exit 1; \
-		fi;\
-		(cd $(DIR_ROOT)/$$package && $(MAKE) install) || exit 1; \
-	done
+NBIS_SRC_DIR=$(realpath .)/nbis
+NBIS_INSTALL_DIR=$(realpath .)/install_dir
 
-ifdef LIBNBIS
-	@if [ $(LIBNBIS) = "yes" ]; then \
-		echo "Start: Creating libnbis.a..."; \
-		(cd $(FINAL_INSTALLATION_DIR)/lib && $(RM) libnbis.a) || exit 1; \
-		(cd $(FINAL_INSTALLATION_DIR)/lib && $(AR) -ru libnbis.a *.a) || exit 1; \
-		(cd $(FINAL_INSTALLATION_DIR)/lib && $(MV) libnbis.a libnbis.a.temp) || exit 1; \
-		(cd $(FINAL_INSTALLATION_DIR)/lib && $(RM) *.a) || exit 1; \
-		(cd $(FINAL_INSTALLATION_DIR)/lib && $(MV) libnbis.a.temp libnbis.a) || exit 1; \
-		echo "End: Creating libnbis.a."; \
-	else \
-		(cd $(FINAL_INSTALLATION_DIR)/lib && $(RM) libnbis.a) || exit 1; \
-	fi
+ifeq ("$(shell arch)", "x86_64")
+  HOST_ARCH=--64
+else
+  HOST_ARCH=--32
 endif
 
-#
-# ******************************************************************************
-#
-# Target: clean
-# Target to cleanup all .o,  .a and executables.
-#
-# ******************************************************************************
+all: build test
+build: NBIS
+	python setup.py build
+install:
+	python setup.py install --record installedFiles.txt
+uninstall:
+	cat installedFiles.txt | xargs rm -rf
+NBIS:
+	mkdir -p $(NBIS_INSTALL_DIR)
+	cd $(NBIS_SRC_DIR); ./setup.sh $(NBIS_INSTALL_DIR) $(HOST_ARCH); make config; make it; make install LIBNBIS=no
+
+	@echo $(NBIS_INSTALL_DIR)
+	ls $(NBIS_INSTALL_DIR)
 clean:
-	$(RM) $(DOC_CATS_DIR)/*txt
-	@for package in $(PACKAGES); do \
-		echo "Start: Cleaning up $$package...."; \
-		(cd $(DIR_ROOT)/$$package && $(MAKE) clean) || exit 1; \
-		echo "End: Cleaning up $$package."; \
-	done
-#
-# ******************************************************************************
-# 
-# Target: catalog
-# Target to create catalog file for all the libaraies and 
-# applications.
-#
-# ******************************************************************************
-catalog:
-	@echo "Start: Generating \"$(PROJ_NAME)\" catalogs...."
-	$(RM) $(DOC_CATS_DIR)/*txt
-	$(TOUCH) $(DOC_CATS_DIR)/catalog_apps.txt
-	@for package in $(PACKAGES); do \
-		(cd $(DIR_ROOT)/$$package && $(MAKE) catalog) || exit 1; \
-	done
-	@echo "End: Generating \"$(PROJ_NAME)\" catalogs."
-#
-# ******************************************************************************
-#
-# Target: help
-# Target to print help manual.
-#
-# ******************************************************************************
-help:
-	@echo "For individuals wanting to build the NBIS Open Source Software,"
-	@echo "the simple instructions are:"
-	@echo "1.  \`make config\`"
-	@echo "2.  \`make it\`"
-	@echo "3.  \`make install\`"
-	@echo "4.  \`make catalog\`"
-#
+	# make -C nbis clean  # No need to clean this, we won't be modifying it
+	make -C pyNBIS clean
+	make -C tests clean
+	rm -rf *.so .eggs/ *.egg-info/ installedFiles.txt build/ $(NBIS_INSTALL_DIR)
+
+test: build
+	python setup.py test
+