Commit 40b66bf9 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Created Ipce Branch 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7733 41f8697f-d340-4b68-9986-7bafba869bb8
parents 22dd2773 6132911b

isis/3rdParty/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -27,6 +27,21 @@ libs: 
	   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;                 \

isis/IsisPreferences

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ Group = DataDirectory 
  Clementine1  = $ISIS3DATA/clementine1

  Control      = $ISIS3DATA/control

  Dawn         = $ISIS3DATA/dawn

  Tgo          = $ISIS3DATA/tgo

  Galileo      = $ISIS3DATA/galileo

  Hayabusa     = $ISIS3DATA/hayabusa

  Kaguya       = $ISIS3DATA/kaguya

isis/Makefile

+27 −28
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ help: 
	echo "Isis Make System Commands"

	echo "------------------------ "

	echo "make all        : Build and install the entire system (incs,api,apps,docs)"

	echo "make config     : Generate preliminary config parameters"

	echo "make thirdParty : Copy required 3rdParty libraries into distribution"

	echo "make incs       : Install API include files"

	echo "make api        : Build and install the Isis API"
@@ -44,19 +43,7 @@ help: 
# After the API is created then the applications can be individually built

# and installed. Finally create the web documentation for the entire system.

#----------------------------------------------------------------------------

all: config incs thirdParty api apps docs



#----------------------------------------------------------------------------

# Target = config

# Dependencies = none

#

# Set up any compile/link configuration dependancy files

#----------------------------------------------------------------------------

config: FORCE

	echo $(CURTIMESTAMP) "Creating config files"

	$(MAKE) --directory=config -f config.mak config

	echo $(CURTIMESTAMP) "Finished creating config files"

	echo $(CURTIMESTAMP) " "

all: incs thirdParty api apps docs



#----------------------------------------------------------------------------

# Target = incs
@@ -67,7 +54,7 @@ config: FORCE 
# copy the include file from the individual object directory into the

# system directory $(ISISROOT)/inc.

#----------------------------------------------------------------------------

incs: config

incs:

	echo $(CURTIMESTAMP) "Installing include files"

	mkdir -p inc

	$(MAKE) --directory=src includes
@@ -94,6 +81,7 @@ incs: config 
# Finally after the API is completed the shared libraries will be

# constructed from libisis.a

#----------------------------------------------------------------------------



api:

	echo $(CURTIMESTAMP) "Building Isis API"

	mkdir -p lib
@@ -101,9 +89,29 @@ api: 
	echo $(CURTIMESTAMP) "Finished building Isis API"

	echo $(CURTIMESTAMP) ""

	echo $(CURTIMESTAMP) "Adding API objects"

	$(MAKE) --directory=src api

	if [ "$(HOST_ARCH)" == "Linux" ]; then            \

		$(MAKE) --directory=src api;	                  \

	elif [ "$(HOST_ARCH)" == "Darwin" ]; then         \

		$(MAKE) osx_static;															\

	fi;

	echo $(CURTIMESTAMP) "Finished adding API objects"

	echo $(CURTIMESTAMP) " "

	echo $(CURTIMESTAMP) "Creating Shared Libraries ..."

	cp make/Makefile.libs lib/Makefile

	$(MAKE) --directory=lib shared

	echo $(CURTIMESTAMP) "Finished creating Shared Libraries ..."

	echo $(CURTIMESTAMP) " "



# Make the static library on Macos, faster then recursivly call make

osx_static:

	$(eval UNIT_TESTS=$(wildcard src/*/objs/*/unitTest.o))

	$(eval PLUGIN_DIRS=$(dir $(wildcard src/*/objs/*/*.plugin)))

	$(eval PLUGIN_FILES=$(foreach dir,$(PLUGIN_DIRS),$(wildcard $(dir)*.o)))

	$(eval API_OBJS=$(filter-out $(PLUGIN_FILES),$(filter-out $(UNIT_TESTS),$(wildcard src/*/objs/*/*.o))))

	$(AR) -crs $(ISISROOT)/lib/libisis$(ISISLIBVERSION).a $(API_OBJS);

	for i in $(PLUGIN_DIRS); do 			  					\

		$(MAKE) --directory=$$i plugin install; 	  \

	done



#	echo "Building Isis API with debugging"

#	cd src; $(MAKE) objects MODE=DEBUG
@@ -111,12 +119,6 @@ api: 
#	echo "Finished building Isis API with debugging"

#	echo " "



	echo $(CURTIMESTAMP) "Creating Shared Libraries ..."

	cp make/Makefile.libs lib/Makefile

	$(MAKE) --directory=lib shared

	echo $(CURTIMESTAMP) "Finished creating Shared Libraries ..."

	echo $(CURTIMESTAMP) " "



#----------------------------------------------------------------------------

# Target = apps

# Dependencies = none
@@ -240,7 +242,6 @@ quickclean: 
	rm -rf scopecoverage scopecoverage.html linecoverage linecoverage.html \

	  functioncoverage functioncoverage.html *.csmes *.csexe; \

	$(MAKE) --directory=3rdParty clean;   \

	$(MAKE) --directory=config -f config.mak clean; \

	echo $(CURTIMESTAMP) "Finished cleaning Isis";



#----------------------------------------------------------------------------
@@ -267,7 +268,6 @@ clean: 
	rm -rf scopecoverage scopecoverage.html linecoverage linecoverage.html \

	  functioncoverage functioncoverage.html *.csmes *.csexe; \

	$(MAKE) --directory=3rdParty clean;   \

	$(MAKE) --directory=config -f config.mak clean; \

	echo $(CURTIMESTAMP) "Finished cleaning Isis";



cleansrc:
@@ -321,7 +321,7 @@ catTest: 
HOST_ARCH ?= $(shell uname -s)

HOST_MACH ?= $(shell uname -m)



thirdParty: config

thirdParty:

	echo $(CURTIMESTAMP) "Installing 3rdParty libraries"

	rm -f $(ISISROOT)/3rdParty/lib/lib*

	$(MAKE) -C $(ISISROOT)/3rdParty install
@@ -347,4 +347,3 @@ FORCE: 
# Include the make file debugging targets

#----------------------------------------------------------------------------

include $(ISISROOT)/make/isismake.print

isis/make/config.darwin-MacOSX10_10

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary 
#  Set up paths to tools needed for doxygen

DOXYGEN     = $(ISIS3OPT)/bin/doxygen

DOT_PATH    = $(ISIS3OPT)/bin 

LATEX       = $(ISIS3OPT)/bin/latex



#---------------------------------------------------------------------------

# Set up for cwd

isis/make/config.darwin-MacOSX10_11

+15 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary 
#  Set up paths to needed for doxygen

DOXYGEN     = $(ISIS3OPT)/bin/doxygen

DOT_PATH    = $(ISIS3OPT)/bin

LATEX       = $(ISIS3OPT)/bin/latex

GREP        = $(ISIS3OPT)/bin/grep



#---------------------------------------------------------------------------
@@ -339,8 +338,10 @@ HDF5LIB = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp 
#---------------------------------------------------------------------------

#OPENCVINCDIR =  -I$(ISIS3OPT)/include

#OPENCVLIBDIR =  -L$(ISIS3OPT)/lib   # Redundant

OPENCVLIBS   = -lopencv_calib3d -lopencv_core -lopencv_features2d \

               -lopencv_flann -lopencv_highgui -lopencv_imgproc \

OPENCVLIBS   = -lopencv_calib3d -lopencv_core \

	       -lopencv_features2d -lopencv_xfeatures2d \

               -lopencv_flann -lopencv_highgui \

	        -lopencv_imgproc -lopencv_imgcodecs \

               -lopencv_ml -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres \

               -lopencv_video -lopencv_videostab
@@ -504,6 +505,17 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libglib-*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libp11-kit*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libffi*.dylib"



# OpenCV3 dependencies

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libavresample*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libxcb-shm*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libsoxr*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libopenjp2*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libOpenNI*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libswresample*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libidn*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libtasn1*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libusb*.dylib"



# libxerces-c depends on these libraries

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicui18n*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicuuc*.dylib"