From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 5 Jun 2014 16:53:44 +0000 (-0500)
Subject: Issue #21665: Don't use 'OPTS=noxp' when compiling Tk.
X-Git-Tag: v3.5.0a1~1511
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba9d233d835934b863d4c9aadc77639de25e848a;p=python

Issue #21665: Don't use 'OPTS=noxp' when compiling Tk.

That option had been for Win2k compatibility (which was dropped with
Python 3.3) and makes default ttk ugly on post-Win2k systems.
---

ba9d233d835934b863d4c9aadc77639de25e848a
diff --cc PCbuild/tk.vcxproj
index 3944ef7945,0000000000..d760f87657
mode 100644,000000..100644
--- a/PCbuild/tk.vcxproj
+++ b/PCbuild/tk.vcxproj
@@@ -1,178 -1,0 +1,178 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="PGInstrument|Win32">
 +      <Configuration>PGInstrument</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="PGInstrument|x64">
 +      <Configuration>PGInstrument</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="PGUpdate|Win32">
 +      <Configuration>PGUpdate</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="PGUpdate|x64">
 +      <Configuration>PGUpdate</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}</ProjectGuid>
 +    <RootNamespace>tk</RootNamespace>
 +    <Keyword>MakeFileProj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>Makefile</ConfigurationType>
 +    <CharacterSet>NotSet</CharacterSet>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="pgupdate.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="pginstrument.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="release.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="debug.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="x64.props" />
 +    <Import Project="pgupdate.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="x64.props" />
 +    <Import Project="pginstrument.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="x64.props" />
 +    <Import Project="release.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="pyproject.props" />
 +    <Import Project="x64.props" />
 +    <Import Project="debug.props" />
 +    <Import Project="tcltk.props" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <NMakeBuildCommandLine>
 +IF EXIST $(tcltkDir)\include\tk.h (
 +    IF EXIST $(tcltkDir)\bin\$(tkDLLName) (
 +        IF EXIST $(OutDir)$(tkDLLName) (
 +            echo Tk is already built and available.
 +            exit /b 0
 +        ) ELSE (
 +            echo Copying tk dll to $(OutDir)
 +            xcopy $(tcltkDir)\bin\$(tkDLLName) $(OutDir)
 +            exit /b 0
 +        )
 +    )
 +)
 +
 +IF NOT EXIST $(tkDir) (
 +    echo error: $(tkDir) doesn't exist.
 +    exit 1
 +)
 +
 +IF "$(Platform)" EQU "Win32" set TclMachine=IX86
 +IF "$(Platform)" EQU "x64" set TclMachine=AMD64
 +
 +IF "$(Configuration)" EQU "Debug" (
-     set TclOpts=symbols,noxp
++    set TclOpts=symbols
 +) ELSE (
-     set TclOpts=noxp
++    set TclOpts=
 +)
 +
 +cd $(tkDir)\win
 +
 +nmake -f makefile.vc MACHINE=%TclMachine% OPTS=%TclOpts% TCLDIR=$(SolutionDir)$(tclDir) all &amp;&amp; nmake -f makefile.vc MACHINE=%TclMachine% OPTS=%TclOpts% TCLDIR=$(SolutionDir)$(tclDir) INSTALLDIR=$(SolutionDir)$(tcltkDir) install-binaries install-libraries &amp;&amp; xcopy /y $(SolutionDir)$(tcltkDir)\bin\$(tkDLLName) $(OutDir)
 +    </NMakeBuildCommandLine>
 +    <NMakeCleanCommandLine>del $(OutDir)$(tkDLLName)
 +echo Tk must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="tcl.vcxproj">
 +      <Project>{b5fd6f1d-129e-4bff-9340-03606fac7283}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>