diff options
-rw-r--r-- | icu/createmak.cfg | 907 | ||||
-rw-r--r-- | neon/makefile.mk | 2 | ||||
-rw-r--r-- | neon/neon.patch | 31 | ||||
-rw-r--r-- | python/makefile.mk | 4 |
4 files changed, 471 insertions, 473 deletions
diff --git a/icu/createmak.cfg b/icu/createmak.cfg index f2c7c050bdd3..19ef708cca40 100644 --- a/icu/createmak.cfg +++ b/icu/createmak.cfg @@ -1,455 +1,452 @@ -[Copy]
-SOURCE=<HEADER>
-InputPath=<INPUTPATH>
-"<TARGET>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- <TARGETPATH>
-<<
-
-[Deps]
-SOURCE=.\<SOURCEFILE>.<EXT>
-"$(INTDIR)\<SOURCEFILE>.obj": $(SOURCE) "$(INTDIR)" <HEADER_LIST>
-
-[Cpp]
-CPP=cl.exe
-[Link]
-LINK32=link.exe
-[CDefs_Common]
-
-[RSC_Template]
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<FILEOUT>.res" /i "..\common" /d "NDEBUG"
-SOURCE=<FILE>
-"$(INTDIR)\<FILEOUT>.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) $(RSC_PROJ) $(SOURCE)
-
-[General_CFlags]
-CPP_PROJ_INCLUDES=<AddIncDirs>
-CDEFS=<PreProcDefs>
-COPT=-nologo -O2 -Ob2
-CPDBOBJ=-FD -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\"
-CTOOLSFLAGS=-nologo -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-CDEF1FLAGS= -D "_WINDOWS" -D "_MBCS"
-
-[CFlags_common]
-CPP_PROJ=-nologo -MD -Za -Zi -W3 -GF -O2 -Ob2 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_i18n]
-CPP_PROJ=-MD -W3 -Oi -Op -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c
-
-[CFlags_extra_uconv]
-CPP_PROJ=-MD -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/uconv.pch" $(CPDBOBJ) -c
-
-[CFlags_layout]
-CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c
-
-[CFlags_io]
-CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c
-
-[CFlags_layoutex]
-CPP_PROJ=-MT -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/layoutex.pch" $(CPDBOBJ) -c
-
-[CFlags_stubdata]
-CPP_PROJ=-MD -W3 -Op -GF -Gy -Za $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/stubdata.pch" $(CPDBOBJ) -c
-
-[CFlags_test_cintltst]
-CPP_PROJ=-MT -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_test_intltest]
-CPP_PROJ=-nologo -MT -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_test_iotest]
-CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_test_letest]
-CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_tools_ctestfw]
-CPP_PROJ=-nologo -MD -O2 -Op -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/icutest.pch" $(CPDBOBJ) -c
-
-[CFlags_tools_genbrk]
-CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
-
-[CFlags_tools_gencase]
-CPP_PROJ=-nologo -MD -GF -Za -Zi -W3 $(EXCEPTIONSWITCH) $(COPT) $(CPDBOBJ) -c
-
-[CFlags_tools_genccode]
-CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_gencmn]
-CPP_PROJ=-O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genctd]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gencnval]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gennames]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gennorm]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genpname]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genprops]
-CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genrb]
-CPP_PROJ=-Za $(CTOOLSFLAGS)
-
-[CFlags_tools_genrb.derb]
-CPP_PROJ=-Za -GX $(CTOOLSFLAGS)
-
-[CFlags_tools_gensprep]
-CPP_PROJ=-Za $(CTOOLSFLAGS)
-
-[CFlags_tools_gentest]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_genuca]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_gencase]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_genbidi]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_icupkg]
-CPP_PROJ=-O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_icuswap]
-CPP_PROJ=-O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_makeconv]
-CPP_PROJ=-Za $(CTOOLSFLAGS)
-
-[CFlags_tools_pkgdata]
-CPP_PROJ=-Za -O2 $(CTOOLSFLAGS)
-
-[CFlags_tools_toolutil]
-CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
-
-[CommonLinkFlags]
-PDBOUT=/pdb:"<PDBFILE>" /out:"<OUTFILE>"
-COMMONLINKFLAGS=/incremental:no /machine:I386 /nologo $(PDBOUT)
-COMMONLINKFLAGS_CONSOLE=$(COMMONLINKFLAGS) /subsystem:console
-COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll
-
-[LinkFlags_common]
-LINK32_FLAGS=icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a800000" /implib:"$(OUTDIR)\icuuc.lib" /libpath:"..\..\lib"
-
-[LinkFlags_i18n]
-LINK32_FLAGS=icuuc.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a900000" /implib:"$(OUTDIR)\icuin.lib" /libpath:"..\..\lib"
-
-[LinkFlags_extra_uconv]
-LINK32_FLAGS=icuuc.lib icuin.lib uconvmsg.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" /libpath:"Release"
-
-[LinkFlags_layout]
-LINK32_FLAGS=..\..\lib\icuuc.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib"
-
-[LinkFlags_io]
-LINK32_FLAGS=icuuc.lib icuin.lib $(COMMONLINKFLAGS_DLL) /libpath:"..\..\lib" /implib:"$(OUTDIR)\icuio.lib"
-
-[LinkFlags_layoutex]
-LINK32_FLAGS=..\..\lib\icuuc.lib ..\..\lib\icule.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\iculx.lib"
-
-[LinkFlags_stubdata]
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:I386 $(PDBOUT) /implib:"..\..\lib\icudata.lib"
-
-[LinkFlags_test_cintltst]
-LINK32_FLAGS=icuuc.lib icuin.lib icutest.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib\\"
-
-[LinkFlags_test_intltest]
-LINK32_FLAGS=$(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_test_iotest]
-LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_test_letest]
-LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icule.lib iculx.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_ctestfw]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icutest.lib" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genbrk]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gencmn]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genctd]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gencnval]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genccode]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gennames]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gennorm]
-LINK32_FLAGS=icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genpname]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genprops]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genrb]
-LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genrb.derb]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gensprep]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gentest]
-LINK32_FLAGS=icuuc.lib icutu.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genuca]
-LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_gencase]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_genbidi]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_icupkg]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_icuswap]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_makeconv]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_pkgdata]
-LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
-
-[LinkFlags_tools_toolutil]
-LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAULTLIB:libcmt /implib:"$(OUTDIR)\icutu.lib" /libpath:"..\..\..\lib"
-
-[LinkTemplate]
-<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
- if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;<MANIFEST>
-
-[AdditionalLinkObjects_common]
- $(OUTDIR)\icudata.lib
-
-[AdditionalLinkObjects_i18n]
- "$(OUTDIR)\icuuc.lib"
-
-[AdditionalLinkObjects_extra_uconv]
- "$(INTDIR)\uconvmsg.lib" \
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icuin.lib"
-
-[AdditionalLinkObjects_layout]
- "$(OUTDIR)\icuuc.lib"
-
-[AdditionalLinkObjects_io]
- "$(OUTDIR)\icuuc.lib"
-
-[AdditionalLinkObjects_layoutex]
- "$(OUTDIR)\icuuc.lib" \
- "$(OUTDIR)\icuin.lib" \
- "$(OUTDIR)\icule.lib"
-
-[AdditionalLinkObjects_test_cintltst]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutest.lib" \
- "..\..\..\lib\icuin.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_test_intltest]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutest.lib" \
- "..\..\..\lib\icuin.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_test_letest]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutest.lib" \
- "..\..\..\lib\icuin.lib" \
- "..\..\..\lib\icule.lib" \
- "..\..\..\lib\iculx.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genbrk]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genccode]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gencmn]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genctd]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gencnval]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gennames]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gennorm]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genpname]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genprops]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genrb]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icuin.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genrb.derb]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icudata.lib"
-
-[AdditionalLinkObjects_tools_gensprep]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gentest]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genuca]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icuin.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_gencase]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_genbidi]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_icupkg]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_icuswap]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_makeconv]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_pkgdata]
- "..\..\..\lib\icuuc.lib" \
- "..\..\..\lib\icutu.lib"
-
-[AdditionalLinkObjects_tools_toolutil]
- "$(OUTDIR)\icuuc.lib"
-
-
-[Rules]
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-[AllTargetTools]
-ALL : "$(OUTDIR)\<MAKFILE>.exe" ".\<RELPATH>\bin\<MAKFILE>.exe"
-
-[AllInOnePrj]
-<PRJ> :
- cd "$(MAKEDIR)\<PRJDIR>"
- $(MAKE) /$(MAKEFLAGS) /F <PRJMAK> EXCEPTIONSWITCH="$(EXFLAGS)"
- cd "<ALLINONEDIR>"
-
-[HeadSectionCommon]
-NULL=
-!IF "$(CFG)" == "<MAKFILE> - Win32 Release"
-
-OUTDIR=<OUTDIR>
-INTDIR=<INTDIR>
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/\$(NULL)" mkdir "$(OUTDIR)"
-
-"$(INTDIR)" :
- if not exist "$(INTDIR)/\$(NULL)" mkdir "$(INTDIR)"
-
-!IF "$(CFG)" == "<MAKFILE> - Win32 Release"
-
-ALL : <ALLTARGETS>
-
-[Special_stubdata]
-<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- @if not exist "..\..\bin" mkdir "..\..\bin"
- @if not exist "..\..\lib" mkdir "..\..\lib"
- @if not exist "..\..\include" mkdir "..\..\include"
- @if not exist "..\..\include\unicode" mkdir "..\..\include\unicode"
- @if not exist "..\..\include\layout" mkdir "..\..\include\layout"
- echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > .\stubdatabuilt.txt
- $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
-
-[Special_extra_uconv]
-SOURCE=.\makedata.mak
-InputPath=.\makedata.mak
-
-"$(INTDIR)\uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- <<tempfile.bat
- @echo off
- nmake /nologo /f makedata.mak icup=.\..\..\.. CFG=Release
-<<
-
-
-
-[End]
+[Copy] +SOURCE=<HEADER> +InputPath=<INPUTPATH> +"<TARGET>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <TARGETPATH> + +[Deps] +SOURCE=.\<SOURCEFILE>.<EXT> +"$(INTDIR)\<SOURCEFILE>.obj": $(SOURCE) "$(INTDIR)" <HEADER_LIST> + +[Cpp] +CPP=cl.exe +[Link] +LINK32=link.exe +[CDefs_Common] + +[RSC_Template] +RSC=rc.exe +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<FILEOUT>.res" /i "..\common" /d "NDEBUG" +SOURCE=<FILE> +"$(INTDIR)\<FILEOUT>.res" : $(SOURCE) "$(INTDIR)" + $(RSC) $(RSC_PROJ) $(SOURCE) + +[General_CFlags] +CPP_PROJ_INCLUDES=<AddIncDirs> +CDEFS=<PreProcDefs> +COPT=-nologo -O2 -Ob2 +CPDBOBJ=-FD -Fo"$(INTDIR)\\" -Fd"$(INTDIR)\\" +CTOOLSFLAGS=-nologo -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c +CDEF1FLAGS= -D "_WINDOWS" -D "_MBCS" + +[CFlags_common] +CPP_PROJ=-nologo -MD -Za -Zi -W3 -GF -O2 -Ob2 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c + +[CFlags_i18n] +CPP_PROJ=-MD -W3 -Oi -Op -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c + +[CFlags_extra_uconv] +CPP_PROJ=-MD -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/uconv.pch" $(CPDBOBJ) -c + +[CFlags_layout] +CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c + +[CFlags_io] +CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c + +[CFlags_layoutex] +CPP_PROJ=-MT -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/layoutex.pch" $(CPDBOBJ) -c + +[CFlags_stubdata] +CPP_PROJ=-MD -W3 -Op -GF -Gy -Za $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/stubdata.pch" $(CPDBOBJ) -c + +[CFlags_test_cintltst] +CPP_PROJ=-MT -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c + +[CFlags_test_intltest] +CPP_PROJ=-nologo -MT -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c + +[CFlags_test_iotest] +CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c + +[CFlags_test_letest] +CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c + +[CFlags_tools_ctestfw] +CPP_PROJ=-nologo -MD -O2 -Op -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/icutest.pch" $(CPDBOBJ) -c + +[CFlags_tools_genbrk] +CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c + +[CFlags_tools_gencase] +CPP_PROJ=-nologo -MD -GF -Za -Zi -W3 $(EXCEPTIONSWITCH) $(COPT) $(CPDBOBJ) -c + +[CFlags_tools_genccode] +CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) + +[CFlags_tools_gencmn] +CPP_PROJ=-O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_genctd] +CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_gencnval] +CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_gennames] +CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_gennorm] +CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_genpname] +CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_genprops] +CPP_PROJ=-MD -O2 -Za $(CTOOLSFLAGS) + +[CFlags_tools_genrb] +CPP_PROJ=-Za $(CTOOLSFLAGS) + +[CFlags_tools_genrb.derb] +CPP_PROJ=-Za -GX $(CTOOLSFLAGS) + +[CFlags_tools_gensprep] +CPP_PROJ=-Za $(CTOOLSFLAGS) + +[CFlags_tools_gentest] +CPP_PROJ=-Za -O2 $(CTOOLSFLAGS) + +[CFlags_tools_genuca] +CPP_PROJ=-Za -O2 $(CTOOLSFLAGS) + +[CFlags_tools_gencase] +CPP_PROJ=-Za -O2 $(CTOOLSFLAGS) + +[CFlags_tools_genbidi] +CPP_PROJ=-Za -O2 $(CTOOLSFLAGS) + +[CFlags_tools_icupkg] +CPP_PROJ=-O2 $(CTOOLSFLAGS) + +[CFlags_tools_icuswap] +CPP_PROJ=-O2 $(CTOOLSFLAGS) + +[CFlags_tools_makeconv] +CPP_PROJ=-Za $(CTOOLSFLAGS) + +[CFlags_tools_pkgdata] +CPP_PROJ=-Za -O2 $(CTOOLSFLAGS) + +[CFlags_tools_toolutil] +CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) + +[CommonLinkFlags] +PDBOUT=/pdb:"<PDBFILE>" /out:"<OUTFILE>" +COMMONLINKFLAGS=/incremental:no /machine:I386 /nologo $(PDBOUT) +COMMONLINKFLAGS_CONSOLE=$(COMMONLINKFLAGS) /subsystem:console +COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll + +[LinkFlags_common] +LINK32_FLAGS=icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a800000" /implib:"$(OUTDIR)\icuuc.lib" /libpath:"..\..\lib" + +[LinkFlags_i18n] +LINK32_FLAGS=icuuc.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a900000" /implib:"$(OUTDIR)\icuin.lib" /libpath:"..\..\lib" + +[LinkFlags_extra_uconv] +LINK32_FLAGS=icuuc.lib icuin.lib uconvmsg.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" /libpath:"Release" + +[LinkFlags_layout] +LINK32_FLAGS=..\..\lib\icuuc.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib" + +[LinkFlags_io] +LINK32_FLAGS=icuuc.lib icuin.lib $(COMMONLINKFLAGS_DLL) /libpath:"..\..\lib" /implib:"$(OUTDIR)\icuio.lib" + +[LinkFlags_layoutex] +LINK32_FLAGS=..\..\lib\icuuc.lib ..\..\lib\icule.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\iculx.lib" + +[LinkFlags_stubdata] +LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:I386 $(PDBOUT) /implib:"..\..\lib\icudata.lib" + +[LinkFlags_test_cintltst] +LINK32_FLAGS=icuuc.lib icuin.lib icutest.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib\\" + +[LinkFlags_test_intltest] +LINK32_FLAGS=$(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" + +[LinkFlags_test_iotest] +LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" + +[LinkFlags_test_letest] +LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icule.lib iculx.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" + +[LinkFlags_tools_ctestfw] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icutest.lib" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genbrk] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_gencmn] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genctd] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_gencnval] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genccode] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_gennames] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_gennorm] +LINK32_FLAGS=icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genpname] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genprops] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genrb] +LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genrb.derb] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" + +[LinkFlags_tools_gensprep] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_gentest] +LINK32_FLAGS=icuuc.lib icutu.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genuca] +LINK32_FLAGS=icuin.lib icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_gencase] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_genbidi] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_icupkg] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_icuswap] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_makeconv] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_pkgdata] +LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" + +[LinkFlags_tools_toolutil] +LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAULTLIB:libcmt /implib:"$(OUTDIR)\icutu.lib" /libpath:"..\..\..\lib" + +[LinkTemplate] +<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;<MANIFEST> + +[AdditionalLinkObjects_common] + $(OUTDIR)\icudata.lib + +[AdditionalLinkObjects_i18n] + "$(OUTDIR)\icuuc.lib" + +[AdditionalLinkObjects_extra_uconv] + "$(INTDIR)\uconvmsg.lib" \ + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icuin.lib" + +[AdditionalLinkObjects_layout] + "$(OUTDIR)\icuuc.lib" + +[AdditionalLinkObjects_io] + "$(OUTDIR)\icuuc.lib" + +[AdditionalLinkObjects_layoutex] + "$(OUTDIR)\icuuc.lib" \ + "$(OUTDIR)\icuin.lib" \ + "$(OUTDIR)\icule.lib" + +[AdditionalLinkObjects_test_cintltst] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutest.lib" \ + "..\..\..\lib\icuin.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_test_intltest] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutest.lib" \ + "..\..\..\lib\icuin.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_test_letest] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutest.lib" \ + "..\..\..\lib\icuin.lib" \ + "..\..\..\lib\icule.lib" \ + "..\..\..\lib\iculx.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genbrk] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genccode] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_gencmn] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genctd] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_gencnval] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_gennames] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_gennorm] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genpname] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genprops] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genrb] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icuin.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genrb.derb] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icudata.lib" + +[AdditionalLinkObjects_tools_gensprep] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_gentest] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genuca] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icuin.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_gencase] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_genbidi] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_icupkg] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_icuswap] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_makeconv] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_pkgdata] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" + +[AdditionalLinkObjects_tools_toolutil] + "$(OUTDIR)\icuuc.lib" + + +[Rules] +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +[AllTargetTools] +ALL : "$(OUTDIR)\<MAKFILE>.exe" ".\<RELPATH>\bin\<MAKFILE>.exe" + +[AllInOnePrj] +<PRJ> : + cd "$(MAKEDIR)\<PRJDIR>" + $(MAKE) /$(MAKEFLAGS) /F <PRJMAK> EXCEPTIONSWITCH="$(EXFLAGS)" + cd "<ALLINONEDIR>" + +[HeadSectionCommon] +NULL= +!IF "$(CFG)" == "<MAKFILE> - Win32 Release" + +OUTDIR=<OUTDIR> +INTDIR=<INTDIR> +"$(OUTDIR)" : + if not exist "$(OUTDIR)/\$(NULL)" mkdir "$(OUTDIR)" + +"$(INTDIR)" : + if not exist "$(INTDIR)/\$(NULL)" mkdir "$(INTDIR)" + +!IF "$(CFG)" == "<MAKFILE> - Win32 Release" + +ALL : <ALLTARGETS> + +[Special_stubdata] +<OUTFILE> : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + @if not exist "..\..\bin" mkdir "..\..\bin" + @if not exist "..\..\lib" mkdir "..\..\lib" + @if not exist "..\..\include" mkdir "..\..\include" + @if not exist "..\..\include\unicode" mkdir "..\..\include\unicode" + @if not exist "..\..\include\layout" mkdir "..\..\include\layout" + echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > .\stubdatabuilt.txt + $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS) + +[Special_extra_uconv] +SOURCE=.\makedata.mak +InputPath=.\makedata.mak + +"$(INTDIR)\uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <<tempfile.bat + @echo off + nmake /nologo /f makedata.mak icup=.\..\..\.. CFG=Release +<< + + + +[End] diff --git a/neon/makefile.mk b/neon/makefile.mk index 440a6ebf4f74..d296db7a3f98 100644 --- a/neon/makefile.mk +++ b/neon/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/neon/neon.patch b/neon/neon.patch index b990411fd729..3d4e5019e0b7 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -1,5 +1,5 @@ ---- misc/neon-0.29.3/src/config.h 2010-01-27 12:46:23.000000000 +0100 -+++ misc/build/neon-0.29.3/src/config.h 2010-01-27 12:44:10.000000000 +0100 +--- misc/neon-0.29.3/src/config.h 2010-03-23 14:47:43.000000000 +0100 ++++ misc/build/neon-0.29.3/src/config.h 2010-03-23 12:19:50.000000000 +0100 @@ -1 +1,488 @@ -dummy + @@ -490,9 +490,9 @@ +#else +#define HAVE_NTLM 1 +#endif ---- misc/neon-0.29.3/src/makefile.mk 2010-01-27 12:46:23.000000000 +0100 -+++ misc/build/neon-0.29.3/src/makefile.mk 2010-01-27 12:44:10.000000000 +0100 -@@ -1 +1,101 @@ +--- misc/neon-0.29.3/src/makefile.mk 2010-03-23 14:47:43.000000000 +0100 ++++ misc/build/neon-0.29.3/src/makefile.mk 2010-03-23 14:45:21.000000000 +0100 +@@ -1 +1,102 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -500,6 +500,7 @@ +TARGET=neon +LIBTARGET=NO +USE_DEFFILE=TRUE ++NO_DEFAULT_STL=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE +UWINAPILIB= + @@ -596,7 +597,7 @@ +DEF1NAME=$(SHL1TARGET) +.INCLUDE : target.mk --- misc/neon-0.29.3/src/ne_auth.c 2009-12-30 22:29:30.000000000 +0100 -+++ misc/build/neon-0.29.3/src/ne_auth.c 2010-01-27 12:45:34.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_auth.c 2010-03-23 12:19:50.000000000 +0100 @@ -367,7 +367,7 @@ static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt, struct auth_challenge *chall, char *pwbuf) @@ -634,7 +635,7 @@ return status; } --- misc/neon-0.29.3/src/ne_auth.h 2009-09-01 22:13:12.000000000 +0200 -+++ misc/build/neon-0.29.3/src/ne_auth.h 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_auth.h 2010-03-23 12:19:50.000000000 +0100 @@ -47,8 +47,8 @@ * Hint: if you just wish to attempt authentication just once (even if * the user gets the username/password wrong), have the callback @@ -647,7 +648,7 @@ /* Set callbacks to provide credentials for server and proxy * authentication, using the default set of authentication protocols. --- misc/neon-0.29.3/src/ne_defs.h 2009-09-02 16:04:43.000000000 +0200 -+++ misc/build/neon-0.29.3/src/ne_defs.h 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_defs.h 2010-03-23 12:19:50.000000000 +0100 @@ -41,7 +41,7 @@ #endif @@ -658,7 +659,7 @@ #endif --- misc/neon-0.29.3/src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 -+++ misc/build/neon-0.29.3/src/ne_locks.c 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_locks.c 2010-03-23 12:19:50.000000000 +0100 @@ -579,6 +579,23 @@ const char *token = ne_get_response_header(ctx->req, "Lock-Token"); /* at the root element; retrieve the Lock-Token header, @@ -726,7 +727,7 @@ } } --- misc/neon-0.29.3/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100 -+++ misc/build/neon-0.29.3/src/ne_locks.h 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_locks.h 2010-03-23 12:19:50.000000000 +0100 @@ -22,6 +22,10 @@ #ifndef NE_LOCKS_H #define NE_LOCKS_H @@ -739,7 +740,7 @@ #include "ne_uri.h" /* for ne_uri */ --- misc/neon-0.29.3/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 -+++ misc/build/neon-0.29.3/src/ne_sspi.c 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_sspi.c 2010-03-23 12:19:50.000000000 +0100 @@ -206,6 +206,45 @@ } @@ -826,7 +827,7 @@ securityStatus = initializeSecurityContext(&sspiContext->credentials, NULL, --- misc/neon-0.29.3/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100 -+++ misc/build/neon-0.29.3/src/ne_sspi.h 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_sspi.h 2010-03-23 12:19:50.000000000 +0100 @@ -41,7 +41,7 @@ int ne_sspi_clear_context(void *context); @@ -837,7 +838,7 @@ #endif /* HAVE_SSPI */ --- misc/neon-0.29.3/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100 -+++ misc/build/neon-0.29.3/src/ne_uri.c 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_uri.c 2010-03-23 12:19:50.000000000 +0100 @@ -42,7 +42,7 @@ #include "ne_alloc.h" #include "ne_uri.h" @@ -884,7 +885,7 @@ /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, --- misc/neon-0.29.3/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 -+++ misc/build/neon-0.29.3/src/ne_utils.c 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_utils.c 2010-03-23 12:19:50.000000000 +0100 @@ -118,6 +118,9 @@ #ifdef HAVE_GNUTLS ", GNU TLS " LIBGNUTLS_VERSION @@ -915,7 +916,7 @@ #endif /* NE_HAVE_* */ default: --- misc/neon-0.29.3/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 -+++ misc/build/neon-0.29.3/src/ne_utils.h 2010-01-27 12:44:10.000000000 +0100 ++++ misc/build/neon-0.29.3/src/ne_utils.h 2010-03-23 12:19:50.000000000 +0100 @@ -54,6 +54,7 @@ #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ diff --git a/python/makefile.mk b/python/makefile.mk index b4643dd42b6c..86d9835e8604 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -79,7 +79,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in .IF "$(OS)$(CPU)" == "SOLARISI" CONFIGURE_ACTION += --disable-ipv6 .ENDIF -BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst +BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include .ELSE # ---------------------------------- # WINDOWS @@ -94,7 +94,7 @@ python_LDFLAGS=-mno-cygwin -mthreads python_LDFLAGS+=-shared-libgcc .ENDIF CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" -BUILD_ACTION=$(ENV_BUILD) make ; make install +BUILD_ACTION=$(ENV_BUILD) make && make install .ELSE #PYTHONPATH:=..$/Lib #.EXPORT : PYTHONPATH |