From patchwork Thu Nov 7 10:29:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 886 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id cLMZNu2NxF1tYgAAIUCqbw for ; Thu, 07 Nov 2019 16:34:37 -0500 Received: from proxy1.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id CGNXM+2NxF0aDQAAalYnBA ; Thu, 07 Nov 2019 16:34:37 -0500 Received: from smtp15.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3b.rsapps.net with LMTP id mLHtLO2NxF3aAQAALM5PBw ; Thu, 07 Nov 2019 16:34:37 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp15.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 65788af4-01a6-11ea-8f42-5254003d6d3a-1-1 Received: from [216.105.38.7] ([216.105.38.7:43544] helo=lists.sourceforge.net) by smtp15.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 30/7F-05940-DED84CD5; Thu, 07 Nov 2019 16:34:37 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iSpP9-0003sK-8d; Thu, 07 Nov 2019 21:33:23 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iSpP8-0003sC-82 for openvpn-devel@lists.sourceforge.net; Thu, 07 Nov 2019 21:33:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=J1dT8nCb3J1C7jPlY8+MsZepLZgqRpeKgXpXcLlIx7o=; b=AIkQ91ixmB6QfaSf3YpuSSgp3N LoI7AedopIiRmml2sIX3d/0gAibGxUWJQ6QmBRtLGAbd9GytWav05ThaOQ07OjB3x4K/yeRABBV3x XsF04UVMCYTknz4HriTNyP/27WrHsSHkffS2StBtNZKLtw+EWokWXRBkiOo8cJ/XB94w=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=J1dT8nCb3J1C7jPlY8+MsZepLZgqRpeKgXpXcLlIx7o=; b=E5ge9FrbnmnwgtZXnFViZcLZeh HHEcsKJwA4mJilTLPMn/fn6DGMjWcpL9s/91nl/jWLj4m6pr238EZZCBxEBpyFj63R3ybQWhBl3fi cAjl+LQxv/QspZBjDDYUDHKVh4ZqSvcm2HopgulKPZ6+8d9jTCytdzdyCsXUkYxbjxjo=; Received: from mail-wr1-f51.google.com ([209.85.221.51]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iSpP6-005SN2-Fg for openvpn-devel@lists.sourceforge.net; Thu, 07 Nov 2019 21:33:22 +0000 Received: by mail-wr1-f51.google.com with SMTP id a11so4770829wra.6 for ; Thu, 07 Nov 2019 13:33:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J1dT8nCb3J1C7jPlY8+MsZepLZgqRpeKgXpXcLlIx7o=; b=maQtzy3l+oP/ZWKvmEXcG6d2o7gsFKaN0Ez2cNy0eyZnN1nPpHOfDVuzt6siHnY9l1 b/IoyeYu5aTcbQmJCU5SPtlmE68pGSa61atc1xJElzTwAZXfEAQFURrBlq+iuNQn5WBb DDDpA5rw9z3/QESXAqUFAuXjr0WVZ4chZReGCWDyUVN7hagiEFlgDiRVA3H3Z9+1BsQ/ c0FsznseR0HctVZRqCHER/YW+WA7n2ZgxCYWnWqQjA8hWXsG5s+BmYRm3LMRVShZQQuC /YeGzTg315rQo4jmXhWiC0zbOd5xsI9S30OFAbSaeeGR9ZzGzbMT6qSaizu1MTWTgZm+ do9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=J1dT8nCb3J1C7jPlY8+MsZepLZgqRpeKgXpXcLlIx7o=; b=b5dpu01l7myQYmCtxSKVt9yjRr2JslG3/ZrNsgcT5OeroODx4TRSbVq+4wUtu7oX6D JBByjx62Vk+we53XP8+4QGp8xnctWK/IgnO6ultbgpIzTZCxtgpTiKk+F9x2FM3qkxHq J3w2Den3Bl42TTvqnS2Y8A81BTwHcnBc8SJUG0gTz3ddJGUAFea4oTacFYq+dh35hLIm C4/pAZp/4iHIg23E6QTLnskCiIJbiOWl3V1l1+9HYH2p0lTG+Xhz+RvTlJiX04EdRH2u 3zRdQT1aGM7mirMvqEPvK73n9+ReXF0J28Aj+OIRn3OXqnGlvEht4ZAfnuCU2xysK+NQ 2KEg== X-Gm-Message-State: APjAAAWXkJVUVkLVuBVOkct1/r+T4zPTu8/5exEzoobokkjBqrFDTKSr 2+v8Zpt70BQObOQu8gy0XVUtag0OWii/TuE6 X-Google-Smtp-Source: APXvYqw/jo1vrpdDfZLtTtWR0Yp/34cV4LLbc+9yyFkscCeuJJFqaCzGcPgw4hjhWZTzZs4KkX+QsQ== X-Received: by 2002:adf:da4a:: with SMTP id r10mr5255552wrl.356.1573162393252; Thu, 07 Nov 2019 13:33:13 -0800 (PST) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id h8sm5206744wrc.73.2019.11.07.13.33.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Nov 2019 13:33:12 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 7 Nov 2019 23:29:34 +0200 Message-Id: <1573162174-28461-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: coverity.sh] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.51 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.51 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1iSpP6-005SN2-Fg Subject: [Openvpn-devel] [PATCH v2] travis: add Visual Studio build X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- v2; do not unconditionally print dependencies build output for non-Windows builds .travis.yml | 9 ++++++++- .travis/build-check.sh | 5 +++++ .travis/build-deps.sh | 9 +++++++++ .travis/run-build-deps.sh | 10 ++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 .travis/run-build-deps.sh diff --git a/.travis.yml b/.travis.yml index 2d07cdc..61be17c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,13 @@ env: matrix: include: + - env: + - SSLLIB="openssl" + - OPENSSL_VERSION="1.1.1d" + - P7Z="c:\Program Files\7-Zip\7z.exe" + - CC="cl" + os: windows + compiler: cl - env: SSLLIB="openssl" RUN_COVERITY="1" os: linux compiler: gcc @@ -89,7 +96,7 @@ cache: install: - if [ ! -z "${CHOST}" ]; then unset CC; fi - - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) + - .travis/run-build-deps.sh before_script: - .travis/coverity.sh diff --git a/.travis/build-check.sh b/.travis/build-check.sh index 74f3ae1..d2d2e8a 100755 --- a/.travis/build-check.sh +++ b/.travis/build-check.sh @@ -1,6 +1,11 @@ #!/bin/sh set -eux +if [ "${TRAVIS_OS_NAME}" = "windows" ]; then + PATH="/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/15.0/Bin/":$PATH + MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0 +fi + if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}" fi diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh index 391b35e..724ff30 100755 --- a/.travis/build-deps.sh +++ b/.travis/build-deps.sh @@ -1,6 +1,15 @@ #!/bin/sh set -eux +if [ "${TRAVIS_OS_NAME}" = "windows" ]; then + choco install strawberryperl nasm + cd .. + git clone https://github.com/openvpn/openvpn-build.git + cd openvpn-build + PATH="/c/Strawberry/perl/bin:":$PATH MODE=DEPS msvc/build.bat + exit 0 +fi + # Set defaults PREFIX="${PREFIX:-${HOME}/opt}" diff --git a/.travis/run-build-deps.sh b/.travis/run-build-deps.sh new file mode 100755 index 0000000..b8eb41c --- /dev/null +++ b/.travis/run-build-deps.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eux + +if [ "${TRAVIS_OS_NAME}" = "windows" ]; then + # for windows we need to print output since openssl build + # might take more than 10 minutes, which causes build abort + .travis/build-deps.sh +else + .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) +fi