Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r4 - trunk

php-svn-client
Discussion topic

Back to topic list

svn commit: r4 - trunk

Reply

Author fedortyurin
Full name Fedor Tyurin
Date 2006-12-15 07:29:43 PST
Message Author: fedortyurin
Date: 2006-12-15 07:29:43-0800
New Revision: 4

Modified:
   trunk/php_svn_client.c
   trunk/php_svn_client.h
   trunk/php_svn_client.vcproj
   trunk/svn_client.ncb

Log:
Globals were modified

Modified: trunk/php_svn_client.c
Url: http://php-svn-clien​t.tigris.org/source/​browse/php-svn-clien​t/trunk/php_svn_clie​nt.c?view=diff&r​ev=4&p1=trunk/ph​p_svn_client.c&p​2=trunk/php_svn_clie​nt.c&r1=3&r2​=4
====================​====================​====================​==================
--- trunk/php_svn_client.c (original)
+++ trunk/php_svn_client.c 2006-12-15 07:29:43-0800
@@ -1,66 +1,110 @@
-#include "php.h"
-
-#include "fcntl.h"
-#include "php_svn_client.h"
-#include "php_ini.h"
-#include "php_globals.h"
-#include "ext/standard/info.h"
-#include "zend_API.h"
-
-#include "svn_version.h"
-#include "svn_client.h"
-#include "svn_pools.h"
-#include "svn_path.h"
-
-static int le_svn_client_context;
-static int le_svn_client_providers;
-static int le_svn_client_auth_baton;
-
-static apr_allocator_t *allocator;
-static apr_pool_t *pool;
-
-
-zend_function_entry svn_client_functions[] = {
- PHP_FE(svn_client_version, NULL)
- PHP_FE(svn_client_cr​eate_providers, NULL)
- PHP_FE(svn_client_auth_open, NULL)
- PHP_FE(svn_client_cr​eate_context, NULL)
- PHP_FE(svn_client_se​t_context_field, NULL)
- PHP_FE(svn_client_checkout, NULL)
- {NULL, NULL, NULL}
-};
-
+#include "php.h"
+#include "php_globals.h"
+#include "ext/standard/info.h"
+#include "ext/standard/php_string.h"
+
+#ifdef ZEND_ENGINE_2
+# include "zend_exceptions.h"
+#else
+ /* PHP 4 compat */
+# define OnUpdateLong OnUpdateInt
+# define E_STRICT E_NOTICE
+#endif
+
+#include "php_svn_client.h"
+#include "php_ini.h"
+#include "php_globals.h"
+#include "ext/standard/info.h"
+#include "zend_API.h"
+
+#include "svn_version.h"
+#include "svn_client.h"
+#include "svn_pools.h"
+#include "svn_path.h"
+#include "svn_cmdline.h"
+
+static int le_svn_client_context;
+static int le_svn_client_providers;
+static int le_svn_client_auth_baton;
+
+ZEND_DECLARE_MODULE​_GLOBALS(svn_client)​
+static PHP_GINIT_FUNCTION(svn_client);
+
+zend_function_entry svn_client_functions[] = {
+ PHP_FE(svn_client_version, NULL)
+ PHP_FE(svn_client_cr​eate_context, NULL)
+ PHP_FE(svn_client_se​t_context_field, NULL)
+ PHP_FE(svn_client_cr​eate_providers, NULL)
+ PHP_FE(svn_client_auth_open, NULL)
+ PHP_FE(svn_client_checkout, NULL)
+ {NULL, NULL, NULL}
+};
+
+#if 1
+zend_module_entry svn_client_module_entry = {
+ STANDARD_MODULE_HEADER,
+ "svn_client",
+ svn_client_functions,
+ PHP_MINIT(svn_client),
+ PHP_MSHUTDOWN(svn_client),
+ NULL,
+ NULL,
+ PHP_MINFO(svn_client),
+ NO_VERSION_YET,
+ PHP_MODULE_GLOBALS(svn_client),
+ PHP_GINIT(svn_client),
+ NULL,
+ NULL,
+ STANDARD_MODULE_PROPERTIES_EX
+};
+#else
 zend_module_entry svn_client_module_entry = {
     STANDARD_MODULE_HEADER,
     "svn_client",
     svn_client_functions,
     PHP_MINIT(svn_client),
+ PHP_MSHUTDOWN(svn_client),
+ PHP_RINIT(svn_client),
+ PHP_RSHUTDOWN(svn_client),
+ PHP_MINFO(svn_client),
+ "1.0",
+ PHP_MODULE_GLOBALS(svn_client),
+ PHP_GINIT(svn_client),
     NULL,
     NULL,
- NULL,
- PHP_MINFO(svn_client),
- NO_VERSION_YET,
- STANDARD_MODULE_PROPERTIES,
-};
-
-ZEND_GET_MODULE(svn_client)
-
-static void php_free_svn_client_​context(zend_rsrc_li​st_entry *rsrc TSRMLS_DC)
-{
- free((svn_client_ctx_t*) rsrc->ptr);
- return;
-}
-
-static void php_free_svn_client_​providers(zend_rsrc_​list_entry *rsrc TSRMLS_DC)
-{
- return;
-}
-
-static void php_free_svn_client_​auth_baton(zend_rsrc​_list_entry *rsrc TSRMLS_DC)
-{
- return;
-}
-
+ STANDARD_MODULE_PROPERTIES_EX
+};
+#endif
+
+#ifdef COMPILE_DL_SVN_CLIENT
+ZEND_GET_MODULE(svn_client)
+#endif
+
+static void php_free_svn_client_​context(zend_rsrc_li​st_entry *rsrc TSRMLS_DC)
+{
+ free((svn_client_ctx_t*) rsrc->ptr);
+ return;
+}
+
+static void php_free_svn_client_​providers(zend_rsrc_​list_entry *rsrc TSRMLS_DC)
+{
+ return;
+}
+
+static void php_free_svn_client_​auth_baton(zend_rsrc​_list_entry *rsrc TSRMLS_DC)
+{
+ char* su = 0;
+ char* sp = 0;
+ su = svn_auth_get_paramet​er(((svn_auth_baton_​t*) rsrc->ptr), SVN_AUTH_PARAM_DEFAU​LT_USERNAME);
+ sp = svn_auth_get_paramet​er(((svn_auth_baton_​t*) rsrc->ptr), SVN_AUTH_PARAM_DEFAU​LT_PASSWORD);
+
+ if (su)
+ free(su);
+ if (sp)
+ free(sp);
+ return;
+}
+
 static svn_error_t *php_prompt_svn_auth​_ssl_server_trust (
     svn_auth_cred_ssl_se​rver_trust_t **cred,
     void *baton,
@@ -82,8 +126,20 @@
     (*cred)->accepted_failures = failures;
 
     return SVN_NO_ERROR;
-}
-
+}
+
+static PHP_GINIT_FUNCTION(svn_client)
+{
+ svn_client_globals-​>allocator = NULL;
+ svn_client_globals->pool = NULL;
+}
+
+static void php_svn_client_init_​globals(zend_svn_cli​ent_globals *g)
+{
+ memset(g, 0, sizeof(*g));
+}
+
+
 /* Version compatibility check */
 static svn_error_t* check_lib_versions(void)
 {
@@ -101,67 +157,76 @@
   SVN_VERSION_DEFINE(my_version);
   return svn_ver_check_list(​&my_version, checklist);
 }
-
-PHP_MINIT_FUNCTION(svn_client)
-{
+
+PHP_MINIT_FUNCTION(svn_client)
+{
     svn_error_t *err;
-
- le_svn_client_context = zend_register_list_d​estructors_ex(php_fr​ee_svn_client_contex​t, NULL, "svn_client_context", module_number);
- le_svn_client_providers = zend_register_list_d​estructors_ex(php_fr​ee_svn_client_provid​ers, NULL, "svn_client_providers", module_number);
- le_svn_client_auth_baton = zend_register_list_d​estructors_ex(php_fr​ee_svn_client_auth_b​aton, NULL, "svn_client_auth_baton", module_number);
-
- if (apr_allocator_creat​e(&allocator))
+
+ apr_initialize();
+
+ if (apr_allocator_creat​e(&SVN_G(allocat​or)))
         return FAILURE;
 
- apr_allocator_max_fr​ee_set(allocator, SVN_ALLOCATOR_RECOMM​ENDED_MAX_FREE);
+ apr_allocator_max_fr​ee_set(SVN_G(allocat​or), SVN_ALLOCATOR_RECOMM​ENDED_MAX_FREE);
+
+ SVN_G(pool) = svn_pool_create_ex(NULL, SVN_G(allocator));
+// apr_allocator_owner_​set(SVN_G(allocator)​, SVN_G(pool));
 
- pool = svn_pool_create_ex(NULL, allocator);
-
     /* Check library versions */
     err = check_lib_versions();
     if (err)
     {
- printf("%s\n", err->message);
+ php_error_docref(NULL TSRMLS_CC, E_USER_ERROR, err->message);
         return FAILURE;
     }
 
     /* Initialize the RA library. */
- err = svn_ra_initialize(pool);
+ err = svn_ra_initialize(SVN_G(pool));
     if (err)
     {
- printf("%s\n", err->message);
+ php_error_docref(NULL TSRMLS_CC, E_USER_ERROR, err->message);
         return FAILURE;
     }
-
- return SUCCESS;
-}
-
+
+ le_svn_client_context = zend_register_list_d​estructors_ex(php_fr​ee_svn_client_contex​t, NULL, "svn_client_context", module_number);
+ le_svn_client_providers = zend_register_list_d​estructors_ex(php_fr​ee_svn_client_provid​ers, NULL, "svn_client_providers", module_number);
+ le_svn_client_auth_baton = zend_register_list_d​estructors_ex(php_fr​ee_svn_client_auth_b​aton, NULL, "svn_client_auth_baton", module_number);
+
+ return SUCCESS;
+}
+
 PHP_MSHUTDOWN_FUNCTI​ON(svn_client)
 {
- svn_pool_destroy(pool);
+ if (SVN_G(pool)) {
+ svn_pool_destroy(SVN_G(pool));
+ SVN_G(pool) = NULL;
+ }
     return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(svn_client)
-{
- char version[32];
-
- sprintf(version,"%d", 1);
-
- php_info_print_table_start();
- php_info_print_table_row(2, "Subversion client", "Enabled");
- php_info_print_table_row(2, "SVN API Version", version);
- php_info_print_table_end();
-}
-
-PHP_FUNCTION(svn_cl​ient_version)
-{
- const svn_version_t* svn_version;
-
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
-
+}
+
+PHP_MINFO_FUNCTION(svn_client)
+{
+ const svn_version_t* svn_version;
+ char version[32];
+
+ svn_version = svn_client_version();
+
+ sprintf(version,"%d.%d.%d %s", svn_version->major, svn_version->minor, svn_version->patch, svn_version->tag);
+
+ php_info_print_table_start();
+ php_info_print_table_row(2, "Subversion client", "Enabled");
+ php_info_print_table_row(2, "SVN API Version", version);
+ php_info_print_table_end();
+}
+
+PHP_FUNCTION(svn_cl​ient_version)
+{
+ const svn_version_t* svn_version;
+
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+ }
+
     array_init(return_value);
     
     svn_version = svn_client_version();
@@ -175,29 +240,86 @@
     return;
 }
 
+PHP_FUNCTION(svn_cl​ient_create_context)​
+{
+ svn_client_ctx_t* ctx = 0;
+
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+ }
+
+ svn_client_create_co​ntext(&ctx, SVN_G(pool));
+
+ ZEND_REGISTER_RESOUR​CE(return_value, ctx, le_svn_client_context);
+
+ return;
+}
+
+PHP_FUNCTION(svn_cl​ient_set_context_fie​ld)
+{
+ zval **resource_ctx = 0;
+ zval **string_ctx_field = 0;
+ zval **resource_ctx_field_value = 0;
+
+ svn_client_ctx_t* ctx = 0;
+ svn_auth_baton_t *ab = 0;
+ char *ctx_field = 0;
+
+
+ switch (ZEND_NUM_ARGS()) {
+ case 3:
+ if (zend_get_parameters_ex(3, &resource_ctx, &string_ctx_field, &resource_ctx_fi​eld_value)==FAILURE)​ {
+ RETURN_FALSE;
+ }
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
+ }
+
+ ZEND_FETCH_RESOURCE(ctx, svn_client_ctx_t*, resource_ctx, -1, "svn client context", le_svn_client_context);
+
+ convert_to_string_ex​(string_ctx_field);
+ ctx_field = Z_STRVAL_PP(string_ctx_field);
+
+ if (!strcmp(ctx_field, "auth_baton"))
+ {
+ ZEND_FETCH_RESOURCE(ab, svn_auth_baton_t*, resource_ctx_field_value, -1, "svn client auth baton", le_svn_client_auth_baton);
+ ctx->auth_baton = ab;
+ }
+ else
+ {
+ RETURN_FALSE;
+ }
+
+ ZEND_REGISTER_RESOUR​CE(return_value, ctx, le_svn_client_context);
+
+ return;
+}
+
 PHP_FUNCTION(svn_cli​ent_create_providers​)
 {
     svn_auth_provider_object_t *provider = NULL;
     apr_array_header_t *providers = NULL;
 
- providers = apr_array_make(pool, 12, sizeof(svn_auth_prov​ider_object_t *));
+ providers = apr_array_make(SVN_G(pool), 12, sizeof(svn_auth_prov​ider_object_t *));
 
- svn_auth_get_simple_​provider(&provid​er, pool);
+ svn_auth_get_simple_​provider(&provid​er, SVN_G(pool));
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
- svn_auth_get_usernam​e_provider(&prov​ider, pool);
+ svn_auth_get_usernam​e_provider(&prov​ider, SVN_G(pool));
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
- svn_auth_get_ssl_ser​ver_trust_prompt_pro​vider (&provider, php_prompt_svn_auth_​ssl_server_trust, NULL, pool);
+ svn_auth_get_ssl_ser​ver_trust_prompt_pro​vider (&provider, php_prompt_svn_auth_​ssl_server_trust, NULL, SVN_G(pool));
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
- svn_auth_get_ssl_ser​ver_trust_file_provi​der(&provider, pool);
+ svn_auth_get_ssl_ser​ver_trust_file_provi​der(&provider, SVN_G(pool));
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
- svn_auth_get_ssl_cli​ent_cert_file_provid​er(&provider, pool);
+ svn_auth_get_ssl_cli​ent_cert_file_provid​er(&provider, SVN_G(pool));
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
- svn_auth_get_ssl_cli​ent_cert_pw_file_pro​vider(&provider,​ pool);
+ svn_auth_get_ssl_cli​ent_cert_pw_file_pro​vider(&provider,​ SVN_G(pool));
     APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
     ZEND_REGISTER_RESOUR​CE(return_value, providers, le_svn_client_providers);
@@ -211,8 +333,12 @@
     zval **string_auth_username = 0;
     zval **string_auth_password = 0;
     apr_array_header_t *providers = NULL;
- const char *auth_username = 0;
- const char *auth_password = 0;
+ char *auth_username = 0;
+ char *auth_password = 0;
+ int auth_username_len = 0;
+ int auth_password_len = 0;
+ char *su = 0;
+ char *sp = 0;
 
     svn_auth_baton_t *ab = 0;
 
@@ -246,80 +372,32 @@
     {
         convert_to_string_ex​(string_auth_usernam​e);
         auth_username = Z_STRVAL_PP(string_a​uth_username);
+ auth_username_len = Z_STRLEN_PP(string_a​uth_username);
+ su = (char*)malloc(auth_u​sername_len+1);
+ memcpy(su, auth_username, auth_username_len);
+ su[auth_username_len] = 0;
     }
 
     if (string_auth_password)
     {
         convert_to_string_ex​(string_auth_passwor​d);
         auth_password = Z_STRVAL_PP(string_a​uth_password);
+ auth_password_len = Z_STRLEN_PP(string_a​uth_password);
+ sp = (char*)malloc(auth_p​assword_len+1);
+ memcpy(sp, auth_password, auth_password_len);
+ sp[auth_password_len] = 0;
     }
 
- svn_auth_open(&ab, providers, pool);
 
- if (auth_username)
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAU​LT_USERNAME, auth_username);
- if (auth_password)
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAU​LT_PASSWORD, auth_password);
 
- ZEND_REGISTER_RESOUR​CE(return_value, ab, le_svn_client_auth_baton);
-
- return;
-}
-
-PHP_FUNCTION(svn_cl​ient_create_context)​
-{
- svn_client_ctx_t* ctx = 0;
-
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
- }
+ svn_auth_open(&ab, providers, SVN_G(pool));
 
- svn_client_create_co​ntext(&ctx, pool);
+ if (su)
+ svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAU​LT_USERNAME, su);
+ if (sp)
+ svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAU​LT_PASSWORD, sp);
 
- ZEND_REGISTER_RESOUR​CE(return_value, ctx, le_svn_client_context);
-
- return;
-}
-
-PHP_FUNCTION(svn_cl​ient_set_context_fie​ld)
-{
- zval **resource_ctx = 0;
- zval **string_ctx_field = 0;
- zval **resource_ctx_field_value = 0;
-
- svn_client_ctx_t* ctx = 0;
- svn_auth_baton_t *ab = 0;
- char *ctx_field = 0;
-
-
- switch (ZEND_NUM_ARGS()) {
- case 3:
- if (zend_get_parameters_ex(3, &resource_ctx, &string_ctx_field, &resource_ctx_fi​eld_value)==FAILURE)​ {
- RETURN_FALSE;
- }
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
- }
-
- ZEND_FETCH_RESOURCE(ctx, svn_client_ctx_t*, resource_ctx, -1, "svn client context", le_svn_client_context);
-
- convert_to_string_ex​(string_ctx_field);
- ctx_field = Z_STRVAL_PP(string_ctx_field);
-
- if (!strcmp(ctx_field, "auth_baton"))
- {
- printf("ctx_field=%s\n", ctx_field);
- ZEND_FETCH_RESOURCE(ab, svn_auth_baton_t*, resource_ctx_field_value, -1, "svn client auth baton", le_svn_client_auth_baton);
- ctx->auth_baton = ab;
- }
- else
- {
- RETURN_FALSE;
- }
-
- ZEND_REGISTER_RESOUR​CE(return_value, ctx, le_svn_client_context);
+ ZEND_REGISTER_RESOUR​CE(return_value, ab, le_svn_client_auth_baton);
 
     return;
 }
@@ -356,18 +434,22 @@
     convert_to_string_ex​(z_string_path);
     path=Z_STRVAL_PP(z_s​tring_path);
 
- printf("url=%s\n", url);
- printf("path=%s\n", path);
-
     ZEND_FETCH_RESOURCE(ctx, svn_client_ctx_t*, z_resource_ctx, -1, "svn client context", le_svn_client_context);
 
- err = svn_opt_parse_path(​&peg_revision, &true_url, url, pool);
+ revision.kind = svn_opt_revision_unspecified;
+
+ if (!svn_path_is_url(url)) {
+ printf("Wrong url\n");
+ return;
+ }
+
+ err = svn_opt_parse_path(​&peg_revision, &true_url, url, SVN_G(pool));
     if (err) {
         printf("%s\n", err->message);
         RETURN_FALSE;
     }
 
- true_url = svn_path_canonicalize(true_url, pool);
+ true_url = svn_path_canonicalize(true_url, SVN_G(pool));
 
     if (revision.kind == svn_opt_revision_unspecified) {
         if (peg_revision.kind != svn_opt_revision_unspecified)
@@ -382,12 +464,13 @@
                                    &revision,
                                    TRUE,
                                    FALSE,
- ctx, pool);
+ ctx, SVN_G(pool));
 
     if (err) {
- printf("%s\n", err->message);
- RETURN_FALSE;
+ svn_cmdline_handle_e​xit_error(err, SVN_G(pool), "test1: ");
+// svn_handle_error2(err, stderr, 0, "test1: ");
+// svn_error_clear(err);
     }
 
     return;
-}
\ No newline at end of file
+}

Modified: trunk/php_svn_client.h
Url: http://php-svn-clien​t.tigris.org/source/​browse/php-svn-clien​t/trunk/php_svn_clie​nt.h?view=diff&r​ev=4&p1=trunk/ph​p_svn_client.h&p​2=trunk/php_svn_clie​nt.h&r1=3&r2​=4
====================​====================​====================​==================
--- trunk/php_svn_client.h (original)
+++ trunk/php_svn_client.h 2006-12-15 07:29:43-0800
@@ -1,16 +1,43 @@
-#define zend_module_entry zend_module_entry
+#ifndef PHP_SVN_CLIENT_H
+#define PHP_SVN_CLIENT_H
+
+#ifdef PHP_WIN32
+#define PHP_SVN_CLIENT_API __declspec(dllexport)
+#else
+#define PHP_SVN_CLIENT_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+extern zend_module_entry svn_client_module_entry;
+#define svn_client_module_ptr &svn_client_module_entry
 
-//#include "zend_modules.h"
-
-extern zend_module_entry svn_client_module_entry;
-
-#include "TSRM.h"
+#include "svn_client.h"
 
 PHP_MINIT_FUNCTION(svn_client);
+PHP_MSHUTDOWN_FUNCT​ION(svn_client);
 PHP_MINFO_FUNCTION(svn_client);
 PHP_FUNCTION(svn_cli​ent_version);
-PHP_FUNCTION(svn_cl​ient_create_provider​s);
-PHP_FUNCTION(svn_cl​ient_auth_open);
 PHP_FUNCTION(svn_cli​ent_create_context);​
 PHP_FUNCTION(svn_cli​ent_set_context_fiel​d);
+PHP_FUNCTION(svn_cl​ient_create_provider​s);
+PHP_FUNCTION(svn_cl​ient_auth_open);
 PHP_FUNCTION(svn_cli​ent_checkout);
+
+ZEND_BEGIN_MODULE_G​LOBALS(svn_client)
+ apr_allocator_t *allocator;
+ apr_pool_t *pool;
+ZEND_END_MODULE_GLO​BALS(svn_client)
+
+
+#ifdef ZTS
+#define SVN_G(v) TSRMG(svn_client_globals_id, zend_svn_client_globals *, v)
+#else
+#define SVN_G(v) (svn_client_globals.v)
+#endif
+
+#define phpext_svn_client_ptr svn_client_module_ptr
+
+#endif
\ No newline at end of file

Modified: trunk/php_svn_client.vcproj
Url: http://php-svn-clien​t.tigris.org/source/​browse/php-svn-clien​t/trunk/php_svn_clie​nt.vcproj?view=diff​&rev=4&p1=tru​nk/php_svn_client.vc​proj&p2=trunk/ph​p_svn_client.vcproj​&r1=3&r2=4
====================​====================​====================​==================
--- trunk/php_svn_client.vcproj (original)
+++ trunk/php_svn_client.vcproj 2006-12-15 07:29:43-0800
@@ -77,32 +77,34 @@
                 Name="VCCLCompilerTool"
                 Optimization="2"
                 InlineFunctionExpansion="1"
- AdditionalIncludeDir​ectories="svn\inclu​de\apr;php\win32;p​hp\main;php\TSRM;p​hp\Zend;php;svn/inc​lude"
- PreprocessorDefiniti​ons="WIN32;ZEND_DEBU​G=0;NDEBUG;_WINDOWS;​_USRDLL;ZEND_WIN32;P​HP_WIN32;ZTS=1"
+ AdditionalIncludeDir​ectories="svn\inclu​de\apr;"sv​n\include\apr-util​";php\win3​2;php\main;php\TSR​M;php\Zend;php;svn/​include"
+ PreprocessorDefiniti​ons="NDEBUG;ZEND_DEB​UG=0;ZTS=1;COMPILE_D​L_SVN_CLIENT;WIN32;_​WINDOWS;_MBCS;_USRDL​L;ZEND_WIN32;PHP_WIN​32"
                 StringPooling="TRUE"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
+ StructMemberAlignment="0"
                 BufferSecurityCheck="TRUE"
                 EnableFunctionLevelL​inking="TRUE"
- UsePrecompiledHeader="0"
+ UsePrecompiledHeader="2"
                 WarningLevel="3"
                 Detect64BitPortabili​tyProblems="FALSE"
- DebugInformationFormat="3"/>
+ DebugInformationFormat="3"
+ CompileAs="0"/>
             <Tool
                 Name="VCCustomBuildTool"/>
             <Tool
                 Name="VCLinkerTool"
                 AdditionalDependenci​es="php/dev/php5ts.l​ib svn/lib/apr/libapr.lib svn/lib/apr-util/libaprutil.lib svn/lib/apr-util/xml.lib svn/lib/neon/libneon.lib svn/lib/libsvn_client-1.lib svn/lib/libsvn_delta-1.lib svn/lib/libsvn_diff-1.lib svn/lib/libsvn_fs-1.lib svn/lib/libsvn_fs_base-1.lib svn/lib/libsvn_fs_fs-1.lib svn/lib/libsvn_subr-1.lib svn/lib/libsvn_wc-1.lib svn/lib/libsvn_ra-1.lib svn/lib/libsvn_ra_dav-1.lib svn/lib/libsvn_ra_local-1.lib svn/lib/libsvn_ra_svn-1.lib svn/lib/libsvn_repos-1.lib intl/lib/intl3_svn.lib db/lib/libdb43.lib ws2_32.lib"
                 OutputFile="$(OutDi​r)/php_svn_client.dl​l"
- LinkIncremental="2"
- SuppressStartupBanner="FALSE"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
                 IgnoreAllDefaultLibr​aries="FALSE"
- IgnoreDefaultLibrary​Names="LIBCMT"
+ IgnoreDefaultLibraryNames=""
                 GenerateDebugInforma​tion="FALSE"
- SubSystem="1"
+ SubSystem="0"
                 OptimizeReferences="0"
                 EnableCOMDATFolding="0"
                 ImportLibrary=""
- TargetMachine="1"/>
+ TargetMachine="0"/>
             <Tool
                 Name="VCMIDLTool"/>
             <Tool

Modified: trunk/svn_client.ncb
Url: http://php-svn-clien​t.tigris.org/source/​browse/php-svn-clien​t/trunk/svn_client.n​cb?view=diff&rev​=4&p1=trunk/svn_​client.ncb&p2=tr​unk/svn_client.ncb​&r1=3&r2=4
====================​====================​====================​==================
Binary files. No diff available.

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r4 - trunk fedortyurin Fedor Tyurin 2006-12-15 07:29:43 PST
Messages per page: