Issue #274 - Clean up nmake build files and fix builds to only check …

…compiler version.

contrib/Makefile

@@ -1,17 +1,17 @@
 !IFNDEF ADMB_VER
 ADMB_VER=admb
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:"Compiler Version 19." > nul] == 0)
+
+!IF ([cl 2>&1 | findstr /C:" 19." > nul] == 0)
 CXXVERSION=-cl19
 !ELSE
 CXXVERSION=-cl
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:" x64" > nul] == 0)
+
+!IF ([cl 2>&1 | findstr /C:" x64" > nul] == 0)
 OSNAME=win64
-!ELSEIF ([cl /? 2>&1 | findstr /C:" x86" > nul] == 0)
-OSNAME=win32
 !ELSE
-OSNAME=vs
+OSNAME=win32
 !ENDIF
 
 DESTDIR=..\build\$(ADMB_VER)

contrib/ecolib/Makefile

@@ -1,11 +1,13 @@
 include objects.lst
 
-!IF ([cl /? 2>&1 | findstr /C:"Compiler Version 19." > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" 19." > nul] == 0)
 CXXVERSION=-cl19
+!ELSE
+CXXVERSION=-cl
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:" x64" > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" x64" > nul] == 0)
 OSNAME=-win64
-!ELSEIF ([cl /? 2>&1 | findstr /C:" x86" > nul] == 0)
+!ELSE
 OSNAME=-win32
 !ENDIF
 
@@ -16,9 +18,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19-debug\contrib-saflp-ecolib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-optlp-ecolib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-saflp-ecolib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-optlp-ecolib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-saflp-ecolib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-optlp-ecolib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-saflp-ecolib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-optlp-ecolib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-saflp-ecolib-)
 !ENDIF
 !ELSE
 !IF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win64"
@@ -27,9 +32,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-saflp-ecolib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-optlp-ecolib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-saflp-ecolib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-optlp-ecolib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-saflp-ecolib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-optlp-ecolib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-saflp-ecolib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-optlp-ecolib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-saflp-ecolib-)
 !ENDIF
 !ENDIF
 

contrib/gdbprintlib/Makefile

@@ -1,11 +1,13 @@
 include objects.lst
 
-!IF ([cl /? 2>&1 | findstr /C:"Compiler Version 19." > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" 19." > nul] == 0)
 CXXVERSION=-cl19
+!ELSE
+CXXVERSION=-cl
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:" x64" > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" x64" > nul] == 0)
 OSNAME=-win64
-!ELSEIF ([cl /? 2>&1 | findstr /C:" x86" > nul] == 0)
+!ELSE
 OSNAME=-win32
 !ENDIF
 
@@ -16,9 +18,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19-debug\contrib-saflp-gdbprintlib-
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-optlp-gdbprintlib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-saflp-gdbprintlib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-optlp-gdbprintlib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-saflp-gdbprintlib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-optlp-gdbprintlib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-saflp-gdbprintlib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-optlp-gdbprintlib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-saflp-gdbprintlib-)
 !ENDIF
 !ELSE
 !IF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win64"
@@ -27,9 +32,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-saflp-gdbprintlib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-optlp-gdbprintlib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-saflp-gdbprintlib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-optlp-gdbprintlib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-saflp-gdbprintlib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-optlp-gdbprintlib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-saflp-gdbprintlib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-optlp-gdbprintlib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-saflp-gdbprintlib-)
 !ENDIF
 !ENDIF
 

contrib/qfclib/Makefile

@@ -1,11 +1,13 @@
 include objects.lst
 
-!IF ([cl /? 2>&1 | findstr /C:"Compiler Version 19." > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" 19." > nul] == 0)
 CXXVERSION=-cl19
+!ELSE
+CXXVERSION=-cl
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:" x64" > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" x64" > nul] == 0)
 OSNAME=-win64
-!ELSEIF ([cl /? 2>&1 | findstr /C:" x86" > nul] == 0)
+!ELSE
 OSNAME=-win32
 !ENDIF
 
@@ -16,9 +18,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19-debug\contrib-saflp-qfclib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-optlp-qfclib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-saflp-qfclib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-optlp-qfclib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-saflp-qfclib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-optlp-qfclib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-saflp-qfclib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-optlp-qfclib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-saflp-qfclib-)
 !ENDIF
 !ELSE
 !IF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win64"
@@ -27,9 +32,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-saflp-qfclib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-optlp-qfclib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-saflp-qfclib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-optlp-qfclib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-saflp-qfclib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-optlp-qfclib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-saflp-qfclib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-optlp-qfclib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-saflp-qfclib-)
 !ENDIF
 !ENDIF
 

contrib/src/Makefile

@@ -1,11 +1,13 @@
 include objects.lst
 
-!IF ([cl /? 2>&1 | findstr /C:"Compiler Version 19." > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" 19." > nul] == 0)
 CXXVERSION=-cl19
+!ELSE
+CXXVERSION=-cl
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:" x64" > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" x64" > nul] == 0)
 OSNAME=-win64
-!ELSEIF ([cl /? 2>&1 | findstr /C:" x86" > nul] == 0)
+!ELSE
 OSNAME=-win32
 !ENDIF
 
@@ -16,9 +18,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19-debug\contrib-saflp-src-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-optlp-src-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-saflp-src-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-optlp-src-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-saflp-src-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-optlp-src-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-saflp-src-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-optlp-src-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-saflp-src-)
 !ENDIF
 !ELSE
 !IF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win64"
@@ -27,9 +32,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-saflp-src-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-optlp-src-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-saflp-src-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-optlp-src-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-saflp-src-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-optlp-src-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-saflp-src-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-optlp-src-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-saflp-src-)
 !ENDIF
 !ENDIF
 

contrib/statslib/Makefile

@@ -1,11 +1,13 @@
 include objects.lst
 
-!IF ([cl /? 2>&1 | findstr /C:"Compiler Version 19." > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" 19." > nul] == 0)
 CXXVERSION=-cl19
+!ELSE
+CXXVERSION=-cl
 !ENDIF
-!IF ([cl /? 2>&1 | findstr /C:" x64" > nul] == 0)
+!IF ([cl 2>&1 | findstr /C:" x64" > nul] == 0)
 OSNAME=-win64
-!ELSEIF ([cl /? 2>&1 | findstr /C:" x86" > nul] == 0)
+!ELSE
 OSNAME=-win32
 !ENDIF
 
@@ -16,9 +18,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19-debug\contrib-saflp-statslib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-optlp-statslib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19-debug\contrib-saflp-statslib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-optlp-statslib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl-debug\contrib-saflp-statslib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-optlp-statslib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl-debug\contrib-saflp-statslib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-optlp-statslib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl-debug\contrib-saflp-statslib-)
 !ENDIF
 !ELSE
 !IF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win64"
@@ -27,9 +32,12 @@ SAF=$(OBJECTS: = ..\..\build\objects\win64-cl19\contrib-saflp-statslib-)
 !ELSEIF "$(CXXVERSION)"=="-cl19" && "$(OSNAME)"=="-win32"
 OPT=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-optlp-statslib-)
 SAF=$(OBJECTS: = ..\..\build\objects\win32-cl19\contrib-saflp-statslib-)
+!ELSEIF "$(CXXVERSION)"=="-cl" && "$(OSNAME)"=="-win64"
+OPT=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-optlp-statslib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win64-cl\contrib-saflp-statslib-)
 !ELSE
-OPT=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-optlp-statslib-)
-SAF=$(OBJECTS: = ..\..\build\objects\win-cl\contrib-saflp-statslib-)
+OPT=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-optlp-statslib-)
+SAF=$(OBJECTS: = ..\..\build\objects\win32-cl\contrib-saflp-statslib-)
 !ENDIF
 !ENDIF
 

scripts/admb/admb.bat

@@ -189,20 +189,17 @@ if "!CXX!"=="cl" (
   ) else (
     set CXXFLAGS=!CXXFLAGS! /O2
   )
-  for /f "tokens=*" %%i in ('!CXX! 2^>^&1 ^| findstr "Compiler Version 19."') do (
+  for /f "tokens=*" %%i in ('!CXX! 2^>^&1 ^| findstr " 19."') do (
     set CXXVERSION=-cl19
-    for /f "tokens=*" %%i in ('!CXX! 2^>^&1 ^| findstr "x64"') do (
-      set OSNAME=-win64
-    )
-    for /f "tokens=*" %%i in ('!CXX! 2^>^&1 ^| findstr "x86"') do (
-      set OSNAME=-win32
-    )
   )
   if not defined CXXVERSION (
     set CXXVERSION=-cl
   )
+  for /f "tokens=*" %%i in ('!CXX! 2^>^&1 ^| findstr " x64"') do (
+    set OSNAME=-win64
+  )
   if not defined OSNAME (
-    set OSNAME=-win
+    set OSNAME=-win32
   )
   if exist "!ADMB_HOME!\bin\admb-cfg!OSNAME!!CXXVERSION!.bat" (
     call "!ADMB_HOME!\bin\admb-cfg!OSNAME!!CXXVERSION!.bat"