Use OSTYPE instead of TERM.

admb-project · Jan 16, 2020 · 367e3ce · 367e3ce
1 parent c8a38fd
commit 367e3ce
Show file tree

Hide file tree

Showing 45 changed files with 46 additions and 164 deletions.
diff --git a/contrib/GNUmakefile b/contrib/GNUmakefile
@@ -1,5 +1,5 @@
 ifeq ($(OS),Windows_NT)
-  ifeq ($(strip $(TERM)),)
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
     ifeq ($(wildcard ..\utilities\mingw\bin\g++.exe),..\utilities\mingw\bin\g++.exe)
       PATH:=$(shell cd)\..\utilities\mingw\bin;$(PATH)

diff --git a/contrib/ad2csv/GNUmakefile b/contrib/ad2csv/GNUmakefile
@@ -1,6 +1,6 @@
 .ONESHELL:
 ifeq ($(OS),Windows_NT)
-  ifeq ($(strip $(TERM)),)
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh

diff --git a/contrib/admb-rules.mak b/contrib/admb-rules.mak
@@ -1,6 +1,6 @@
 .ONESHELL:
 ifeq ($(OS),Windows_NT)
-  ifeq ($(strip $(TERM)),)
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh

diff --git a/examples/GNUmakefile b/examples/GNUmakefile
@@ -1,7 +1,7 @@
 .ONESHELL:
 
 ifeq ($(OS),Windows_NT)
-  ifeq ($(strip $(TERM)),)
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
     ADMB_HOME=..\\..\\..
   else

diff --git a/examples/admb/prof_like/GNUmakefile b/examples/admb/prof_like/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=bhplfine
 

diff --git a/src/GNUmakefile b/src/GNUmakefile
@@ -1,5 +1,5 @@
 ifeq ($(OS),Windows_NT)
-  ifeq ($(strip $(TERM)),)
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
     ifeq ($(wildcard ..\utilities\mingw\bin\g++.exe),..\utilities\mingw\bin\g++.exe)
       PATH:=$(shell cd)\..\utilities\mingw\bin;$(PATH)
@@ -216,21 +216,13 @@ ADCXXFLAGS:=$(strip $(ADCXXFLAGS)) -I../build/admb/include
   endif
 endif
 
-ifeq ($(TERM),cygwin)
-  ifeq ($(CXX),g++)
-    ifeq (x86_64,$(findstring x86_64,$(shell $(CXX) -dumpmachine)))
-      ADCXXFLAGS:=$(subst -I,-D_FILE_OFFSET_BITS=64 -I,$(ADCXXFLAGS))
-    endif
-  endif
-else
 ifeq ($(SHELL),cmd)
   ifeq ($(CXX),g++)
     ifeq (x86_64,$(findstring x86_64,$(shell $(CXX) -dumpmachine)))
       ADCXXFLAGS:=$(subst -I,-D_FILE_OFFSET_BITS=64 -I,$(ADCXXFLAGS))
     endif
   endif
 endif
-endif
 
 CXXFLAGS_SAF_LIB=$(strip $(USER_CXXFLAGS) $(ADCXXFLAGS))
 CXXFLAGS_OPT_LIB:=$(subst -D_USE_MATH_DEFINES,-DOPT_LIB -D_USE_MATH_DEFINES,$(CXXFLAGS_SAF_LIB))

diff --git a/src/df1b2-separable/GNUmakefile b/src/df1b2-separable/GNUmakefile
@@ -1,5 +1,5 @@
 ifeq ($(OS),Windows_NT)
-ifeq ($(strip $(TERM)),)
+ifeq ($(strip $(OSTYPE)),)
 PATH:=$(PATH):..\..\utilities
 bins: $(DIST)\bin\tpl2rem.exe
 $(DIST)\bin\tpl2rem.exe: tpl2rem.c

diff --git a/src/nh99/GNUmakefile b/src/nh99/GNUmakefile
@@ -1,5 +1,5 @@
 ifeq ($(OS),Windows_NT)
-ifeq ($(strip $(TERM)),)
+ifeq ($(strip $(OSTYPE)),)
 PATH:=$(PATH):..\..\utilities
 bins: $(DIST)\bin\tpl2cpp.exe
 $(DIST)\bin\tpl2cpp.exe: tpl2cpp.c

diff --git a/tests/4darray/GNUmakefile b/tests/4darray/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=4darray
 

diff --git a/tests/GNUmakefile b/tests/GNUmakefile
@@ -1,5 +1,5 @@
 ifeq ($(OS),Windows_NT)
-  ifeq ($(strip $(TERM)),)
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
     ifeq ($(wildcard ..\utilities\mingw\bin\g++.exe),..\utilities\mingw\bin\g++.exe)
       PATH:=$(shell cd)\..\utilities\mingw\bin;$(PATH)

diff --git a/tests/agemat/GNUmakefile b/tests/agemat/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 all: agemat.tpl
 

diff --git a/tests/bessel/GNUmakefile b/tests/bessel/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=bessel
 

diff --git a/tests/beta2/GNUmakefile b/tests/beta2/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=beta2
 

diff --git a/tests/beta3/GNUmakefile b/tests/beta3/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=beta3
 

diff --git a/tests/beta_deviate/GNUmakefile b/tests/beta_deviate/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=minto
 

diff --git a/tests/beta_regression/GNUmakefile b/tests/beta_regression/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=beta_regression
 

diff --git a/tests/betai/GNUmakefile b/tests/betai/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=betai
 

diff --git a/tests/betareg/GNUmakefile b/tests/betareg/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=betareg
 

diff --git a/tests/changepoint/GNUmakefile b/tests/changepoint/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=changepoint
 

diff --git a/tests/colfill/GNUmakefile b/tests/colfill/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=colfill
 

diff --git a/tests/cov_re/GNUmakefile b/tests/cov_re/GNUmakefile
@@ -1,13 +1,11 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
+
 TARGET=cov_re
 
 all: clean cov_re cov_re_sep run

diff --git a/tests/ctl/GNUmakefile b/tests/ctl/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=example
 

diff --git a/tests/dd2/GNUmakefile b/tests/dd2/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=dd2
 

diff --git a/tests/expm/GNUmakefile b/tests/expm/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 TARGET=expm
 

diff --git a/tests/f1b2vc5/GNUmakefile b/tests/f1b2vc5/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 all: f1b2vc5
 ifeq ($(SHELL),cmd)

diff --git a/tests/geolocation/GNUmakefile b/tests/geolocation/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 ifndef ADMB_HOME
 ADMB_HOME=../../../build/dist
@@ -92,9 +89,6 @@ endif
 
 clean:
 ifeq ($(SHELL),cmd)
-else
-ifeq (cygwin,$(TERM))
-else
 	if [ -e kfsst/Makefile ]; then $(MAKE) --directory=kfsst clean; fi;
 	if [ -e kftrack/Makefile ]; then $(MAKE) --directory=kftrack clean; fi;
 	if [ -e trackit/Makefile ]; then $(MAKE) --directory=trackit clean; fi;

diff --git a/tests/glmmadmb/GNUmakefile b/tests/glmmadmb/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 all: rforge-glmmadmb
 ifeq ($(SHELL),cmd)

diff --git a/tests/globals/GNUmakefile b/tests/globals/GNUmakefile
@@ -1,13 +1,10 @@
-ifeq ($(TERM),cygwin)
-else
 ifeq ($(OS),Windows_NT)
-  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
+  ifeq ($(strip $(OSTYPE)),)
     SHELL=cmd
   else
     EXT=.sh
   endif
 endif
-endif
 
 all:
 ifeq ($(SHELL),cmd)