Unverified Commit c155519c authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Add generic MacOSX ISIS config for old make tests (#5517)

parent 9e00ae20

isis/make/config.darwin

+6 −1
Original line number Diff line number Diff line
@@ -9,5 +9,10 @@ HOST_MACH := $(shell uname -m) 
NODE_NAME := $(shell uname -n)



ifeq ($(HOST_ARCH),Darwin)

  ifneq ("$(wildcard $(ISISROOT)/make/config.darwin-$(HOST_OS))","")

    include $(ISISROOT)/make/config.darwin-$(HOST_OS)

  else

    $(info includeing $(ISISROOT)/make/config.darwin-MacOSX)

    include $(ISISROOT)/make/config.darwin-MacOSX

  endif

endif

isis/make/config.darwin-MacOSX

0 → 100644
+601 −0

File added.

Preview size limit exceeded, changes collapsed.

isis/make/isismake.os

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ include $(ISISROOT)/make/isismake.init 
#---------------------------------------------------------------------------

#  Set up ISIS versioning

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

ISISVERSIONFULL      := $(shell $(HEAD) -n 1 $(ISISROOT)/version | $(SED) 's/\#.*//' | $(SED) 's/ *$$//')

ISISVERSIONFULL      := $(shell $(HEAD) -n 1 $(ISISROOT)/isis_version.txt | $(SED) 's/\#.*//' | $(SED) 's/ *$$//')

ISISMAJOR            := $(shell $(ECHO) $(ISISVERSIONFULL) | $(CUT) -d"." -f1)

ISISMINOR            := $(shell $(ECHO) $(ISISVERSIONFULL) | $(CUT) -d"." -f2)

ISISMINORMINOR       := $(shell $(ECHO) $(ISISVERSIONFULL) | $(CUT) -d"." -f3)

ISISMINORMINORMINOR  := $(shell $(ECHO) $(ISISVERSIONFULL) | $(CUT) -d"." -f4)

ISISVERSION          := $(ISISMAJOR).$(ISISMINOR).$(ISISMINORMINOR).$(ISISMINORMINORMINOR)

ISISLIBVERSION       := $(shell $(ECHO) $(ISISMAJOR).$(ISISMINOR).$(ISISMINORMINOR) | $(SED) 's/[a-z].*$$//')

ISISLOCALVERSION     := $(shell $(HEAD) -n 3 $(ISISROOT)/version | $(TAIL) -n 1 | $(SED) 's/\#.*//' | $(SED) 's/ *$$//')

ISISLOCALVERSION     := $(shell $(HEAD) -n 3 $(ISISROOT)/isis_version.txt | $(TAIL) -n 1 | $(SED) 's/\#.*//' | $(SED) 's/ *$$//')

ISISRELEASE          := REL_0_0



# Set up HOST_OS