diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | axis2c_build.sh | 23 | ||||
| -rwxr-xr-x | bindist.sh | 65 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rwxr-xr-x | dist.sh | 36 |
6 files changed, 7 insertions, 128 deletions
diff --git a/Makefile.am b/Makefile.am index 45c8ede..adb68f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ datadir=$(prefix) logsdir=$(prefix)/logs docsdir=$(prefix) -includedir=$(prefix)/include/axis2-1.7.0 +includedir=$(prefix)/include/axis2-${PACKAGE_VERSION} wsdl2cdir=$(prefix)/bin/tools/wsdl2c diff --git a/axis2c_build.sh b/axis2c_build.sh deleted file mode 100755 index aa47be5..0000000 --- a/axis2c_build.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -if [ -z "$1" ] ; then - AXIS2C_DEPLOY="/usr/local/axis2c" -else - AXIS2C_DEPLOY=$1 -fi - -if [ `uname -s` = Darwin ] -then - export DYLD_LIBRARY_PATH=${AXIS2C_DEPLOY}/lib -else - export LD_LIBRARY_PATH=${AXIS2C_DEPLOY}/lib -fi - -./configure --prefix=${AXIS2C_DEPLOY} -make -make install - -cd samples -./configure --prefix=${AXIS2C_DEPLOY} --with-axis2=${AXIS2C_DEPLOY}/include/axis2-1.7.0 -make -make install diff --git a/bindist.sh b/bindist.sh deleted file mode 100755 index 19e7636..0000000 --- a/bindist.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -sh clean.sh - -./autogen.sh -AXIS2C_HOME=`pwd`/deploy -export AXIS2C_HOME - -./configure --prefix=${AXIS2C_HOME} --enable-tests=no --enable-trace=yes --enable-diclient=no --enable-static=no --enable-openssl=no --with-apache2=/usr/local/apache2/include --with-archive=/usr/include - -make -make install - -cd tools/tcpmon -./autogen.sh -./configure --prefix=${AXIS2C_HOME} --enable-tests=no -make -make install - -cd ../../samples - -./autogen.sh - -./configure --prefix=${AXIS2C_HOME} --with-axis2=${AXIS2C_HOME}/include/axis2-1.7.0 -make -make install - -make dist -tar xf axis2c-sample-src-1.7.0.tar.gz -mv axis2c-sample-src-1.7.0 samples -#$rm -rf ${AXIS2C_HOME}/samples -mv samples ${AXIS2C_HOME}/samples/src - -cd .. - -rm -rf xdocs/api/html -maven site -cd xdocs/api -doxygen doxygenconf -cd ../.. -cp -r xdocs/api/html target/docs/api/ -cp xdocs/docs/mod_log/module.xml target/docs/docs/mod_log -cp -r target/docs ${AXIS2C_HOME} - -cd ${AXIS2C_HOME} - -# rm -rf config.sub missing config.guess depcomp ltmain.sh -for i in `find . -name "*.la"` -do - rm $i -done - -for i in `find . -name "*.a"` -do - rm $i -done - -strip -s ./lib/* -strip -s modules/addressing/* -strip -s modules/logging/* - -strip -s ./bin/axis2_http_server -strip -s ./samples/bin/* -strip -s ./bin/tools/tcpmon - -rm -rf ./lib/pkgconfig @@ -7,7 +7,7 @@ export AXIS2C_HOME echo "AXIS2C_HOME = ${AXIS2C_HOME}" -sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes --with-apache2=/usr/local/apache2/include +sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes make -j 10 make install diff --git a/configure.ac b/configure.ac index 0987384..43d89a3 100644 --- a/configure.ac +++ b/configure.ac @@ -437,7 +437,7 @@ OPENSSLINC=$opensslinc OPENSSLLIB=$openssllib IKSEMELINC=$iksemelinc APRINC=$aprinc -VERSION_NO="6:0:6" +VERSION_NO="7:0:7" QPID_HOME=$qpidhome AC_SUBST(VERSION_NO) @@ -520,7 +520,10 @@ AC_CONFIG_FILES([Makefile \ tools/md5/src/Makefile \ ides/Makefile \ include/Makefile \ - axis2c.pc + axis2c.pc \ + dist.sh \ + bindist.sh \ + axis2c_build.sh ]) AC_OUTPUT diff --git a/dist.sh b/dist.sh deleted file mode 100755 index d497a10..0000000 --- a/dist.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -rm -rf xdocs/api/html -maven site -cd xdocs/api -doxygen doxygenconf -cd ../.. -cp -r xdocs/api/html target/docs/api/ -cp xdocs/docs/mod_log/module.xml target/docs/docs/mod_log -rm target/docs/README -rm target/docs/dependencies.html -rm target/docs/downloads.html -rm target/xdocs/mail-lists.html -cp -r target/docs axis2c-src-1.7.0 - -cd samples -make dist -tar -xf axis2c-src-1.7.0.tar.gz -mv axis2c-src-1.7.0 ../axis2c-src-1.7.0 -cd ../axis2c-src-1.7.0 -mv axis2c-src-1.7.0 samples - -for i in `find . -name "*.la"` -do - rm $i -done - -for i in `find . -name "*.a"` -do - rm $i -done - -for i in `find . -type d -name ".svn"` -do - rm -rf $i -done |