You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by bi...@apache.org on 2020/04/04 15:06:38 UTC
[axis-axis2-c-core] 02/09: Fixed the issues raised during release
vote
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1.1.x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git
commit f2b5a7ddae073e19f39c0ba83bce925b2b5854aa
Author: Don Samisa Abeysinghe <sa...@apache.org>
AuthorDate: Mon Sep 24 03:11:34 2007 +0000
Fixed the issues raised during release vote
---
Makefile.am | 2 +-
build.sh | 6 +++---
samples/server/Makefile.am | 2 +-
util/src/dir_handler.c | 6 ++----
xdocs/api/doxygenconf | 2 +-
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c2b7f4c..4a3593d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ data_DATA= samples/server/axis2.xml README \
logs_DATA=
docs_DATA=
-EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh guththila tools AUTHORS NOTICE xdocs
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE build axis2c_build.sh guththila tools AUTHORS NOTICE
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
diff --git a/build.sh b/build.sh
index 857907e..e809ebe 100755
--- a/build.sh
+++ b/build.sh
@@ -7,14 +7,14 @@ export AXIS2C_HOME
echo "AXIS2C_HOME = ${AXIS2C_HOME}"
-sh configure --prefix=${AXIS2C_HOME}
-make -j 10
+sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes --with-apache2=/usr/local/apache2/include --with-apr=/usr/local/apache2/include --enable-tcp
+make
make install
cd samples
sh autogen.sh
sh configure --prefix=${AXIS2C_HOME} --with-axis2=${AXIS2C_HOME}/include/axis2-1.1
-make -j 10
+make
make install
cd ..
diff --git a/samples/server/Makefile.am b/samples/server/Makefile.am
index 6920c47..4016d97 100644
--- a/samples/server/Makefile.am
+++ b/samples/server/Makefile.am
@@ -1,3 +1,3 @@
SUBDIRS = echo math notify sg_math mtom Calculator
-EXTRA_DIST = axis2.xml axis2.log
+EXTRA_DIST = axis2.xml
diff --git a/util/src/dir_handler.c b/util/src/dir_handler.c
index 724563f..f815b9a 100644
--- a/util/src/dir_handler.c
+++ b/util/src/dir_handler.c
@@ -287,13 +287,11 @@ axutil_dir_handler_list_service_or_module_dirs(const axutil_env_t *env,
AXIS2_FREE(env->allocator, buf);
}
-/*#ifndef WIN32*/
for (i = 0; i < count; i++)
{
- AXIS2_FREE(env->allocator, files[i]);
+ free(files[i]);
}
- AXIS2_FREE(env->allocator, files);
-/*#endif*/
+ free(files);
return file_list;
}
diff --git a/xdocs/api/doxygenconf b/xdocs/api/doxygenconf
index 13fd2ed..c8295d2 100644
--- a/xdocs/api/doxygenconf
+++ b/xdocs/api/doxygenconf
@@ -450,7 +450,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../../../deploy/include/axis2-1.1/
+INPUT = ../../deploy/include/axis2-1.1/
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp