merge conflict in .gitignore (02a9b760) · Commits · aflab / astrogeology / ISIS3

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,3 +41,5 @@ print.prt
		/tsts//input/*
		/tsts//truth/*
		/tsts//output/*
		*/build/
		*/install/

README.md

+3 −0

Original line number	Diff line number	Diff line
		# ISIS3

		[![Join the chat at https://gitter.im/USGS-Astrogeology/isis3_cmake](https://badges.gitter.im/USGS-Astrogeology/isis3_cmake.svg)](https://gitter.im/USGS-Astrogeology/isis3_cmake?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

		Integrated Software for Imagers and Spectrometers ISIS3 public release site

environment.yml

0 → 100644

+104 −0

Original line number	Diff line number	Diff line
		name: isisdeps
		channels:
		- anaconda
		- inria-pro-sed
		- krodriguez
		- conda-forge
		- usgs-astrogeology
		- defaults
		dependencies:
		- libgcc=4.8.5=1
		- blas=1.1=openblas
		- boost=1.65.1=py27_0
		- boost-cpp=1.65.1=1
		- bzip2=1.0.6=1
		- ca-certificates=2018.1.18=0
		- cairo=1.14.6=4
		- certifi=2018.1.18=py27_0
		- cmake=3.9.1=0
		- cspice=66=0
		- curl=7.55.1=0
		- dbus=1.10.22=0
		- doxygen=1.8.14=0
		- eigen=3.3.3=0
		- expat=2.2.5=0
		- ffmpeg=3.2.4=3
		- flann=1.8.4=0
		- fontconfig=2.12.1=4
		- freetype=2.7=1
		- geos=3.5.1=1
		- geotiff=1.4.2=1
		- gettext=0.19.8.1=0
		- giflib=5.1.4=0
		- glib=2.51.4=0
		- gsl=2.2.1=blas_openblas_3
		- harfbuzz=1.3.4=2
		- hdf5=1.8.18=3
		- icu=58.2=0
		- jasper=1.900.1=4
		- jpeg=9b=2
		- krb5=1.14.2=0
		- lapack=3.6.1=1
		- libffi=3.2.1=3
		- libgfortran=3.0.0=0
		- libiconv=1.15=0
		- libpng=1.6.28=2
		- libssh2=1.8.0=2
		- libtiff=4.0.9=0
		- libuv=1.11.0=0
		- libwebp=0.5.2=7
		- libxcb=1.12=1
		- libxml2=2.9.7=0
		- m4=1.4.17=1
		- metis=5.1.0=3
		- nanoflann=1.2.2=0
		- ncurses=5.9=10
		- ninja=1.7.2=0
		- nn=1.86.0=2
		- numpy=1.13.3=py27_blas_openblas_200
		- openblas=0.2.19=2
		- opencv=3.3.0=py27_blas_openblas_200
		- openssl=1.0.2n=0
		- pcre=8.39=0
		- pip=9.0.1=py27_1
		- pixman=0.34.0=1
		- proj4=4.9.3=5
		- protobuf=3.2.0=py27_0
		- python=2.7.14=4
		- qt=5.6.2=h9e3eb04_4
		- qwt=6.1.3=1
		- readline=7.0=0
		- rhash=1.3.4=0
		- setuptools=38.5.1=py27_0
		- six=1.11.0=py27_1
		- sqlite=3.20.1=2
		- suitesparse=4.5.4=blas_openblas_200
		- superlu=5.2.1=blas_openblas_201
		- tk=8.6.7=0
		- wheel=0.30.0=py27_2
		- x264=20131217=3
		- xorg-kbproto=1.0.7=1
		- xorg-libx11=1.6.4=6
		- xorg-libxau=1.0.8=3
		- xorg-libxdmcp=1.1.2=3
		- xorg-xproto=7.0.31=6
		- xz=5.2.3=0
		- zlib=1.2.11=0
		- openmpi=1.8.6=4
		- parmetis=4.0.3p2=1
		- jama=125=0
		- tnt=126=0
		- bullet=2.86.1=he2aa7b0_0
		- ds9=7.5=h35e3669_0
		- embree=2.16.0=h6834224_0
		- gmm=5.0=h6aef312_0
		- naif=n0066
		- patchelf=0.9=h879b6ae_0
		- pcl=1.8.1=h7a71350_0
		- qhull=7.2.0=h396fa31_0
		- tbb=4.4=hf7780a4_0
		- vtk=7.1.1=py27h56fd973_0
		- xalan-c=1.11=h1922a5c_0
		- xerces-c=3.1.4=h10f7eb2_0
		prefix: /Users/krodriguez-pr/anaconda3/envs/isisdeps

isis/3rdParty/Makefile

deleted100644 → 0

+0 −121

Original line number	Diff line number	Diff line
		include $(ISISROOT)/make/isismake.os

		.PHONY: libs license plugins

		all: install

		install: libs license plugins

		#libs: license
		libs:
		@for library in $(THIRDPARTYLIBS); do \
		$(INSTALL3P) $(INSTALL3POPTS) $$library $(ISISROOT)/3rdParty/lib/; \
		echo $(CURTIMESTAMP) " Installing [$$library]"; \
		if [ "$(HOST_ARCH)" == "Linux" ]; then \
		for file in $$library; do \
		localFile=$(ISISROOT)/3rdParty/lib/`basename $$file`; \
		if [ ! -L "$$localFile" ]; then \
		existingRpath=`$(PATCHELF) --print-rpath "$$localFile" 2>&- \| \
		cut -d '/' -f2-4`; \
		dollar='$$'; \
		newRpath=`echo "$${dollar}ORIGIN"`; \
		if [ "$$existingRpath" == "usgs/pkgs/local" ]; then \
		echo $(CURTIMESTAMP) " Patching [" `basename $$file` "]"; \
		$(PATCHELF) --set-rpath "$$newRpath" $$localFile; \
		fi; \
		fi; \
		done; \
		fi; \
		done; \
		for library in $(PATCHLIBS); do \
		$(INSTALL3P) $(INSTALL3POPTS) $$library $(ISISROOT)/3rdParty/lib/; \
		echo $(CURTIMESTAMP) " Installing [$$library]"; \
		if [ "$(HOST_ARCH)" == "Linux" ]; then \
		for file in $$library; do \
		localFile=$(ISISROOT)/3rdParty/lib/`basename $$file`; \
		if [ ! -L "$$localFile" ]; then \
		dollar='$$'; \
		newRpath=`echo "$${dollar}ORIGIN"`; \
		echo $(CURTIMESTAMP) " Patching [" `basename $$file` "]"; \
		$(PATCHELF) --set-rpath "$$newRpath" $$localFile; \
		fi; \
		done; \
		fi; \
		done; \
		if [ "$(HOST_ARCH)" == "Darwin" ]; then \
		chmod u+w $(ISISROOT)/3rdParty/lib/libcrypto.*.dylib; \
		chmod u+w $(ISISROOT)/3rdParty/lib/libssl.*.dylib; \
		chmod u+w $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5/Python;\
		$(ISISROOT)/scripts/SetRunTimePath --libs \
		--libmap=$(ISISROOT)/scripts/darwin_lib_paths.lis \
		--liblog=DarwinLibs.lis --update \
		--relocdir=$(ISISROOT)/3rdParty/lib:$(ISISROOT)/3rdParty \
		--errlog=DarwinErrors.lis \
		`find $(ISISROOT)/3rdParty/lib -name '.dylib' -type f` \
		> /dev/null; \
		$(ISISROOT)/scripts/SetRunTimePath --libs \
		--libmap=$(ISISROOT)/scripts/qt_paths.lis \
		--liblog=DarwinLibs.lis \
		--relocdir=$(ISISROOT)/3rdParty/lib:$ISISROOT/3rdParty \
		--update \
		`find $(ISISROOT)/3rdParty/lib -name '[Qq]*' -print \
		-mindepth 3 -maxdepth 4 -type f` > /dev/null; \
		$(ISISROOT)/scripts/SetRunTimePath --bins \
		--libmap=$(ISISROOT)/scripts/darwin_bin_paths.lis \
		--liblog=DarwinLibs.lis \
		--relocdir=$(ISISROOT)/3rdParty/lib:$ISISROOT/3rdParty \
		--update \
		`find $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5 \
		-name 'Python' -print -type f` > /dev/null; \
		chmod u-w $(ISISROOT)/3rdParty/lib/libcrypto.*.dylib; \
		chmod u-w $(ISISROOT)/3rdParty/lib/libssl.*.dylib; \
		chmod u-w $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5/Python;\
		if [ -f "DarwinErrors.lis" ]; then \
		cat DarwinErrors.lis; \
		fi; \
		$(RM) DarwinErrors.lis DarwinLibs.lis; \
		fi

		license:
		$(RSYNC) -a $(THIRDPARTYLICPATH) \
		$(ISISROOT)/3rdParty/license/

		plugins:
		@for plugs in $(THIRDPARTYPLUGINS); do \
		echo $(CURTIMESTAMP) " Installing [$$plugs...]"; \
		$(INSTALL3P) $(INSTALL3POPTS) $$plugs $(ISISROOT)/3rdParty/plugins/; \
		done; \
		if [ "$(HOST_ARCH)" == "Darwin" ]; then \
		$(ISISROOT)/scripts/SetRunTimePath --bundles \
		--libmap=$(ISISROOT)/scripts/qt_plugins_paths.lis \
		--liblog=DarwinLibs.lis --update \
		--relocdir=$(ISISROOT)/3rdParty/lib:$(ISISROOT)/3rdParty \
		--errlog=DarwinErrors.lis \
		`find $(ISISROOT)/3rdParty/plugins -name '*.bundle' -type f` \
		`find $(ISISROOT)/3rdParty/plugins -name '*.dylib' -type f` \
		> /dev/null; \
		if [ -f "DarwinErrors.lis" ]; then \
		cat DarwinErrors.lis; \
		fi; \
		$(RM) DarwinErrors.lis DarwinLibs.lis; \
		fi


		clean:
		rm -f lib/lib.so lib/lib.dylib lib/lib*.a
		cd lib && rm -rf *.framework
		$(RM) -rf license
		@for plugs in plugins/*; do \
		if [ -d $$plugs -a $$plugs != "plugins/CVS" ]; \
		then \
		$(RM) -rf $$plugs; \
		fi \
		done;

		#----------------------------------------------------------------------------
		# Use to see values of variables
		# Example: make print-HOST_OS
		# Will print the make variable HOST_OS
		#----------------------------------------------------------------------------
		print-% :
		@echo '$* = $($*)'

isis/3rdParty/lib/README

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		This directory contains O/S and hardware specific shared libraries needed
		to execute ISIS applications