diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-11-23 18:50:12 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-11-23 18:50:12 +0000 |
commit | e08f4c1fcb4ed86b3589559e5c41cce9e3c10f9d (patch) | |
tree | 1fa5cfae341745fba154c87cdb8214f930f8fdd6 /src/ccapi | |
parent | aedd1fea8405d857c072fb41f2d38db9df31c70d (diff) | |
download | krb5-e08f4c1fcb4ed86b3589559e5c41cce9e3c10f9d.zip krb5-e08f4c1fcb4ed86b3589559e5c41cce9e3c10f9d.tar.gz krb5-e08f4c1fcb4ed86b3589559e5c41cce9e3c10f9d.tar.bz2 |
Set svn:eol-style on some Windows files and remove the CRs from their
repository representations.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24530 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi')
-rw-r--r-- | src/ccapi/lib/win/Makefile.in | 238 | ||||
-rw-r--r-- | src/ccapi/lib/win/WINCCAPI.sln | 40 | ||||
-rw-r--r-- | src/ccapi/lib/win/WINCCAPI.vcproj | 222 | ||||
-rw-r--r-- | src/ccapi/lib/win/debug.exports | 23 |
4 files changed, 260 insertions, 263 deletions
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 9fa6c02..d5ca7a55 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -1,119 +1,119 @@ -# makefile: Constructs the Kerberos for Windows CCAPI DLL.
-#
-OBJS = $(OUTPRE)ccapi_ccache.obj \
- $(OUTPRE)ccapi_ccache_iterator.obj \
- $(OUTPRE)ccapi_context.obj \
- $(OUTPRE)ccapi_context_change_time.obj \
- $(OUTPRE)ccapi_credentials.obj \
- $(OUTPRE)ccapi_credentials_iterator.obj \
- $(OUTPRE)ccapi_ipc.obj \
- $(OUTPRE)ccapi_err.obj \
- $(OUTPRE)ccapi_os_ipc.obj \
- $(OUTPRE)ccapi_string.obj \
- $(OUTPRE)ccapi_v2.obj \
- $(OUTPRE)cci_array_internal.obj \
- $(OUTPRE)cci_cred_union.obj \
- $(OUTPRE)cci_debugging.obj \
- $(OUTPRE)cci_identifier.obj \
- $(OUTPRE)cci_message.obj \
- $(OUTPRE)cci_os_debugging.obj \
- $(OUTPRE)cci_os_identifier.obj \
- $(OUTPRE)ccs_reply_proc.obj \
- $(OUTPRE)ccs_reply_s.obj \
- $(OUTPRE)ccs_request_c.obj \
- $(OUTPRE)ccutils.obj \
- $(OUTPRE)client.obj \
- $(OUTPRE)dllmain.obj \
- $(OUTPRE)init.obj \
- $(OUTPRE)rpc.obj \
- $(OUTPRE)secure.obj \
- $(OUTPRE)tls.obj \
- $(OUTPRE)util.obj \
- $(OUTPRE)win-utils.obj
-
-##### Options
-# Set NODEBUG if building release instead of debug
-
-#BUILDTOP is krb5/src and is relative to krb5/src/ccapi/lib/win, for making Makefile.
-BUILDTOP=..\..\..\
-CCAPI = $(BUILDTOP)\CCAPI
-CO = $(CCAPI)\common
-COWIN = $(CCAPI)\common\win
-CCUTIL = $(CCAPI)\common\win\OldCC
-LIBDIR = $(CCAPI)\lib
-LIBWIN = $(LIBDIR)\win
-POSIX = $(BUILDTOP)\lib\krb5\posix
-OLDCC = $(LIBWIN)\OldCC
-SRCTMP = $(LIBWIN)\srctmp
-
-!if defined(KRB5_KFW_COMPILE)
-KFWINC= /I$(BUILDTOP)\..\..\krbcc\include
-!endif
-
-# Because all the sources are pulled together into the temp directory SRCTMP,
-# the only includes we need are to directories outside of ccapi.
-LOCALINCLUDES = /I..\$(BUILDTOP) /I..\$(BUILDTOP)\include /I..\$(BUILDTOP)\include\krb5 $(KFWINC) \
- -I..\$(BUILDTOP)\util\et
-MIDLINCLUDES = /I..\$(BUILDTOP)\include
-
-CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501 \
--D_WIN32_WINNT=0x0501 -D_CRT_SECURE_NO_WARNINGS $(cvarsdll)
-
-
-##### Linker
-LINK = link
-LIBS = ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib
-LFLAGS = /nologo $(LOPTS)
-
-all:: Makefile copysrc midl $(OUTPRE)ccapi.dll finish
-
-ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf
- midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \
- ccs_request.idl
-
-ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf
- midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \
- ccs_reply.idl
-
-copysrc :
- echo "Copying all sources needed to build ccapi.dll to $(SRCTMP)"
- if NOT exist $(SRCTMP)\nul mkdir $(SRCTMP)
- xcopy /D/Y $(CO)\*.* $(SRCTMP)
- xcopy /D/Y $(COWIN)\*.* $(SRCTMP)
- xcopy /D/Y $(CCUTIL)\*.* $(SRCTMP)
- xcopy /D/Y $(LIBDIR)\*.* $(SRCTMP)
- xcopy /D/Y $(LIBWIN)\*.* $(SRCTMP)
- xcopy /D/Y $(OLDCC)\*.* $(SRCTMP)
- cd $(SRCTMP)
- if NOT exist $(OUTPRE)\nul mkdir $(OUTPRE)
-
-midl : ccs_request.h ccs_reply.h
-
-# Main program:
-$(OUTPRE)ccapi.dll: $(OBJS) ccapi.def
- $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@12 -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \
- /implib:ccapi.lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags)
-
-ccapi.def:
- echo ;ccapi.def is generated by a Makefile rule. > ccapi.def
- echo HEAPSIZE 8192 >> ccapi.def
- echo EXPORTS >> ccapi.def
- type ccapi.exports >> ccapi.def
- type ccapi_v2.exports >> ccapi.def
- type debug.exports >> ccapi.def
-
-finish:
- echo "Finished in ccapi/lib/win."
- cd ..
-
-install::
- echo "Doing nothing for make install"
-
-clean::
- if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe
- if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj
- if exist $(OUTPRE)*.res del $(OUTPRE)*.res
- if exist $(OUTPRE)*.map del $(OUTPRE)*.map
- if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb
- if exist *.err del *.err
- if exist $(SRCTMP) rm -rf $(SRCTMP)
\ No newline at end of file +# makefile: Constructs the Kerberos for Windows CCAPI DLL. +# +OBJS = $(OUTPRE)ccapi_ccache.obj \ + $(OUTPRE)ccapi_ccache_iterator.obj \ + $(OUTPRE)ccapi_context.obj \ + $(OUTPRE)ccapi_context_change_time.obj \ + $(OUTPRE)ccapi_credentials.obj \ + $(OUTPRE)ccapi_credentials_iterator.obj \ + $(OUTPRE)ccapi_ipc.obj \ + $(OUTPRE)ccapi_err.obj \ + $(OUTPRE)ccapi_os_ipc.obj \ + $(OUTPRE)ccapi_string.obj \ + $(OUTPRE)ccapi_v2.obj \ + $(OUTPRE)cci_array_internal.obj \ + $(OUTPRE)cci_cred_union.obj \ + $(OUTPRE)cci_debugging.obj \ + $(OUTPRE)cci_identifier.obj \ + $(OUTPRE)cci_message.obj \ + $(OUTPRE)cci_os_debugging.obj \ + $(OUTPRE)cci_os_identifier.obj \ + $(OUTPRE)ccs_reply_proc.obj \ + $(OUTPRE)ccs_reply_s.obj \ + $(OUTPRE)ccs_request_c.obj \ + $(OUTPRE)ccutils.obj \ + $(OUTPRE)client.obj \ + $(OUTPRE)dllmain.obj \ + $(OUTPRE)init.obj \ + $(OUTPRE)rpc.obj \ + $(OUTPRE)secure.obj \ + $(OUTPRE)tls.obj \ + $(OUTPRE)util.obj \ + $(OUTPRE)win-utils.obj + +##### Options +# Set NODEBUG if building release instead of debug + +#BUILDTOP is krb5/src and is relative to krb5/src/ccapi/lib/win, for making Makefile. +BUILDTOP= ..\..\.. +CCAPI = $(BUILDTOP)\CCAPI +CO = $(CCAPI)\common +COWIN = $(CCAPI)\common\win +CCUTIL = $(CCAPI)\common\win\OldCC +LIBDIR = $(CCAPI)\lib +LIBWIN = $(LIBDIR)\win +POSIX = $(BUILDTOP)\lib\krb5\posix +OLDCC = $(LIBWIN)\OldCC +SRCTMP = $(LIBWIN)\srctmp + +!if defined(KRB5_KFW_COMPILE) +KFWINC= /I$(BUILDTOP)\..\..\krbcc\include +!endif + +# Because all the sources are pulled together into the temp directory SRCTMP, +# the only includes we need are to directories outside of ccapi. +LOCALINCLUDES = /I..\$(BUILDTOP) /I..\$(BUILDTOP)\include /I..\$(BUILDTOP)\include\krb5 $(KFWINC) \ + -I..\$(BUILDTOP)\util\et +MIDLINCLUDES = /I..\$(BUILDTOP)\include + +CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501 \ +-D_WIN32_WINNT=0x0501 -D_CRT_SECURE_NO_WARNINGS $(cvarsdll) + + +##### Linker +LINK = link +LIBS = ..\$(CLIB) ..\$(SLIB) kernel32.lib ws2_32.lib user32.lib advapi32.lib +LFLAGS = /nologo $(LOPTS) + +all:: Makefile copysrc midl $(OUTPRE)ccapi.dll finish + +ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf + midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ + ccs_request.idl + +ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf + midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ + ccs_reply.idl + +copysrc : + echo "Copying all sources needed to build ccapi.dll to $(SRCTMP)" + if NOT exist $(SRCTMP)\nul mkdir $(SRCTMP) + xcopy /D/Y $(CO)\*.* $(SRCTMP) + xcopy /D/Y $(COWIN)\*.* $(SRCTMP) + xcopy /D/Y $(CCUTIL)\*.* $(SRCTMP) + xcopy /D/Y $(LIBDIR)\*.* $(SRCTMP) + xcopy /D/Y $(LIBWIN)\*.* $(SRCTMP) + xcopy /D/Y $(OLDCC)\*.* $(SRCTMP) + cd $(SRCTMP) + if NOT exist $(OUTPRE)\nul mkdir $(OUTPRE) + +midl : ccs_request.h ccs_reply.h + +# Main program: +$(OUTPRE)ccapi.dll: $(OBJS) ccapi.def + $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@12 -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \ + /implib:ccapi.lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags) + +ccapi.def: + echo ;ccapi.def is generated by a Makefile rule. > ccapi.def + echo HEAPSIZE 8192 >> ccapi.def + echo EXPORTS >> ccapi.def + type ccapi.exports >> ccapi.def + type ccapi_v2.exports >> ccapi.def + type debug.exports >> ccapi.def + +finish: + echo "Finished in ccapi/lib/win." + cd .. + +install:: + echo "Doing nothing for make install" + +clean:: + if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe + if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj + if exist $(OUTPRE)*.res del $(OUTPRE)*.res + if exist $(OUTPRE)*.map del $(OUTPRE)*.map + if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb + if exist *.err del *.err + if exist $(SRCTMP) rm -rf $(SRCTMP) diff --git a/src/ccapi/lib/win/WINCCAPI.sln b/src/ccapi/lib/win/WINCCAPI.sln index 985f4c6..cee9891 100644 --- a/src/ccapi/lib/win/WINCCAPI.sln +++ b/src/ccapi/lib/win/WINCCAPI.sln @@ -1,20 +1,20 @@ -
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WINCCAPI", "WINCCAPI.vcproj", "{1137FC16-E53E-48C1-8293-085B4BE68C32}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1137FC16-E53E-48C1-8293-085B4BE68C32}.Debug|Win32.ActiveCfg = Debug|Win32
- {1137FC16-E53E-48C1-8293-085B4BE68C32}.Debug|Win32.Build.0 = Debug|Win32
- {1137FC16-E53E-48C1-8293-085B4BE68C32}.Release|Win32.ActiveCfg = Release|Win32
- {1137FC16-E53E-48C1-8293-085B4BE68C32}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WINCCAPI", "WINCCAPI.vcproj", "{1137FC16-E53E-48C1-8293-085B4BE68C32}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1137FC16-E53E-48C1-8293-085B4BE68C32}.Debug|Win32.ActiveCfg = Debug|Win32 + {1137FC16-E53E-48C1-8293-085B4BE68C32}.Debug|Win32.Build.0 = Debug|Win32 + {1137FC16-E53E-48C1-8293-085B4BE68C32}.Release|Win32.ActiveCfg = Release|Win32 + {1137FC16-E53E-48C1-8293-085B4BE68C32}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/ccapi/lib/win/WINCCAPI.vcproj b/src/ccapi/lib/win/WINCCAPI.vcproj index 69b7722..9af0e21 100644 --- a/src/ccapi/lib/win/WINCCAPI.vcproj +++ b/src/ccapi/lib/win/WINCCAPI.vcproj @@ -1,111 +1,111 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="WINCCAPI"
- ProjectGUID="{1137FC16-E53E-48C1-8293-085B4BE68C32}"
- RootNamespace="WINCCAPI"
- Keyword="MakeFileProj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="0"
- >
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="nmake"
- ReBuildCommandLine="nmake"
- CleanCommandLine="nmake clean"
- Output="output.log"
- PreprocessorDefinitions="WIN32;_DEBUG;"
- IncludeSearchPath=""
- ForcedIncludes=""
- AssemblySearchPath=""
- ForcedUsingAssemblies=""
- CompileAsManaged=""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="0"
- >
- <Tool
- Name="VCNMakeTool"
- BuildCommandLine="nmake"
- ReBuildCommandLine="nmake"
- CleanCommandLine="nmake clean"
- Output="output.log"
- PreprocessorDefinitions="WIN32;NDEBUG;"
- IncludeSearchPath=""
- ForcedIncludes=""
- AssemblySearchPath=""
- ForcedUsingAssemblies=""
- CompileAsManaged=""
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\..\common\win\win-utils.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\common\win\ccs_reply.Idl"
- >
- </File>
- <File
- RelativePath="..\..\common\win\ccs_request.idl"
- >
- </File>
- <File
- RelativePath="..\..\common\win\win-utils.c"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\..\common\win\ccs_reply.Acf"
- >
- </File>
- <File
- RelativePath="..\..\common\win\ccs_request.Acf"
- >
- </File>
- <File
- RelativePath=".\Makefile"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="UTF-8"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="WINCCAPI" + ProjectGUID="{1137FC16-E53E-48C1-8293-085B4BE68C32}" + RootNamespace="WINCCAPI" + Keyword="MakeFileProj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="nmake" + ReBuildCommandLine="nmake" + CleanCommandLine="nmake clean" + Output="output.log" + PreprocessorDefinitions="WIN32;_DEBUG;" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="nmake" + ReBuildCommandLine="nmake" + CleanCommandLine="nmake clean" + Output="output.log" + PreprocessorDefinitions="WIN32;NDEBUG;" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\common\win\win-utils.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\common\win\ccs_reply.Idl" + > + </File> + <File + RelativePath="..\..\common\win\ccs_request.idl" + > + </File> + <File + RelativePath="..\..\common\win\win-utils.c" + > + </File> + </Filter> + <File + RelativePath="..\..\common\win\ccs_reply.Acf" + > + </File> + <File + RelativePath="..\..\common\win\ccs_request.Acf" + > + </File> + <File + RelativePath=".\Makefile" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/src/ccapi/lib/win/debug.exports b/src/ccapi/lib/win/debug.exports index 7bf84d2..583e9ca 100644 --- a/src/ccapi/lib/win/debug.exports +++ b/src/ccapi/lib/win/debug.exports @@ -1,13 +1,10 @@ - cci_debug_printf
- _cci_check_error
- cci_os_ipc
- cci_os_ipc_msg
- cci_os_ipc_thread_init
- krb5int_ipc_stream_data
- krb5int_ipc_stream_write
- krb5int_ipc_stream_new
-
- ccs_authenticate
-
-
-
\ No newline at end of file + cci_debug_printf + _cci_check_error + cci_os_ipc + cci_os_ipc_msg + cci_os_ipc_thread_init + krb5int_ipc_stream_data + krb5int_ipc_stream_write + krb5int_ipc_stream_new + + ccs_authenticate |