AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-8365 Merge changes in branch for CYGWINMSVC fix to trunk

Browse Source 
X-SVN-Rev: 29755
This commit is contained in:
Michael Ow 2011-04-07 17:02:49 +00:00
parent 844149c7bc
commit eed1a93ad3
9 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
icu4c/source/common/common.vcxproj
View File

@ -1711,7 +1711,24 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="unicode\platform.win">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" unicode\%(FileName).h
copy "%(FullPath)" ..\..\include\unicode\%(FileName).h</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">unicode\%(Filename).h;..\..\include\unicode\%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" unicode\%(FileName).h
copy "%(FullPath)" ..\..\include\unicode\%(FileName).h</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">unicode\%(Filename).h;..\..\include\unicode\%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" unicode\%(FileName).h
copy "%(FullPath)" ..\..\include\unicode\%(FileName).h</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">unicode\%(Filename).h;..\..\include\unicode\%(Filename).h;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" unicode\%(FileName).h
copy "%(FullPath)" ..\..\include\unicode\%(FileName).h</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">unicode\%(Filename).h;..\..\include\unicode\%(Filename).h;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

5
icu4c/source/common/common.vcxproj.filters
View File

@ -793,6 +793,9 @@
<CustomBuild Include="unicode\icudataver.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\platform.win">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\putil.h">
<Filter>configuration</Filter>
</CustomBuild>
@ -992,4 +995,4 @@
<Filter>strings</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>

4
icu4c/source/common/unicode/platform.h.in
View File

@ -41,6 +41,10 @@
#define UCLN_NO_AUTO_CLEANUP @UCLN_NO_AUTO_CLEANUP@
#endif
#if @U_USING_CYGWIN_MSVC@
#define CYGWINMSVC
#endif
/* Need platform.h when using CYGWINMSVC to get definitions above. Ignore everything else. */
#ifndef CYGWINMSVC

25
icu4c/source/common/unicode/platform.win Normal file
View File

@ -0,0 +1,25 @@
/*
******************************************************************************
*
* Copyright (C) 2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
*
* Note: Windows build with MSVC Solution/Project files creates platform.h from
* platform.win buring common library build. This file is an empty header
* file to ensure the #include "unicode/platform.h" statement works.
* If ICU4C is built with Cywin using MSVC, the normal autoconf generated
* platform.h file will be used instead of this empty header file. This
* will help the user of ICU to know whether ICU was built with Cygwin using
* MSVC or was built with just the MSVC Solution/Project files.
*/
#ifndef _PLATFORM_H
#define _PLATFORM_H
/*
* This header file should be kept empty unless a Windows specific definition or
* configuration is needed.
*/
#endif

10
icu4c/source/common/unicode/umachine.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1999-2010, International Business Machines
* Copyright (C) 1999-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -44,7 +44,13 @@
#if defined(U_PALMOS)
# include "unicode/ppalmos.h"
#elif !defined(__MINGW32__) && (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64))
#ifdef CYGWINMSVC
/*
* platform.h is now also generated by MSVC Solution/Project files
* from platform.win and should always be included unless you are
* building stubdata which is built before the platform.h file is
* generated.
*/
#ifndef STUBDATA_BUILD
# include "unicode/platform.h"
#endif
# include "unicode/pwin32.h"

3
icu4c/source/config/mh-cygwin-msvc
View File

@ -1,5 +1,5 @@
## Cygwin with Microsoft Visual C++ compiler specific setup
## Copyright (c) 2001-2010, International Business Machines Corporation and
## Copyright (c) 2001-2011, International Business Machines Corporation and
## others. All Rights Reserved.
# We install sbin tools into the same bin directory because
@ -49,7 +49,6 @@ CFLAGS+=/GF /nologo
CXXFLAGS+=/GF /nologo /EHsc /Zc:wchar_t
CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE
DEFS+=-DWIN32
DEFS+=-DCYGWINMSVC
LDFLAGS+=/nologo
# Commands to compile

11
icu4c/source/configure vendored
View File

@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.67.
#
# Copyright (c) 1999-2010, International Business Machines Corporation and others. All Rights Reserved.
# Copyright (c) 1999-2011, International Business Machines Corporation and others. All Rights Reserved.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -595,6 +595,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
U_USING_CYGWIN_MSVC
platform_make_fragment
platform_make_fragment_name
platform
@ -1515,7 +1516,7 @@ Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
Copyright (c) 1999-2010, International Business Machines Corporation and others. All Rights Reserved.
Copyright (c) 1999-2011, International Business Machines Corporation and others. All Rights Reserved.
_ACEOF
exit
fi
@ -7731,6 +7732,12 @@ platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name"
U_USING_CYGWIN_MSVC=0
if test "${icu_cv_host_frag}" = "mh-cygwin-msvc"; then
U_USING_CYGWIN_MSVC=1
fi
if test "${FORCE_LIBS}" != ""; then
echo " *** Overriding automatically chosen LIBS=$LIBS, using instead FORCE_LIBS=${FORCE_LIBS}" 1>&6
LIBS=${FORCE_LIBS}

8
icu4c/source/configure.in
View File

@ -1,5 +1,5 @@
# -*-autoconf-*-
AC_COPYRIGHT([ Copyright (c) 1999-2010, International Business Machines Corporation and others. All Rights Reserved. ])
AC_COPYRIGHT([ Copyright (c) 1999-2011, International Business Machines Corporation and others. All Rights Reserved. ])
# configure.in for ICU
# Stephen F. Booth, heavily modified by Yves and others
@ -1290,6 +1290,12 @@ platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name"
AC_SUBST(platform_make_fragment_name)
AC_SUBST(platform_make_fragment)
U_USING_CYGWIN_MSVC=0
if test "${icu_cv_host_frag}" = "mh-cygwin-msvc"; then
U_USING_CYGWIN_MSVC=1
fi
AC_SUBST(U_USING_CYGWIN_MSVC)
if test "${FORCE_LIBS}" != ""; then
echo " *** Overriding automatically chosen [LIBS=$LIBS], using instead [FORCE_LIBS=${FORCE_LIBS}]" 1>&6
LIBS=${FORCE_LIBS}

18
icu4c/source/stubdata/stubdata.vcxproj
View File

@ -89,7 +89,7 @@
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@ -106,7 +106,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<PreLinkEvent>
@ -138,7 +138,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
@ -153,7 +153,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<PreLinkEvent>
@ -183,7 +183,7 @@
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN64;WIN32;NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@ -200,7 +200,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<PreLinkEvent>
@ -230,7 +230,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN64;WIN32;_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
@ -245,7 +245,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<PreLinkEvent>
@ -277,4 +277,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>