Author: troycurtisjr Date: Wed Jan 31 03:50:43 2018 New Revision: 1822728 URL: http://svn.apache.org/viewvc?rev=1822728&view=rev Log: On branch swig-py3: Fix python swig compile for Visual Studio <= 2008.
Add the proper UserMacros definitions to pull in the necessary SWIG arguments for python generation. * build/generator/templates/vcnet_vsprops.ezt New file defining UserMacros. * build/generator/templates/vcnet_vcproj.ezt Inherit the new property sheet containing UserMacros. * build/generator/gen_vcnet_vcproj.py (Generator.write_project): Write out the property sheet for Visual Studio 2008 and earlier. Added: subversion/branches/swig-py3/build/generator/templates/vcnet_vsprops.ezt Modified: subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt Modified: subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py?rev=1822728&r1=1822727&r2=1822728&view=diff ============================================================================== --- subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py (original) +++ subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py Wed Jan 31 03:50:43 2018 @@ -125,6 +125,8 @@ class Generator(gen_win.WinGeneratorBase if self.vcproj_extension == '.vcproj': self.write_with_template(fname, 'templates/vcnet_vcproj.ezt', data) + self.write_with_template(os.path.splitext(fname)[0] + '.vsprops', + 'templates/vcnet_vsprops.ezt', data) else: self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data) self.write_with_template(fname + '.filters', 'templates/vcnet_vcxproj_filters.ezt', data) Modified: subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt?rev=1822728&r1=1822727&r2=1822728&view=diff ============================================================================== --- subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt (original) +++ subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt Wed Jan 31 03:50:43 2018 @@ -33,6 +33,7 @@ OutputDirectory="..\..\..\[configs.name]\[target.output_dir]" BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm" IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]\[target.proj_name]" + InheritedPropertySheets=".\[target.proj_name].vsprops" ConfigurationType="[target_type]"[is configs.name "Release"] WholeProgramOptimization="FALSE"[end]> <Tool Added: subversion/branches/swig-py3/build/generator/templates/vcnet_vsprops.ezt URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/templates/vcnet_vsprops.ezt?rev=1822728&view=auto ============================================================================== --- subversion/branches/swig-py3/build/generator/templates/vcnet_vsprops.ezt (added) +++ subversion/branches/swig-py3/build/generator/templates/vcnet_vsprops.ezt Wed Jan 31 03:50:43 2018 @@ -0,0 +1,31 @@ +[# +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +]<?xml version="1.0" encoding = "Windows-1252"?> +[format "xml"]<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="[target.proj_name]" + > + [for user_macros]<UserMacro + Name="[user_macros.name]" + Value="[user_macros.value]" + />[end] +</VisualStudioPropertySheet> +[end]