From patchwork Fri Oct 18 00:00:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 868 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id 4Ne7LICcqV21aQAAIUCqbw for ; Fri, 18 Oct 2019 07:05:36 -0400 Received: from proxy3.mail.ord1c.rsapps.net ([172.28.255.1]) by director12.mail.ord1d.rsapps.net with LMTP id uGmJLICcqV0zOAAAIasKDg ; Fri, 18 Oct 2019 07:05:36 -0400 Received: from smtp25.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.ord1c.rsapps.net with LMTP id wMJ5K4CcqV0gTQAANIxBXg ; Fri, 18 Oct 2019 07:05:36 -0400 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: smtp25.gate.ord1c.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: 35eabdbc-f197-11e9-a17c-b8ca3a673c88-1-1 Received: from [216.105.38.7] ([216.105.38.7:44758] helo=lists.sourceforge.net) by smtp25.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id F6/4D-28445-08C99AD5; Fri, 18 Oct 2019 07:05:36 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1iLQ2U-0002Wh-QY; Fri, 18 Oct 2019 11:03:22 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iLQ2T-0002WZ-LZ for openvpn-devel@lists.sourceforge.net; Fri, 18 Oct 2019 11:03:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=436k6ckx3g7OkYtax7Z460G2rXnND2Y4Tve96JAFJII=; b=PSQCgpvIjNI/jzkMTdoxBkilZp DwXl/8eOoOwtNFhYYraiF5KzEJqWe1qPbnxh3THOa9IOeLf4DXvGJgr6zhwAEPl/f/gmr4EQLfoXR E7eK6q7pGGEWk8h1dsa3ruW2bf9E3RXilnFQhYFfWb7rqCyzRnidH2IRx4cyvXYrmpdI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=436k6ckx3g7OkYtax7Z460G2rXnND2Y4Tve96JAFJII=; b=Ykiyd/YjaT0tZv1pax+Cq6NB4S B04++76vdm9l8TeP06fNOyMf0S2NtjmOT8+MyUJRbwx1DkbmkeQLAqcFGR7O/dnig3sJyXDNYJIpU pUkRWi2qf6CHlIdcHgIonMlKFA0qjpj+n4bJGWW4DO+KsDjPGy+w+8JWmDRLsneB6brA=; Received: from mail-wm1-f65.google.com ([209.85.128.65]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iLQ2R-00DP6R-Es for openvpn-devel@lists.sourceforge.net; Fri, 18 Oct 2019 11:03:21 +0000 Received: by mail-wm1-f65.google.com with SMTP id m18so5688045wmc.1 for ; Fri, 18 Oct 2019 04:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=436k6ckx3g7OkYtax7Z460G2rXnND2Y4Tve96JAFJII=; b=tdmoQQE9q+6Jl8LosozLjPDdBahJk6DBi+t+P82As23Q3BtfWZOKa/bKGhyctjNm9Q 7bE4qGW5XHAlvylvXI9/DvINtrOzmpZraY7PtxOIlEDT4dGRD6A5cnTBemLlr/NE8uLu cOlITbKokv4I2DxX5QJTYnYIxqXbbilsMJV8O+UeMkXF/tZdO4kX6VS5vPDyzgO9O/LP lcy+/RC+PpCiXW2SYDRq8Xp9laGxvcXwqOiVv6Bs4c3Faw3z2fs6qF80/qYgY2pNHXZ7 f3SYMMhYIYAaznyd5Axevzdf7ERSRjaIfa4FIaR3xx5xHSSKxEzCYnPU+WwHmO7Nlwzd eL/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=436k6ckx3g7OkYtax7Z460G2rXnND2Y4Tve96JAFJII=; b=rhX97blYJwznA+jBUfCKMdBhXxvANnBf7Mm0IIGW0Joe3v2deGKPhE/pRBkp+r1oGZ vN/dcKggGZx3OxO7lGk847MRYOTXH225mXmPQ/BNowdxyuLkj7JXvITO9+Ea3zr6TLzA mY0jEZBhALETE74kp/m2B6kDbUEcTCUbJMP/ZVqUNufcxyRRBOV7gvYFsXgAHczTpMkL xP+bPo/JPovwggq6xsJZH7wIbzTU9gABaqBEosah/p+TujuaZltRB6MdLBlILFYoxewn JfNQMiZDQZStl0SmOBauu2Kxm2aAdwJIwPMmDCVFkkmPWkVQGkG+hmRbQzJ0+/M9w6S7 fCbA== X-Gm-Message-State: APjAAAXPaow2bx73+4BzbU9LT5ZlJAuAeDV6b21NLryy0vrYGW5A2+ak J6Jp8R+OcIgam76B65Muf0oTzDDpjVvnag== X-Google-Smtp-Source: APXvYqyYQCGsN8/xfxFnMM45EmO++ah4HhPCz7lyrIjhf717LUlAOZELHpdgcu88kZgZw7CXY7IVIA== X-Received: by 2002:a05:600c:2054:: with SMTP id p20mr7555148wmg.76.1571396592031; Fri, 18 Oct 2019 04:03:12 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id n22sm4484348wmk.19.2019.10.18.04.03.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Oct 2019 04:03:11 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Fri, 18 Oct 2019 14:00:38 +0300 Message-Id: <1571396438-22066-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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.128.65 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.65 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: 1iLQ2R-00DP6R-Es Subject: [Openvpn-devel] [PATCH] 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov I had to remove output redirect from build-deps.sh to file, because building OpenSSL on Windows takes some time, and travis aborts job if there is no output for more than 10 minutes. Signed-off-by: Lev Stipakov --- Please note, that in order this to work, following patches have to be merged: - https://github.com/OpenVPN/openvpn-build/pull/157 - https://patchwork.openvpn.net/patch/867/ .travis.yml | 9 ++++++++- .travis/build-check.sh | 5 +++++ .travis/build-deps.sh | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d07cdc..398bfac 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/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}"