Commit 61579cd4 authored by Aaron M. Ucko's avatar Aaron M. Ucko
Browse files

New upstream version 2.8.1

parent b81ad626

c++/compilers/cygwin/build.sh

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh

# $Id: build.sh 540404 2017-07-06 15:48:28Z ivanov $

# $Id: build.sh 539747 2017-06-27 13:20:48Z ivanov $

# Author:  Vladimir Ivanov (ivanov@ncbi.nlm.nih.gov)

#

# Build C++ Toolkit using Cygwin

c++/compilers/unix/ICC.sh

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#   OS:         Linux

#   Processor:  Intel X86(-64)

#

# $Revision: 492694 $  // Dmitriy Beloslyudtsev, NCBI (beloslyu@ncbi.nlm.nih.gov)

# $Revision: 549408 $  // Dmitriy Beloslyudtsev, NCBI (beloslyu@ncbi.nlm.nih.gov)

#############################################################################
@@ -39,6 +39,7 @@ case "$1" in 
  *13.[15]*   ) search=$intel_root/Compiler/13.5.192/bin/$arch   ;;

  13* | 2013  ) search=$intel_root/2013/bin                      ;;

  15* | 2015  ) search=$intel_root/Compiler/15.0/bin             ;;

  17* | 2017  ) search=$intel_root/Compiler/17.0/bin             ;;

  *           ) search=                                          ;;

esac

c++/compilers/vs2013/msvcvars.bat

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
@echo off

REM

REM $Id: msvcvars.bat 430635 2014-03-27 17:34:42Z gouriano $

REM



@if not "%VSINSTALLDIR%"=="" goto devenv

@call "%VS120COMNTOOLS%vsvars32.bat"



:devenv



if exist "%VS120COMNTOOLS%..\IDE\VCExpress.*" set DEVENV="%VS120COMNTOOLS%..\IDE\VCExpress"

if exist "%VS120COMNTOOLS%..\IDE\devenv.*" set DEVENV="%VS120COMNTOOLS%..\IDE\devenv"



:end

c++/compilers/vs2015/check.sh

+2 −2
Original line number Diff line number Diff line 
#! /bin/sh

# $Id: check.sh 492980 2016-02-23 16:24:57Z gouriano $

# $Id: check.sh 555573 2018-01-19 13:21:11Z ivanov $

# Author:  Vladimir Ivanov (ivanov@ncbi.nlm.nih.gov)

#

# Check C++ Toolkit in all previously built configurations
@@ -69,7 +69,7 @@ res_log="$build_dir/check.sh.log" 
res_concat="$build_dir/check.sh.out"

res_concat_err="$build_dir/check.sh.out_err"



cfgs="`cat cfgs.log`"

cfgs="`cat cfgs.log | tr -d '\r'`"

if [ -z "$cfgs" ] ; then

    Error "Build some configurations first"

fi

c++/compilers/vs2015/configure.bat

+4 −2
Original line number Diff line number Diff line 
@echo off

REM $Id: configure.bat 505229 2016-06-23 13:04:20Z gouriano $

REM $Id: configure.bat 553712 2017-12-20 18:12:11Z gouriano $

REM ===========================================================================

REM 

REM                            PUBLIC DOMAIN NOTICE
@@ -40,7 +40,7 @@ set use_gui=no 
set maybe_gui=yes

set use_debug=yes

set use_dll=no

set use_64=no

set use_64=yes

set use_staticstd=no

set use_arch=Win32

set use_flags=
@@ -215,6 +215,7 @@ if "%1"=="--without-debug" (set use_debug=no& goto CONTINUEPA 
if "%1"=="--with-debug"                 (set use_debug=yes&      goto CONTINUEPARSEARGS)

if "%1"=="--without-dll"                (set use_dll=no&         goto CONTINUEPARSEARGS)

if "%1"=="--with-dll"                   (set use_dll=yes&        goto CONTINUEPARSEARGS)

if "%1"=="--without-64"                 (set use_64=no&          goto CONTINUEPARSEARGS)

if "%1"=="--with-64"                    (set use_64=yes&         goto CONTINUEPARSEARGS)

if "%1"=="--with-static-exe"            (set use_staticstd=yes&  goto CONTINUEPARSEARGS)

if "%1"=="--with-projects"              (set dest=lst&           goto CONTINUEPARSEARGS)
@@ -275,6 +276,7 @@ if "%help_req%"=="yes" ( 
  echo    --without-dll               -- build all toolkit libraries as static ones

  echo    --with-dll                  -- assemble toolkit libraries into DLLs

  echo                                     where requested

  echo    --without-64                -- compile to 32-bit code

  echo    --with-64                   -- compile to 64-bit code

  echo    --with-static-exe           -- use static C++ standard libraries

  echo    --with-projects=FILE        -- build projects listed in "%srcroot%\FILE"