You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 20:06:33 UTC
svn commit: r984153 [3/39] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/hudson/ build/hudson/jobs/subversion-1.6.x-solaris/
build/hudson/jobs/subversion-1.6.x-ubuntu/ build/hud...
Propchange: subversion/branches/ignore-mergeinfo/build/generator/neon.vcxproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/serf.dsp.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/serf.dsp.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/serf.dsp.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/serf.dsp.ezt Tue Aug 10 18:06:17 2010
@@ -1,96 +1,96 @@
-# Microsoft Developer Studio Project File - Name="serf" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=serf - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "serf.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "serf.mak" CFG="serf - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "serf - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "serf - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "serf - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_File "Release/serf.lib"
-# PROP BASE Bsc_Name ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Release/serf.lib"
-# PROP Bsc_Name ""
-
-!ELSEIF "$(CFG)" == "serf - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Debug/serf.lib"
-# PROP BASE Bsc_Name ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug/serf.lib"
-# PROP Bsc_Name ""
-
-!ENDIF
-
-# Begin Target
-
-# Name "serf - Win32 Release"
-# Name "serf - Win32 Debug"
-
-!IF "$(CFG)" == "serf - Win32 Release"
-
-!ELSEIF "$(CFG)" == "serf - Win32 Debug"
-
-!ENDIF
-
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-[for serf_sources]# Begin Source File
-
-SOURCE="[serf_sources]"
-# End Source File
-[end]
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-[for serf_headers]# Begin Source File
-
-SOURCE="[serf_headers]"
-# End Source File
-[end]
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="serf" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=serf - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "serf.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "serf.mak" CFG="serf - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "serf - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "serf - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF "$(CFG)" == "serf - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_File "Release/serf.lib"
+# PROP BASE Bsc_Name ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Release/serf.lib"
+# PROP Bsc_Name ""
+
+!ELSEIF "$(CFG)" == "serf - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "Debug/serf.lib"
+# PROP BASE Bsc_Name ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Debug/serf.lib"
+# PROP Bsc_Name ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "serf - Win32 Release"
+# Name "serf - Win32 Debug"
+
+!IF "$(CFG)" == "serf - Win32 Release"
+
+!ELSEIF "$(CFG)" == "serf - Win32 Debug"
+
+!ENDIF
+
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+[for serf_sources]# Begin Source File
+
+SOURCE="[serf_sources]"
+# End Source File
+[end]
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+[for serf_headers]# Begin Source File
+
+SOURCE="[serf_headers]"
+# End Source File
+[end]
+# End Group
+# End Target
+# End Project
Propchange: subversion/branches/ignore-mergeinfo/build/generator/serf.dsp.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/serf.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/serf.vcproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/serf.vcproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/serf.vcproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,85 +1,85 @@
-[define COPYRIGHT]
-<!--
- 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.
--->
-[end]<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="[version]"
- Name="serf"
- ProjectGUID="[project_guid]"
- Keyword="MakeFileProj">
- <Platforms>
-[for platforms] <Platform
- Name="[platforms]"/>
-[end] </Platforms>
- <Configurations>
-[for platforms] <Configuration
- Name="Debug|[platforms]"
- OutputDirectory="Debug"
- BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="Debug"
- ConfigurationType="0"
- ManagedExtensions="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- Output="$(OutDir)\serf.lib"/>
- </Configuration>
- <Configuration
- Name="Release|[platforms]"
- OutputDirectory="Release"
- BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="Release"
- ConfigurationType="0"
- ManagedExtensions="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- Output="$(OutDir)\serf.lib"/>
- </Configuration>
-[end] </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- [for serf_sources]<File
- RelativePath="[serf_sources]">
- </File>
- [end]
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- [for serf_headers]<File
- RelativePath="[serf_headers]">
- </File>
- [end]
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+[define COPYRIGHT]
+<!--
+ 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.
+-->
+[end]<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="[version]"
+ Name="serf"
+ ProjectGUID="[project_guid]"
+ Keyword="MakeFileProj">
+ <Platforms>
+[for platforms] <Platform
+ Name="[platforms]"/>
+[end] </Platforms>
+ <Configurations>
+[for platforms] <Configuration
+ Name="Debug|[platforms]"
+ OutputDirectory="Debug"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
+ IntermediateDirectory="Debug"
+ ConfigurationType="0"
+ ManagedExtensions="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ Output="$(OutDir)\serf.lib"/>
+ </Configuration>
+ <Configuration
+ Name="Release|[platforms]"
+ OutputDirectory="Release"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
+ IntermediateDirectory="Release"
+ ConfigurationType="0"
+ ManagedExtensions="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ Output="$(OutDir)\serf.lib"/>
+ </Configuration>
+[end] </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ [for serf_sources]<File
+ RelativePath="[serf_sources]">
+ </File>
+ [end]
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ [for serf_headers]<File
+ RelativePath="[serf_headers]">
+ </File>
+ [end]
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Propchange: subversion/branches/ignore-mergeinfo/build/generator/serf.vcproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/serf.vcxproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/serf.vcxproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/serf.vcxproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,64 +1,64 @@
-[define COPYRIGHT]
-<!--
- 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.
--->
-[end]<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
-[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
- <Configuration>[configs]</Configuration>
- <Platform>[platforms]</Platform>
- </ProjectConfiguration>
-[end][end] </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>serf</ProjectName>
- <ProjectGuid>[project_guid]</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
- <ConfigurationType>Makefile</ConfigurationType>
- <CLRSupport>false</CLRSupport>
- </PropertyGroup>
-[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
- </ImportGroup>
-[end][end] <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
-[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</IntDir>
- <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">nmake /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
- <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\serf.lib</NMakeOutput>
-[end][end] </PropertyGroup>
- <ItemDefinitionGroup>
- </ItemDefinitionGroup>
- <ItemGroup>
-[for serf_sources] <ClCompile Include="[serf_sources]" />
-[end] </ItemGroup>
- <ItemGroup>
-[for serf_headers] <ClInclude Include="[serf_headers]" />
-[end] </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
+[#
+<!--
+ 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="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
+ <Configuration>[configs]</Configuration>
+ <Platform>[platforms]</Platform>
+ </ProjectConfiguration>
+[end][end] </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>serf</ProjectName>
+ <ProjectGuid>[project_guid]</ProjectGuid>
+ <Keyword>MakeFileProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
+ <ConfigurationType>Makefile</ConfigurationType>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ </PropertyGroup>
+[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
+[end][end] <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</IntDir>
+ <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+ <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\serf.lib</NMakeOutput>
+[end][end] </PropertyGroup>
+ <ItemDefinitionGroup>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+[for serf_sources] <ClCompile Include="[serf_sources]" />
+[end] </ItemGroup>
+ <ItemGroup>
+[for serf_headers] <ClInclude Include="[serf_headers]" />
+[end] </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
Propchange: subversion/branches/ignore-mergeinfo/build/generator/serf.vcxproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcproj.ezt Tue Aug 10 18:06:17 2010
@@ -33,7 +33,7 @@
Name="[configs]|[platforms]"
OutputDirectory="."
BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="."
+ IntermediateDirectory="..\..\$(ConfigurationName)"
ConfigurationType="10"
UseOfMFC="0"
DeleteExtensionsOnClean="*.obj;*.ilk;*.pdb;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;$(TargetPath)"
Modified: subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcxproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcxproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcxproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,73 +1,72 @@
-[define COPYRIGHT]
-<!--
- 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.
--->
-[end]<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
-[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
- <Configuration>[configs]</Configuration>
- <Platform>[platforms]</Platform>
- </ProjectConfiguration>
-[end][end] </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>__CONFIG__</ProjectName>
- <ProjectGuid>[project_guid]</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CLRSupport>false</CLRSupport>
- </PropertyGroup>
-[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
- </ImportGroup>
-[end][end] <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
-[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
-[end][end] </PropertyGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\subversion\svn_private_config.h">
-[for configs][for platforms] <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
-[end][end] </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\subversion\svn_private_config.hw">
- <FileType>Document</FileType>
-[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Creating svn_private_config.h from svn_private_config.hw.</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">copy ..\..\subversion\svn_private_config.hw ..\..\subversion\svn_private_config.h > nul
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\subversion\svn_private_config.h;%(Outputs)</Outputs>
-[end][end] </CustomBuild>
-[for sql] <CustomBuild Include="..\..\[sql.source]">
- <FileType>Document</FileType>
-[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Generating [sql.header].</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\[sql.header];%(Outputs)</Outputs>
-[end][end]
- </CustomBuild>
-[end] </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+[#
+<!--
+ 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="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
+ <Configuration>[configs]</Configuration>
+ <Platform>[platforms]</Platform>
+ </ProjectConfiguration>
+[end][end] </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>[project_guid]</ProjectGuid>
+ <Keyword>MakeFileProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ </PropertyGroup>
+[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
+[end][end] <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
+[end][end] </PropertyGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\subversion\svn_private_config.h">
+[for configs][for platforms] <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
+[end][end] </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\subversion\svn_private_config.hw">
+ <FileType>Document</FileType>
+[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Creating svn_private_config.h from svn_private_config.hw.</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">copy ..\..\subversion\svn_private_config.hw ..\..\subversion\svn_private_config.h > nul
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\subversion\svn_private_config.h;%(Outputs)</Outputs>
+[end][end] </CustomBuild>
+[for sql] <CustomBuild Include="..\..\[sql.source]">
+ <FileType>Document</FileType>
+[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Generating [sql.header].</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\[sql.header];%(Outputs)</Outputs>
+[end][end]
+ </CustomBuild>
+[end] </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
</Project>
\ No newline at end of file
Propchange: subversion/branches/ignore-mergeinfo/build/generator/svn_config.vcxproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,52 +1,52 @@
-[define COPYRIGHT]
-<!--
- 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.
--->
-[end]<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="[version]"
- Name="locale"
- ProjectGUID="{18FA6D17-1EE7-43A2-BC2A-C2AF819CEEFB}"
- Keyword="MakeFileProj">
- <Platforms>
-[for platforms] <Platform
- Name="[platforms]"/>
-[end] </Platforms>
- <Configurations>
-[for platforms][for configs] <Configuration
- Name="[configs]|[platforms]"
- OutputDirectory="..\..\[configs]\mo"
- BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="..\..\[configs]\mo"
- ConfigurationType="0"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="cmd /c build_locale.bat [configs]"
- ReBuildCommandLine="cmd /c build_locale.bat [configs]"
- CleanCommandLine="cmd /c del $(OutDir)\*.mo"
- />
- </Configuration>
-[end][end] </Configurations>
- <Files>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+[define COPYRIGHT]
+<!--
+ 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.
+-->
+[end]<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="[version]"
+ Name="locale"
+ ProjectGUID="{18FA6D17-1EE7-43A2-BC2A-C2AF819CEEFB}"
+ Keyword="MakeFileProj">
+ <Platforms>
+[for platforms] <Platform
+ Name="[platforms]"/>
+[end] </Platforms>
+ <Configurations>
+[for platforms][for configs] <Configuration
+ Name="[configs]|[platforms]"
+ OutputDirectory="..\..\[configs]\mo"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
+ IntermediateDirectory="..\..\[configs]\mo"
+ ConfigurationType="0"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="cmd /c build_locale.bat [configs]"
+ ReBuildCommandLine="cmd /c build_locale.bat [configs]"
+ CleanCommandLine="cmd /c del $(OutDir)\*.mo"
+ />
+ </Configuration>
+[end][end] </Configurations>
+ <Files>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Propchange: subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcxproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcxproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcxproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,57 +1,57 @@
-[define COPYRIGHT]
-<!--
- 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.
--->
-[end]<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
-[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
- <Configuration>[configs]</Configuration>
- <Platform>[platforms]</Platform>
- </ProjectConfiguration>
-[end][end] </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectName>locale</ProjectName>
- <ProjectGuid>{18FA6D17-1EE7-43A2-BC2A-C2AF819CEEFB}</ProjectGuid>
- <Keyword>MakeFileProj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CLRSupport>false</CLRSupport>
- </PropertyGroup>
-[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
- </ImportGroup>
-[end][end] <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
-[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\[configs]\mo\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\[configs]\mo\</IntDir>
- <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c build_locale.bat [configs]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c build_locale.bat [configs]</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c del $(OutDir)*.mo</NMakeCleanCommandLine>
-[end][end] </PropertyGroup>
- <ItemGroup>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+[define COPYRIGHT]
+<!--
+ 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.
+-->
+[end]<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+[for configs][for platforms] <ProjectConfiguration Include="[configs]|[platforms]">
+ <Configuration>[configs]</Configuration>
+ <Platform>[platforms]</Platform>
+ </ProjectConfiguration>
+[end][end] </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>locale</ProjectName>
+ <ProjectGuid>{18FA6D17-1EE7-43A2-BC2A-C2AF819CEEFB}</ProjectGuid>
+ <Keyword>MakeFileProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
+ <ConfigurationType>Utility</ConfigurationType>
+ <CLRSupport>false</CLRSupport>
+ </PropertyGroup>
+[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
+[end][end] <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\[configs]\mo\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\[configs]\mo\</IntDir>
+ <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c build_locale.bat [configs]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c build_locale.bat [configs]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c del $(OutDir)*.mo</NMakeCleanCommandLine>
+[end][end] </PropertyGroup>
+ <ItemGroup>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
</Project>
\ No newline at end of file
Propchange: subversion/branches/ignore-mergeinfo/build/generator/svn_locale.vcxproj.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/makefile.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/makefile.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/makefile.ezt Tue Aug 10 18:06:17 2010
@@ -1,4 +1,25 @@
-# DO NOT EDIT -- AUTOMATICALLY GENERATED
+[define COPYRIGHT]
+#
+#
+# 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.
+#
+#
+[end]# DO NOT EDIT -- AUTOMATICALLY GENERATED
########################################
# Section 1: Global make variables
Propchange: subversion/branches/ignore-mergeinfo/build/generator/templates/makefile.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_sln.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_sln.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_sln.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_sln.ezt Tue Aug 10 18:06:17 2010
@@ -1,64 +1,64 @@
-[define COPYRIGHT]
-#
-#
-# 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.
-#
-#
-[end]Microsoft Visual Studio Solution File, Format Version [version]
-# Visual Studio [vs_version]
-[for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "[targets.name]", "[targets.path]", "[targets.guid]"
-[is dependency_location "solution"] ProjectSection(ProjectDependencies) = postProject
-[for targets.depends] [targets.depends.guid] = [targets.depends.guid]
-[end] EndProjectSection
-[end]EndProject
-[end]Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{2F13BEE6-AA51-4882-9015-DCE38AB8E474}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Swig", "Swig", "{9D82B7A1-8C6E-4FB1-895C-DEE6E244CB21}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java", "Java", "{B604B17D-DC50-44D4-AD41-088A67CFB89E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Programs", "Programs", "{01A6F906-A386-4E8D-B080-49A3373A7158}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{630535D0-22D7-4D7C-8850-CB468739AFAC}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
-[for configs][for platforms] [configs.name]|[platforms] = [configs.name]|[platforms]
-[end][end] EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
-[for guids][for platforms][for configs] [guids].[configs.name]|[platforms].ActiveCfg = [configs.name]|[platforms]
-[end][for configs] [guids].[configs.name]|[platforms].Build.0 = [configs.name]|[platforms]
-[end][end][end] EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
-[for targets][is targets.group "exe"] [targets.guid] = {01A6F906-A386-4E8D-B080-49A3373A7158}
-[end][is targets.group "lib"] [targets.guid] = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
-[end][is targets.group "dll"] [targets.guid] = {2F13BEE6-AA51-4882-9015-DCE38AB8E474}
-[end][is targets.group "swiglib"] [targets.guid] = {9D82B7A1-8C6E-4FB1-895C-DEE6E244CB21}
-[end][is targets.group "test"] [targets.guid] = {630535D0-22D7-4D7C-8850-CB468739AFAC}
-[end][is targets.group "java"] [targets.guid] = {B604B17D-DC50-44D4-AD41-088A67CFB89E}
-[end][end] {9D82B7A1-8C6E-4FB1-895C-DEE6E244CB21} = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
- {2F13BEE6-AA51-4882-9015-DCE38AB8E474} = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
- {B604B17D-DC50-44D4-AD41-088A67CFB89E} = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
- EndGlobalSection
-EndGlobal
+[define COPYRIGHT]
+#
+#
+# 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.
+#
+#
+[end]Microsoft Visual Studio Solution File, Format Version [version]
+# Visual Studio [vs_version]
+[for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "[targets.name]", "[targets.path]", "[targets.guid]"
+[is dependency_location "solution"] ProjectSection(ProjectDependencies) = postProject
+[for targets.depends] [targets.depends.guid] = [targets.depends.guid]
+[end] EndProjectSection
+[end]EndProject
+[end]Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{2F13BEE6-AA51-4882-9015-DCE38AB8E474}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Swig", "Swig", "{9D82B7A1-8C6E-4FB1-895C-DEE6E244CB21}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java", "Java", "{B604B17D-DC50-44D4-AD41-088A67CFB89E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Programs", "Programs", "{01A6F906-A386-4E8D-B080-49A3373A7158}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{630535D0-22D7-4D7C-8850-CB468739AFAC}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+[for configs][for platforms] [configs.name]|[platforms] = [configs.name]|[platforms]
+[end][end] EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+[for guids][for platforms][for configs] [guids].[configs.name]|[platforms].ActiveCfg = [configs.name]|[platforms]
+[end][for configs] [guids].[configs.name]|[platforms].Build.0 = [configs.name]|[platforms]
+[end][end][end] EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+[for targets][is targets.group "exe"] [targets.guid] = {01A6F906-A386-4E8D-B080-49A3373A7158}
+[end][is targets.group "lib"] [targets.guid] = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
+[end][is targets.group "dll"] [targets.guid] = {2F13BEE6-AA51-4882-9015-DCE38AB8E474}
+[end][is targets.group "swiglib"] [targets.guid] = {9D82B7A1-8C6E-4FB1-895C-DEE6E244CB21}
+[end][is targets.group "test"] [targets.guid] = {630535D0-22D7-4D7C-8850-CB468739AFAC}
+[end][is targets.group "java"] [targets.guid] = {B604B17D-DC50-44D4-AD41-088A67CFB89E}
+[end][end] {9D82B7A1-8C6E-4FB1-895C-DEE6E244CB21} = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
+ {2F13BEE6-AA51-4882-9015-DCE38AB8E474} = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
+ {B604B17D-DC50-44D4-AD41-088A67CFB89E} = {F6BDBE6F-7C7B-458B-8801-0B351C85ED6E}
+ EndGlobalSection
+EndGlobal
Propchange: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_sln.ezt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vc7_sln.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vc7_sln.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vc7_sln.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vc7_sln.ezt Tue Aug 10 18:06:17 2010
@@ -1,40 +1,40 @@
-[define COPYRIGHT]
-#
-#
-# 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.
-#
-#
-[end]Microsoft Visual Studio Solution File, Format Version [version]
-[for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "[targets.name]", "[targets.path]", "[targets.guid]"
-EndProject
-[end]Global
- GlobalSection(SolutionConfiguration) = preSolution
-[for configs] ConfigName.[configs.index] = [configs.name]
-[end] EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
-[for targets][for targets.depends] [targets.guid].[targets.depends.index] = [targets.depends.guid]
-[end][end] EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
-[for guids][for platforms][for configs] [guids].[configs.name].ActiveCfg = [configs.name]|[platforms]
-[end][for configs] [guids].[configs.name].Build.0 = [configs.name]|[platforms]
-[end][end][end] EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
+[define COPYRIGHT]
+#
+#
+# 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.
+#
+#
+[end]Microsoft Visual Studio Solution File, Format Version [version]
+[for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "[targets.name]", "[targets.path]", "[targets.guid]"
+EndProject
+[end]Global
+ GlobalSection(SolutionConfiguration) = preSolution
+[for configs] ConfigName.[configs.index] = [configs.name]
+[end] EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+[for targets][for targets.depends] [targets.guid].[targets.depends.index] = [targets.depends.guid]
+[end][end] EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+[for guids][for platforms][for configs] [guids].[configs.name].ActiveCfg = [configs.name]|[platforms]
+[end][for configs] [guids].[configs.name].Build.0 = [configs.name]|[platforms]
+[end][end][end] EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Propchange: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vc7_sln.ezt
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Aug 10 18:06:17 2010
@@ -1 +1 @@
-CRLF
+native
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt?rev=984153&r1=984152&r2=984153&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt Tue Aug 10 18:06:17 2010
@@ -1,158 +1,160 @@
-[define COPYRIGHT]
-<!--
- 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.
--->
-[end]<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="[version]"
- Name="[target.proj_name]"
- ProjectGUID="[project_guid]">
- <Platforms>
-[for platforms] <Platform
- Name="[platforms]"/>
-[end] </Platforms>
- <Configurations>
-[for platforms][for configs] <Configuration
- Name="[configs.name]|[platforms]"
- OutputDirectory="..\..\..\[configs.name]\[target.output_dir]"
- BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]"
- ConfigurationType="[target_type]"[is configs.name "Release"]
- WholeProgramOptimization="FALSE"[end]>
- <Tool
- Name="VCCLCompilerTool"
-[is configs.name "Debug"] Optimization="0"
- GlobalOptimizations="FALSE"
-[else] Optimization="2"
- GlobalOptimizations="TRUE"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="1"
- OmitFramePointers="TRUE"
-[end] AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
- PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
-[is configs.name "Debug"] MinimalRebuild="TRUE"
- RuntimeLibrary="3"
- BufferSecurityCheck="TRUE"
- EnableFunctionLevelLinking="TRUE"
-[else] StringPooling="TRUE"
- RuntimeLibrary="2"
- BufferSecurityCheck="FALSE"
-[end] WarningLevel="4"
- DisableSpecificWarnings="4100;4127;4204;4206;4701;4706"
- Detect64BitPortabilityProblems="FALSE"
- AdditionalOptions="
- /we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4047 /we4089 /we4115"
- DebugInformationFormat="3"
- ProgramDataBaseFileName="$(IntDir)\[target.output_pdb]"
- CompileAsManaged="0"
- CompileAs="0"[if-any is_exe][is configs.name "Release"]
- OptimizeForWindowsApplication="TRUE"[end][end]/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
-[is target_type "1"][if-any instrument_purify_quantify] AdditionalOptions="/fixed:no"[end][end]
- AdditionalDependencies="[for configs.libs][configs.libs] [end]"
-[is target_type "4"][else] OutputFile="$(OutDir)\[target.output_name]"
-[end][is configs.name "Debug"] LinkIncremental="2"
-[else] LinkIncremental="1"
-[end] AdditionalLibraryDirectories="..\..\..\db4-win32\lib;[for configs.libdirs][configs.libdirs];[end]"
- TargetMachine="[is platforms "Win32"]1[end][is platforms "x64"]17[end]"
- IgnoreDefaultLibraryNames="libc.lib"
-[if-any def_file] ModuleDefinitionFile="[def_file]"
-[end] GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"[is configs.name "Debug"]
- OptimizeReferences="0"[else]
- OptimizeReferences="2"
- EnableCOMDATFolding="2"[end][is target_type "2"]
- ImportLibrary="$(OutDir)\$(TargetName).lib"[end]
-[is target_type "1"] Subsystem="1"[end]/>
-[is target_type "4"]
- <Tool
- Name="VCLibrarianTool"
- AdditionalOptions="[is platforms "win32"]/MACHINE:X86[end][is platforms "x64"]/MACHINE:X64[end]"
- OutputFile="$(OutDir)\[target.output_name]"/>
-[end] <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
-[end][end] </Configurations>
- <Files>[if-any target.desc]
- <File
- RelativePath="..\svn.rc">[for platforms][for configs]
- <FileConfiguration
- Name="[configs.name]|[platforms]">
- <Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
- PreprocessorDefinitions="SVN_FILE_NAME=[target.output_name];SVN_FILE_DESCRIPTION=[target.desc];[is configs.name "Debug"]_DEBUG[else]NDEBUG[end]"/>
- </FileConfiguration>[end][end]
- </File>[end]
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-[for sources][is sources.extension ".h"][else] <File
- RelativePath="[sources.path]">
-[if-any sources.custom_build][for platforms][for configs]
- <FileConfiguration
- Name="[configs.name]|[platforms]">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="[sources.custom_build]"
- AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
- Outputs=""[sources.custom_target]""/>
- </FileConfiguration>
-[end][end][end]
-[if-any sources.reldir][for platforms][for configs]
- <FileConfiguration
- Name="[configs.name]|[platforms]">
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/[sources.reldir]/"
- ProgramDataBaseFileName="$(IntDir)/[sources.reldir]/[target.proj_name]-[sources.reldir].pdb"/>
- </FileConfiguration>
-[end][end][end]
- </File>
-[end][end]
-[is target_type "2"] <File RelativePath="..\empty.c"/>[end]
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
-[for sources][is sources.extension ".h"]
- <File
- RelativePath="[sources.path]" />
-[end][end]
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+[#
+<!--
+ 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"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="[version]"
+ Name="[target.proj_name]"
+ ProjectGUID="[project_guid]">
+ <Platforms>
+[for platforms] <Platform
+ Name="[platforms]"/>
+[end] </Platforms>
+ <Configurations>
+[for platforms][for configs] <Configuration
+ Name="[configs.name]|[platforms]"
+ OutputDirectory="..\..\..\[configs.name]\[target.output_dir]"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
+ IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]"
+ ConfigurationType="[target_type]"[is configs.name "Release"]
+ WholeProgramOptimization="FALSE"[end]>
+ <Tool
+ Name="VCCLCompilerTool"
+[is configs.name "Debug"] Optimization="0"
+ GlobalOptimizations="FALSE"
+[else] Optimization="2"
+ GlobalOptimizations="TRUE"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="TRUE"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="TRUE"
+[end] AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
+ PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
+[is configs.name "Debug"] MinimalRebuild="TRUE"
+ RuntimeLibrary="3"
+ BasicRuntimeChecks="3"
+ BufferSecurityCheck="TRUE"
+ EnableFunctionLevelLinking="TRUE"
+[else] StringPooling="TRUE"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="FALSE"
+[end] WarningLevel="4"
+ DisableSpecificWarnings="4100;4127;4204;4206;4701;4706"
+ Detect64BitPortabilityProblems="FALSE"
+ AdditionalOptions="
+ /we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4047 /we4089 /we4115"
+ DebugInformationFormat="3"
+ ProgramDataBaseFileName="$(IntDir)\[target.output_pdb]"
+ CompileAsManaged="0"
+ CompileAs="0"[if-any is_exe][is configs.name "Release"]
+ OptimizeForWindowsApplication="TRUE"[end][end]/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+[is target_type "1"][if-any instrument_purify_quantify] AdditionalOptions="/fixed:no"[end][end]
+ AdditionalDependencies="[for configs.libs][configs.libs] [end]"
+[is target_type "4"][else] OutputFile="$(OutDir)\[target.output_name]"
+[end][is configs.name "Debug"] LinkIncremental="2"
+[else] LinkIncremental="1"
+[end] AdditionalLibraryDirectories="..\..\..\db4-win32\lib;[for configs.libdirs][configs.libdirs];[end]"
+ TargetMachine="[is platforms "Win32"]1[end][is platforms "x64"]17[end]"
+ IgnoreDefaultLibraryNames="libc.lib"
+[if-any def_file] ModuleDefinitionFile="[def_file]"
+[end] GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"[is configs.name "Debug"]
+ OptimizeReferences="0"[else]
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"[end][is target_type "2"]
+ ImportLibrary="$(OutDir)\$(TargetName).lib"[end]
+[is target_type "1"] Subsystem="1"[end]/>
+[is target_type "4"]
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalOptions="[is platforms "win32"]/MACHINE:X86[end][is platforms "x64"]/MACHINE:X64[end]"
+ OutputFile="$(OutDir)\[target.output_name]"/>
+[end] <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+[end][end] </Configurations>
+ <Files>[if-any target.desc]
+ <File
+ RelativePath="..\svn.rc">[for platforms][for configs]
+ <FileConfiguration
+ Name="[configs.name]|[platforms]">
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
+ PreprocessorDefinitions="SVN_FILE_NAME=[target.output_name];SVN_FILE_DESCRIPTION=[target.desc];[is configs.name "Debug"]_DEBUG[else]NDEBUG[end]"/>
+ </FileConfiguration>[end][end]
+ </File>[end]
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+[for sources][is sources.extension ".h"][else] <File
+ RelativePath="[sources.path]">
+[if-any sources.custom_build][for platforms][for configs]
+ <FileConfiguration
+ Name="[configs.name]|[platforms]">
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="[sources.custom_build]"
+[if-any sources.custom_desc] Description="[sources.custom_desc]"
+[end] AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
+ Outputs=""[sources.custom_target]""/>
+ </FileConfiguration>
+[end][end][end]
+[if-any sources.reldir][for platforms][for configs]
+ <FileConfiguration
+ Name="[configs.name]|[platforms]">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/[sources.reldir]/"
+ ProgramDataBaseFileName="$(IntDir)/[sources.reldir]/[target.proj_name]-[sources.reldir].pdb"/>
+ </FileConfiguration>
+[end][end][end]
+ </File>
+[end][end]
+[is target_type "2"] <File RelativePath="..\empty.c"/>[end]
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+[for sources][is sources.extension ".h"]
+ <File
+ RelativePath="[sources.path]" />
+[end][end]
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Propchange: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Tue Aug 10 18:06:17 2010
@@ -1 +1 @@
-CRLF
+native