You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2006/09/28 13:57:03 UTC
svn commit: r450817 - in /webservices/axis2/trunk/c: Makefile.am
axiom/build.sh axiom/configure.ac bindist.sh configure.ac
Author: pini
Date: Thu Sep 28 04:57:03 2006
New Revision: 450817
URL: http://svn.apache.org/viewvc?view=rev&rev=450817
Log:
Changes to get 'make bindist' working.
Modified:
webservices/axis2/trunk/c/Makefile.am
webservices/axis2/trunk/c/axiom/build.sh
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/bindist.sh
webservices/axis2/trunk/c/configure.ac
Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=450817&r1=450816&r2=450817
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Thu Sep 28 04:57:03 2006
@@ -9,6 +9,7 @@
logs_DATA=
docs_DATA=docs/*
EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE samples/server/axis2.log samples build axis2c_build.sh docs guththila tools
+
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
rm -rf `find $(distdir)/ -type f -name *.la`
@@ -18,13 +19,13 @@
rm -rf `find $(distdir)/ -type d -name .deps`
rm -rf `find $(distdir)/ -type d -name .libs`
rm -rf `find $(distdir)/ -type f -name Makefile`
-# sh dist.sh
-# tar -chf - axis2c-src-${PACKAGE_VERSION} | gzip -c > axis2c-src-${PACKAGE_VERSION}.tar.gz
-#bindist: $(bin_PROGRAMS)
-# rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
-# sh bindist.sh
-# mkdir axis2c-bin-${PACKAGE_VERSION}-linux
-# cp -r ${AXIS2C_HOME}/* axis2c-bin-${PACKAGE_VERSION}-linux
-# tar -cf - axis2c-bin-${PACKAGE_VERSION}-linux | gzip -c > axis2c-bin-${PACKAGE_VERSION}-linux.tar.gz
-# rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
+bindist: $(bin_PROGRAMS)
+ rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
+ sh bindist.sh
+ mkdir axis2c-bin-${PACKAGE_VERSION}-linux
+ cp -r ${AXIS2C_HOME}/* axis2c-bin-${PACKAGE_VERSION}-linux
+ tar -cf - axis2c-bin-${PACKAGE_VERSION}-linux | gzip -c > axis2c-bin-${PACKAGE_VERSION}-linux.tar.gz
+ rm -rf axis2c-bin-${PACKAGE_VERSION}-linux
+
+
Modified: webservices/axis2/trunk/c/axiom/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/build.sh?view=diff&rev=450817&r1=450816&r2=450817
==============================================================================
--- webservices/axis2/trunk/c/axiom/build.sh (original)
+++ webservices/axis2/trunk/c/axiom/build.sh Thu Sep 28 04:57:03 2006
@@ -1,7 +1,7 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2_util=${AXIS2C_HOME}/include --enable-tests=no
+./configure --prefix=${AXIS2C_HOME} --enable-static=no --enable-tests=no
make
make install
Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?view=diff&rev=450817&r1=450816&r2=450817
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Thu Sep 28 04:57:03 2006
@@ -107,9 +107,6 @@
PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
-UTILINC=$axis2_utilinc
-
-AC_SUBST(UTILINC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(PARSER_DIR)
Modified: webservices/axis2/trunk/c/bindist.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/bindist.sh?view=diff&rev=450817&r1=450816&r2=450817
==============================================================================
--- webservices/axis2/trunk/c/bindist.sh (original)
+++ webservices/axis2/trunk/c/bindist.sh Thu Sep 28 04:57:03 2006
@@ -1,24 +1,10 @@
#!/bin/bash
-cd util
-sh build.sh
-cd ../axiom
-sh build.sh
-cd ../xml_schema
-sh build.sh
-cd ../woden
-sh build.sh
-
-cd ..
-
-#./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-trace=yes --with-apache2=/usr/local/apache2/include --with-apr=/usr/include/apr-0 --enable-diclient=no --enable-static=no --enable-openssl=no --with-axis2_util=${AXIS2C}/util/include --with-axiom=${AXIS2C}/axiom/include
-
./autogen.sh
AXIS2C_HOME=`pwd`/deploy
-AXIS2C=`pwd`
-export AXIS2C_HOME AXIS2C
+export AXIS2C_HOME
-./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-trace=yes --enable-diclient=no --enable-static=no --enable-openssl=no --with-axis2_util=${AXIS2C_HOME}/include --with-axiom=${AXIS2C_HOME}/include
+./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-trace=yes --enable-diclient=no --enable-static=no --enable-openssl=no
make
make install
@@ -36,9 +22,6 @@
mv axis2c-sample-src-0.93 samples
rm -rf ${AXIS2C_HOME}/samples
mv samples ${AXIS2C_HOME}
-
-cd ../rampart
-sh build.sh
cd ..
rm -rf xdocs/api/html
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=450817&r1=450816&r2=450817
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Sep 28 04:57:03 2006
@@ -260,62 +260,12 @@
DICLIENT_DIR="diclient"
)
-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.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axiom include dir in the path
- if test -d $withval; then
- 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"
- else
- AC_MSG_ERROR(could not find axiom. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-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.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- 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"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
APACHE2INC=$apache2inc
-AXIOMINC=$axiominc
-UTILINC=$axis2_utilinc
APRINC=$aprinc
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
-AC_SUBST(AXIOMINC)
-AC_SUBST(UTILINC)
AC_SUBST(DICLIENT_DIR)
AC_SUBST(TESTDIR)
AC_SUBST(SAMPLES)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org