Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1AB687F19 for ; Mon, 18 Jul 2011 20:33:12 +0000 (UTC) Received: (qmail 58275 invoked by uid 500); 18 Jul 2011 20:33:11 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 57735 invoked by uid 500); 18 Jul 2011 20:33:11 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 57337 invoked by uid 99); 18 Jul 2011 20:33:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2011 20:33:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2011 20:33:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E4E2C23888C2 for ; Mon, 18 Jul 2011 20:32:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148043 - /subversion/trunk/build/generator/gen_win.py Date: Mon, 18 Jul 2011 20:32:44 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110718203244.E4E2C23888C2@eris.apache.org> Author: rhuijben Date: Mon Jul 18 20:32:44 2011 New Revision: 1148043 URL: http://svn.apache.org/viewvc?rev=1148043&view=rev Log: * build/generator/gen_win.py (get_win_libs, write_serf_project_file): Fix compilation agains serf trunk (2.0) which currently still creates a serf-1.lib on Windows. Modified: subversion/trunk/build/generator/gen_win.py Modified: subversion/trunk/build/generator/gen_win.py URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1148043&r1=1148042&r2=1148043&view=diff ============================================================================== --- subversion/trunk/build/generator/gen_win.py (original) +++ subversion/trunk/build/generator/gen_win.py Mon Jul 18 20:32:44 2011 @@ -1021,7 +1021,7 @@ class WinGeneratorBase(GeneratorBase): neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib') if self.serf_lib: - if self.serf_ver_maj == 1: + if self.serf_ver_maj != 0: serflib = 'serf-1.lib' else: serflib = 'serf.lib' @@ -1181,7 +1181,7 @@ class WinGeneratorBase(GeneratorBase): return serf_path = os.path.abspath(self.serf_path) - if self.serf_ver_maj == 1: + if self.serf_ver_maj != 0: serflib = 'serf-1.lib' else: serflib = 'serf.lib'