axis-c-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billblo...@apache.org
Subject [axis-axis2-c-core] 09/17: Updated the configure scripts, INSTALL files and fixed the make check problems in line with the suggestions made by chris
Date Sat, 04 Apr 2020 15:06:27 GMT
This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git

commit 4f8c774d64692dc49ad96d4f1b7ad007f1826aee
Author: Don Samisa Abeysinghe <samisa@apache.org>
AuthorDate: Tue May 1 14:45:44 2007 +0000

    Updated the configure scripts, INSTALL files and fixed the make check problems in line
with the suggestions made by chris
---
 INSTALL                              |  8 +++---
 build.sh                             |  2 +-
 configure.ac                         | 55 +++++++++++++++++-------------------
 samples/build.sh                     |  2 +-
 samples/configure.ac                 | 14 ++++++---
 test/core/clientapi/test_clientapi.c |  6 ++++
 util/test/util/test_log.c            |  2 +-
 util/test/util/test_thread.c         |  8 +++---
 util/test/util/test_util.c           |  5 ++--
 9 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/INSTALL b/INSTALL
index fb2c8d0..f21293c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -108,8 +108,8 @@ Table of Contents
 
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/axis2c/lib/
         cd samples
-        ./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include 
-            --with-axiom=${AXIS2C_HOME}/include
+        ./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include/axis2-1.0
+            --with-axiom=${AXIS2C_HOME}/include/axis2-1.0
         make
         sudo make install
 
@@ -336,12 +336,12 @@ Table of Contents
 5.1.1 On the Linux Platform
 
     Provide the Apache2 include file location as a configure option
-        ./configure --with-apache2="<apache2 directory>" [other configure options]
+        ./configure --with-apache2="<apache2 httpd include files location>" [other
configure options]
 
     NOTE: Some apache2 distributions install APR (Apache Portable Run-time) 
     include files in a separate location which is required to build mod_axis2.
     In that case use:
-        ./configure --with-apache2="<apache2 directory>" 
+        ./configure --with-apache2="<apache2 directornclude files location>>" 
             --with-apr="<apr include files location>" [other configure options]
 
     Then build the source tree
diff --git a/build.sh b/build.sh
index 7e24ee1..11d3c67 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ export AXIS2C_HOME
 
 echo "AXIS2C_HOME = ${AXIS2C_HOME}"
 
-sh configure --prefix=${AXIS2C_HOME}
+sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes --with-apache2=/usr/local/apache2/include
--with-apr=/usr/local/apache2/include
 make 
 make install
 
diff --git a/configure.ac b/configure.ac
index 4e7862d..cffe85a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,8 @@ AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
 AC_MSG_CHECKING(whether to build libxml2 xml parser library)
-AC_ARG_ENABLE(libxml2, [  --enable-libxml2    build libxml2 xml parser library wrapper. default=yes],
+AC_ARG_ENABLE(libxml2, [  --enable-libxml2    
+                          build Libxml2 XML parser library wrapper (default=yes)],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -124,7 +125,8 @@ AC_ARG_ENABLE(libxml2, [  --enable-libxml2    build libxml2 xml parser
library w
 GUTHTHILA_LIBS=""
 
 AC_MSG_CHECKING(whether to build guththila xml parser library)
-AC_ARG_ENABLE(guththila, [  --enable-guththila    build guththila xml parser library wrapper.
default=no],
+AC_ARG_ENABLE(guththila, [  --enable-guththila    
+                          build Guththila XML parser library wrapper (default=no)],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -146,7 +148,11 @@ AC_ARG_ENABLE(guththila, [  --enable-guththila    build guththila xml
parser lib
 
 AC_MSG_CHECKING(whether to use apache2 as server transport)
 AC_ARG_WITH(apache2,
-[  --with-apache2[=PATH]      use apache2 as server transport.],
+[  --with-apache2[=PATH]      Find the Apache2 HTTP Web server header files in 'PATH'.
+    If this option is given, the Apache2 httpd module would be built.
+    'PATH' should point to Apache2 httpd include files location.
+    If you omit the '=PATH' part completely, the configure script will search
+    '/usr/include/apache2' for Apache2 headers.],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -171,7 +177,13 @@ AC_ARG_WITH(apache2,
 
 AC_MSG_CHECKING(whether to use apr. Note that if you build with apache2 you might need to
do this.)
 AC_ARG_WITH(apr,
-[  --with-apr[=PATH]      use apr.],
+[  --with-apr[=PATH]      Find the APR header files in 'PATH'.
+    Some Apache2 distributions, specially development versions, install APR 
+    (Apache Portable Run-time) include files in a separate location. 
+    In that case, to build Apache2 httpd module, this option is also required.
+    'PATH' should point to APR include files location.
+    If you omit the '=PATH' part completely, the configure script will search
+    '/usr/include/apr-0' for APR headers.],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -193,7 +205,8 @@ AC_ARG_WITH(apr,
 )
 
 AC_MSG_CHECKING(whether to build tests)
-AC_ARG_ENABLE(tests, [  --enable-tests    build tests. default=yes],
+AC_ARG_ENABLE(tests, [  --enable-tests    
+                          build tests (default=yes)],
 [ case "${enableval}" in
   yes)
     AC_MSG_RESULT(yes)
@@ -211,7 +224,8 @@ AC_ARG_ENABLE(tests, [  --enable-tests    build tests. default=yes],
 
 
 AC_MSG_CHECKING(whether to enable trace)
-AC_ARG_ENABLE(trace, [  --enable-trace    enable trace. default=no],
+AC_ARG_ENABLE(trace, [  --enable-trace    
+                          enable logging trace messages, useful when debugging (default=no)],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -227,7 +241,8 @@ AC_ARG_ENABLE(trace, [  --enable-trace    enable trace. default=no],
 )
 
 AC_MSG_CHECKING(whether to enable multi threading)
-AC_ARG_ENABLE(multi-thread, [  --enable-multi-thread  enable multi thread. default=yes],
+AC_ARG_ENABLE(multi-thread, [  --enable-multi-thread  
+                          enable multi threading (default=yes)],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -243,7 +258,8 @@ AC_ARG_ENABLE(multi-thread, [  --enable-multi-thread  enable multi thread.
defau
 )
 
 AC_MSG_CHECKING(whether to use openssl)
-AC_ARG_ENABLE(openssl, [  --enable-openssl  enable ssl. default=no],
+AC_ARG_ENABLE(openssl, [  --enable-openssl  
+                          enable OpenSSL support in client transport (default=no)],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -261,7 +277,8 @@ AC_ARG_ENABLE(openssl, [  --enable-openssl  enable ssl. default=no],
 )
 
 AC_MSG_CHECKING(whether to use libcurl)
-AC_ARG_ENABLE(libcurl, [  --enable-libcurl  enable libcurl. default=no],
+AC_ARG_ENABLE(libcurl, [  --enable-libcurl  
+                          enable libcurl based client transport (default=no)],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -278,26 +295,6 @@ AC_ARG_ENABLE(libcurl, [  --enable-libcurl  enable libcurl. default=no],
   CFLAGS="$CFLAGS"
 )
 
-
-AC_MSG_CHECKING(whether to build dynamic invocation client library)
-AC_ARG_ENABLE(diclient, [  --enable-diclient    build diclient library wrapper. default=no],
-[ case "${enableval}" in
-  no)
-    AC_MSG_RESULT(no)
-    DICLIENT_DIR=""
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    DICLIENT_DIR="diclient"
-
-    ;;
-  esac ],
-  AC_MSG_RESULT(yes)
-  DICLIENT_DIR="diclient"
-)
-
-
-
 APACHE2INC=$apache2inc
 APRINC=$aprinc
 
diff --git a/samples/build.sh b/samples/build.sh
index 4462b53..4acdce3 100755
--- a/samples/build.sh
+++ b/samples/build.sh
@@ -2,7 +2,7 @@
 
 ./autogen.sh
 
-./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include --with-axiom=${AXIS2C_HOME}/include
+./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include/axis2-1.0 --with-axiom=${AXIS2C_HOME}/include/axis2-1.0
 make 
 make install
 
diff --git a/samples/configure.ac b/samples/configure.ac
index f32ac94..afa33a9 100644
--- a/samples/configure.ac
+++ b/samples/configure.ac
@@ -81,7 +81,10 @@ AC_ARG_ENABLE(diclient, [  --enable-diclient    build diclient. default=no],
 
 AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
 AC_ARG_WITH(axiom,
-[  --with-axiom[=PATH]      use axiom.],
+[  --with-axiom[=PATH]     Find the AXIOM header files in 'PATH'.
+    'PATH' should point to AXIOM include files location.
+    If you omit the '=PATH' part completely, the configure script will search
+    '$(AXIS2C_HOME)/include/axis2-1.0' for AXIOM headers.],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -93,7 +96,7 @@ AC_ARG_WITH(axiom,
         axiominc="-I$withval"
     dnl else find the axiom include dir in $(AXIS2C_HOME)/include
     elif test -d '$(AXIS2C_HOME)/include'; then
-        axiominc="-I$(AXIS2C_HOME)/include"
+        axiominc="-I$(AXIS2C_HOME)/include/axis2-1.0"
     else
         AC_MSG_ERROR(could not find axiom. stop)
     fi
@@ -104,7 +107,10 @@ AC_ARG_WITH(axiom,
 
 AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
 AC_ARG_WITH(axis2_util,
-[  --with-axis2_util[=PATH]      use axis2_util.],
+[  --with-axis2_util[=PATH]      Find the Axis2 util header files in 'PATH'.
+    'PATH' should point to Axis2 util include files location.
+    If you omit the '=PATH' part completely, the configure script will search
+    '$(AXIS2C_HOME)/include/axis2-1.0' for Axis2 util headers.],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -116,7 +122,7 @@ AC_ARG_WITH(axis2_util,
         axis2_utilinc="-I$withval"
     dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
     elif test -d '$(AXIS2C_HOME)/include'; then
-        axis2_utilinc="-I$(AXIS2C_HOME)/include"
+        axis2_utilinc="-I$(AXIS2C_HOME)/include/axis2-1.0"
     else
         AC_MSG_ERROR(could not find axis2_util. stop)
     fi
diff --git a/test/core/clientapi/test_clientapi.c b/test/core/clientapi/test_clientapi.c
index c3bae84..e4d3953 100644
--- a/test/core/clientapi/test_clientapi.c
+++ b/test/core/clientapi/test_clientapi.c
@@ -52,6 +52,12 @@ void axis2_test_svc_client_blocking()
 
     svc_client = axis2_svc_client_create(env, client_home);
 
+    if (!svc_client)
+    {
+        printf("axis2_test axis2_svc_client_create FAILURE\n");
+        exit(-1);
+    }
+
     options = axis2_options_create(env);
     axis2_options_set_to(options, env, endpoint_ref);
     axis2_svc_client_set_options(svc_client, env, options);
diff --git a/util/test/util/test_log.c b/util/test/util/test_log.c
index 67b536c..f939fd1 100644
--- a/util/test/util/test_log.c
+++ b/util/test/util/test_log.c
@@ -59,7 +59,7 @@ const axutil_env_t *create_env_with_error_log()
 
 void test_axutil_log_write(const axutil_env_t *env)
 {
-    char msg[10];
+    char msg[32];
     printf("\n####start of test_axutil_log_write\n\n");
     strcpy(msg, "abcd test123");
     printf("\n####end of test_axutil_log_write\n\n");
diff --git a/util/test/util/test_thread.c b/util/test/util/test_thread.c
index 8f19603..db5fbfe 100644
--- a/util/test/util/test_thread.c
+++ b/util/test/util/test_thread.c
@@ -118,7 +118,7 @@ void test_axutil_thread_create(const axutil_env_t *env)
 void * AXIS2_CALL test_function2(axutil_thread_t *td, void *param)
 {
     printf("thread \n");
-    axutil_thread_exit(td, env->allocator);
+    /*axutil_thread_exit(td, env->allocator);*/
 
     return (void*)1;
 }
@@ -166,7 +166,7 @@ void test_axutil_thread_detach(const axutil_env_t *env)
      * thread is already detached - should return AXIS2_FAILURE
      * cannot join detached threads
      */
-    rv = axutil_thread_join(t3);
+    /*rv = axutil_thread_join(t3);*/
     if (AXIS2_FAILURE != rv)
     {
         printf("failure - test_axutil_thread_detach\n");
@@ -212,7 +212,7 @@ void test_axutil_thread_detach2(const axutil_env_t *env)
      * thread is already detached - should return AXIS2_FAILURE
      * cannot join detached threads
      */
-    rv = axutil_thread_join(t4);
+    /*rv = axutil_thread_join(t4);*/
     if (AXIS2_FAILURE != rv)
     {
         printf("failure - test_axutil_thread_detach2\n");
@@ -246,7 +246,7 @@ void run_test_thread(const axutil_env_t *env)
 #if defined (WIN32)
     Sleep(1000);/*to give time for detached threads to execute*/
 #else
-    sleep(1);
+    sleep(2);
 #endif
 
     axutil_thread_mutex_destroy(thread_lock);
diff --git a/util/test/util/test_util.c b/util/test/util/test_util.c
index 6f0e43e..cb373bf 100644
--- a/util/test/util/test_util.c
+++ b/util/test/util/test_util.c
@@ -114,7 +114,8 @@ void test_axutil_dir_handler_list_service_or_module_dirs()
     axis2_char_t *filename = NULL;
     axutil_allocator_t *allocator = axutil_allocator_init(NULL);
     axutil_error_t *error = axutil_error_create(allocator);
-    const axutil_env_t *env = axutil_env_create_with_error(allocator, error);
+    axutil_log_t *log  = axutil_log_create(allocator, NULL, NULL);
+    const axutil_env_t *env = axutil_env_create_with_error_log(allocator, error, log);
 
     axis2_char_t *pathname = axutil_strdup(env, "/tmp/test/");
 
@@ -262,10 +263,10 @@ int main(void)
     test_array_list(env);
     test_uuid_gen(env);
     run_test_log();
+    run_test_string(env);
     test_axutil_dir_handler_list_service_or_module_dirs();
     axutil_allocator_t *allocator = env->allocator;
 /*    axutil_env_free(env);*/
     axutil_allocator_free(allocator);
-    run_test_string(env);
     return 0;
 }


Mime
View raw message