Changeset 86
- Timestamp:
- 11/18/04 00:03:04
- Files:
-
- trunk/SubversionSharp/dev/src/SubversionSharp.csproj (modified) (4 diffs)
- trunk/SubversionSharp/dev/src/Svn.cs (modified) (6 diffs)
- trunk/SubversionSharp/windll/src/svnclient.vcproj (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/SubversionSharp/dev/src/SubversionSharp.csproj
r82 r86 18 18 OutputType = "Library" 19 19 PreBuildEvent = "" 20 PostBuildEvent = ""20 PostBuildEvent = '"C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\ildasm.exe" /TEXT "$(TargetPath)" | "..\..\..\..\CallConvHack\hack\bin\Release\CallConvHack.exe" > "$(TargetDir)$(ProjectName).il" && "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\ilasm.exe" /DLL /QUIET /OUT:"$(TargetPath)" "$(TargetDir)$(TargetName).il"' 21 21 RootNamespace = "SubversionSharp" 22 RunPostBuildEvent = "On BuildSuccess"22 RunPostBuildEvent = "OnOutputUpdated" 23 23 StartupObject = "" 24 24 > … … 29 29 CheckForOverflowUnderflow = "false" 30 30 ConfigurationOverrideFile = "" 31 DefineConstants = " "31 DefineConstants = "WIN32" 32 32 DocumentationFile = "" 33 33 DebugSymbols = "true" … … 49 49 CheckForOverflowUnderflow = "false" 50 50 ConfigurationOverrideFile = "" 51 DefineConstants = " "51 DefineConstants = "WIN32" 52 52 DocumentationFile = "" 53 53 DebugSymbols = "false" … … 75 75 Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" 76 76 /> 77 <Reference 78 Name = "CallConvAttribute" 79 Project = "{20FD254E-D5B1-4D10-B3CE-820C2A21786E}" 80 Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" 81 /> 77 82 </References> 78 83 </Build> trunk/SubversionSharp/dev/src/Svn.cs
r60 r86 59 59 } 60 60 61 internal delegate IntPtr svn_cancel_func_t(IntPtr baton); 61 #if WIN32 62 [Softec.CallConvCdecl] 63 #endif 64 internal delegate IntPtr svn_cancel_func_t(IntPtr baton); 62 65 public delegate SvnError CancelFunc(IntPtr baton); 63 66 … … 163 166 164 167 #region SvnStream 165 internal delegate IntPtr svn_read_fn_t(IntPtr baton, IntPtr buffer, ref uint len); 166 internal delegate IntPtr svn_write_fn_t(IntPtr baton, IntPtr data, ref uint len); 167 internal delegate IntPtr svn_close_fn_t(IntPtr baton); 168 [Softec.CallConvCdecl] 169 internal delegate IntPtr svn_read_fn_t(IntPtr baton, IntPtr buffer, ref uint len); 170 [Softec.CallConvCdecl] 171 internal delegate IntPtr svn_write_fn_t(IntPtr baton, IntPtr data, ref uint len); 172 [Softec.CallConvCdecl] 173 internal delegate IntPtr svn_close_fn_t(IntPtr baton); 168 174 169 175 [DllImport("svn_client-1")] static extern … … 199 205 internal IntPtr svn_client_create_context(out IntPtr ctx, IntPtr pool); 200 206 201 internal delegate void svn_wc_notify_func_t(IntPtr baton, IntPtr path, 207 #if WIN32 208 [Softec.CallConvCdecl] 209 #endif 210 internal delegate void svn_wc_notify_func_t(IntPtr baton, IntPtr path, 202 211 int action, int kind, 203 212 IntPtr mime_type, int content_state, … … 214 223 215 224 #region SvnAuthProvider 216 internal delegate IntPtr svn_auth_simple_prompt_func_t(out IntPtr cred, IntPtr baton, 225 #if WIN32 226 [Softec.CallConvCdecl] 227 #endif 228 internal delegate IntPtr svn_auth_simple_prompt_func_t(out IntPtr cred, IntPtr baton, 217 229 IntPtr realm, IntPtr username, 218 230 int may_save, IntPtr pool); 219 231 232 #if WIN32 233 [Softec.CallConvCdecl] 234 #endif 220 235 internal delegate IntPtr svn_auth_username_prompt_func_t(out IntPtr cred, IntPtr baton, 221 236 IntPtr realm, int may_save, 222 237 IntPtr pool); 223 238 224 //[CLSCompliant(false)] 239 #if WIN32 240 [Softec.CallConvCdecl] 241 #endif 225 242 internal delegate IntPtr svn_auth_ssl_server_trust_prompt_func_t(out IntPtr cred, IntPtr baton, 226 243 IntPtr realm, uint failures, … … 228 245 int may_save, IntPtr pool); 229 246 247 #if WIN32 248 [Softec.CallConvCdecl] 249 #endif 230 250 internal delegate IntPtr svn_auth_ssl_client_cert_prompt_func_t(out IntPtr cred, IntPtr baton, 231 251 IntPtr realm, int may_save, 232 252 IntPtr pool); 233 253 254 #if WIN32 255 [Softec.CallConvCdecl] 256 #endif 234 257 internal delegate IntPtr svn_auth_ssl_client_cert_pw_prompt_func_t(out IntPtr cred, 235 258 IntPtr baton, … … 286 309 287 310 #region SvnClient 288 internal delegate IntPtr svn_client_get_commit_log_t(out IntPtr log_message, 311 #if WIN32 312 [Softec.CallConvCdecl] 313 #endif 314 internal delegate IntPtr svn_client_get_commit_log_t(out IntPtr log_message, 289 315 out IntPtr tmp_file, 290 316 IntPtr commit_items, IntPtr baton, 291 317 IntPtr pool); 292 318 293 internal delegate void svn_wc_status_func_t(IntPtr baton, IntPtr path, IntPtr status); 294 295 internal delegate IntPtr svn_log_message_receiver_t(IntPtr baton, IntPtr changed_paths, 319 #if WIN32 320 [Softec.CallConvCdecl] 321 #endif 322 internal delegate void svn_wc_status_func_t(IntPtr baton, IntPtr path, IntPtr status); 323 324 #if WIN32 325 [Softec.CallConvCdecl] 326 #endif 327 internal delegate IntPtr svn_log_message_receiver_t(IntPtr baton, IntPtr changed_paths, 296 328 int revision, IntPtr author, 297 329 IntPtr date, IntPtr message, 298 330 IntPtr pool); 299 331 300 internal delegate IntPtr svn_client_blame_receiver_t(IntPtr baton, long line_no, 332 #if WIN32 333 [Softec.CallConvCdecl] 334 #endif 335 internal delegate IntPtr svn_client_blame_receiver_t(IntPtr baton, long line_no, 301 336 int revision, IntPtr author, 302 337 IntPtr date, IntPtr line, trunk/SubversionSharp/windll/src/svnclient.vcproj
r82 r86 20 20 Name="VCCLCompilerTool" 21 21 Optimization="0" 22 AdditionalIncludeDirectories=" "..\..\..\subversion-debug\include";"..\..\..\subversion-debug\include\apr";"..\..\..\subversion-debug\include\apr-util";"..\..\..\subversion-debug\include\apr-iconv""22 AdditionalIncludeDirectories="..\..\..\SVN\src-1.0.9\subversion\include;..\..\..\SVN\src-1.0.9\apr\include;..\..\..\SVN\src-1.0.9\apr-util\include;..\..\..\SVN\src-1.0.9\apr-iconv\include" 23 23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVNCLIENT_EXPORTS" 24 24 MinimalRebuild="TRUE" … … 33 33 <Tool 34 34 Name="VCLinkerTool" 35 AdditionalDependencies="libapr.lib libaprutil.lib xml.lib libapriconv.lib libsvn_client-1.lib libsvn_delta-1.lib libsvn_diff-1.lib libsvn_ra-1.lib libsvn_ra_dav-1.lib libsvn_ra_local-1.lib libsvn_ra_svn-1.lib libsvn_fs-1.lib libsvn_repos-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libneon .lib libdb42.lib ws2_32.lib"35 AdditionalDependencies="libapr.lib libaprutil.lib xml.lib libapriconv.lib libsvn_client-1.lib libsvn_delta-1.lib libsvn_diff-1.lib libsvn_ra-1.lib libsvn_ra_dav-1.lib libsvn_ra_local-1.lib libsvn_ra_svn-1.lib libsvn_fs-1.lib libsvn_repos-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libneonD.lib libdb42.lib ws2_32.lib" 36 36 OutputFile="$(OutDir)/svn_client-1.dll" 37 37 LinkIncremental="2" 38 AdditionalLibraryDirectories=" ..\..\..\subversion-debug\lib;..\..\..\subversion-debug\lib\apr;"..\..\..\subversion-debug\lib\apr-util";"..\..\..\subversion-debug\lib\apr-iconv";..\..\..\subversion-debug\lib\neon;"..\..\..\subversion-debug\db4-win32\lib""39 IgnoreDefaultLibraryNames="LIBC;LIBCMTD ;MSVCRTD"38 AdditionalLibraryDirectories=""..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_client";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_delta";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_diff";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_ra";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_ra_dav";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_ra_local";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_ra_svn";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_fs";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_repos";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_subr";"..\..\..\SVN\src-1.0.9\Debug\subversion\libsvn_wc";"..\..\..\SVN\src-1.0.9\apr\Debug";"..\..\..\SVN\src-1.0.9\apr-iconv\Debug";"..\..\..\SVN\src-1.0.9\apr-util\Debug";"..\..\..\SVN\src-1.0.9\apr-util\xml\expat\lib\LibD";"..\..\..\SVN\src-1.0.9\neon";"..\..\..\SVN\src-1.0.9\db4-win32\lib"" 39 IgnoreDefaultLibraryNames="LIBC;LIBCMTD" 40 40 ModuleDefinitionFile="svnclient.def" 41 41 GenerateDebugInformation="TRUE" … … 74 74 Name="VCCLCompilerTool" 75 75 Optimization="2" 76 AdditionalIncludeDirectories="..\..\..\ subversion\include;..\..\..\subversion\include\apr;"..\..\..\subversion\include\apr-util";"..\..\..\subversion\include\apr-iconv""76 AdditionalIncludeDirectories="..\..\..\SVN\src-1.0.9\subversion\include;..\..\..\SVN\src-1.0.9\apr\include;..\..\..\SVN\src-1.0.9\apr-util\include;..\..\..\SVN\src-1.0.9\apr-iconv\include" 77 77 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SVNCLIENT_EXPORTS" 78 78 BasicRuntimeChecks="0" … … 89 89 OutputFile="$(OutDir)/svn_client-1.dll" 90 90 LinkIncremental="1" 91 AdditionalLibraryDirectories=" ..\..\..\subversion\lib;..\..\..\subversion\lib\apr;"..\..\..\subversion\lib\apr-util";"..\..\..\subversion\lib\apr-iconv";..\..\..\subversion\lib\neon;"..\..\..\subversion\db4-win32\lib""91 AdditionalLibraryDirectories=""..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_client";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_delta";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_diff";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_ra";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_ra_dav";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_ra_local";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_ra_svn";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_fs";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_repos";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_subr";"..\..\..\SVN\src-1.0.9\Release\subversion\libsvn_wc";"..\..\..\SVN\src-1.0.9\apr\Release";"..\..\..\SVN\src-1.0.9\apr-iconv\Release";"..\..\..\SVN\src-1.0.9\apr-util\Release";"..\..\..\SVN\src-1.0.9\apr-util\xml\expat\lib\LibR";"..\..\..\SVN\src-1.0.9\neon";"..\..\..\SVN\src-1.0.9\db4-win32\lib"" 92 92 IgnoreDefaultLibraryNames="LIBC;LIBCMT" 93 93 ModuleDefinitionFile="svnclient.def"