Author: dumindu
Date: Fri Mar 7 00:39:58 2008
New Revision: 14574
Log:
Fixed the makedeb.sh according to the build
Modified:
trunk/solutions/identity/modules/mod-cspace/Makefile.am
trunk/solutions/identity/modules/mod-cspace/build.sh
trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/makedeb.sh
trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/postinst
trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/rules
trunk/solutions/identity/modules/mod-cspace/src/Makefile.am
trunk/solutions/identity/modules/mod-cspace/src/mod_cspace.c
Modified: trunk/solutions/identity/modules/mod-cspace/Makefile.am
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/Makefile.am (original)
+++ trunk/solutions/identity/modules/mod-cspace/Makefile.am Fri Mar 7
00:39:58 2008
@@ -1 +1,18 @@
SUBDIRS = src test
+
+EXTRA_DIST = INSTALL ChangeLog LICENSE build build.sh AUTHORS NOTICE
+
+dist-hook:
+ rm -rf `find $(distdir)/ -type d -name linux`
+ rm -rf `find $(distdir)/ -type d -name nmake`
+ rm -rf `find $(distdir)/ -type d -name iis`
+ rm -rf `find $(distdir)/ -type d -name .svn`
+ rm -rf `find $(distdir)/ -type f -name *.la`
+ rm -rf `find $(distdir)/ -type f -name *.o`
+ rm -rf `find $(distdir)/ -type f -name *.lo`
+ rm -rf `find $(distdir)/ -type f -name *.loT`
+ rm -rf `find $(distdir)/ -type d -name .deps`
+ rm -rf `find $(distdir)/ -type d -name .libs`
+ rm -rf `find $(distdir)/ -type f -name Makefile`
+ rm -rf `find $(distdir)/ -type d -name autom4te.cache`
+
Modified: trunk/solutions/identity/modules/mod-cspace/build.sh
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/build.sh (original)
+++ trunk/solutions/identity/modules/mod-cspace/build.sh Fri Mar 7
00:39:58 2008
@@ -1,6 +1,6 @@
#!/bin/sh
sh autogen.sh
-#./configure
-./configure --with-apxs=/home/dumindu/software/httpd-2.2.8/deploy/bin/apxs
--with-apr-config=/home/dumindu/software/httpd-2.2.8/deploy/bin/apr-1-config
+./configure
+#./configure --with-apxs=/home/dumindu/software/httpd-2.2.8/deploy/bin/apxs
--with-apr-config=/home/dumindu/software/httpd-2.2.8/deploy/bin/apr-1-config
make
Modified: trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/makedeb.sh
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/makedeb.sh
(original)
+++ trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/makedeb.sh
Fri Mar 7 00:39:58 2008
@@ -7,7 +7,7 @@
tar xf mod-cspace-src-${VER}.tar.gz
mv mod-cspace-src-${VER} mod-cspace-${VER}
cd mod-cspace-${VER}/
-dh_make --createorig -s
+yes | dh_make --createorig -s
cp ../build/linux/DEB/control debian/
cp ../build/linux/DEB/postinst debian/
cp ../build/linux/DEB/rules debian/
Modified: trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/postinst
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/postinst
(original)
+++ trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/postinst
Fri Mar 7 00:39:58 2008
@@ -20,8 +20,8 @@
case "$1" in
configure)
- mv /usr/local/mod-cspace/lib/libmod_cspace.so.0.0.0
/usr/lib/apache2/modules/mod_cspace.so
- echo "LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so" >
/etc/apache2/mods-available/mod_cspace.load
+ #mv /usr/lib/apache2/module/mod_cspace.so
/usr/lib/apache2/modules/mod_cspace.so
+ echo "LoadModule cspace_module /usr/lib/apache2/modules/mod_cspace.so" >
/etc/apache2/mods-available/mod_cspace.load
rm -rf /usr/local/mod-cspace
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/rules
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/rules
(original)
+++ trunk/solutions/identity/modules/mod-cspace/build/linux/DEB/rules Fri Mar
7 00:39:58 2008
@@ -58,11 +58,12 @@
# Add here commands to install the package into debian/mod-cspace.
$(MAKE) DESTDIR=$(CURDIR)/debian/mod-cspace install
-# apxs2 -i -n "cspace" mod_cspace.so
# Build architecture-independent files here.
binary-indep: build install
+ mkdir -p $(CURDIR)/debian/mod-cspace/usr/lib/apache2/modules/
+ cp /usr/lib/apache2/modules/mod_cspace.so
$(CURDIR)/debian/mod-cspace/usr/lib/apache2/modules/
# We have nothing to do by default.
# Build architecture-dependent files here.
Modified: trunk/solutions/identity/modules/mod-cspace/src/Makefile.am
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/src/Makefile.am (original)
+++ trunk/solutions/identity/modules/mod-cspace/src/Makefile.am Fri Mar 7
00:39:58 2008
@@ -11,24 +11,10 @@
mod_cspace.c
install-exec-local:
- ${APXS} -i -a -n 'cspace' mod_cspace.la
+ ${APXS} -i -n 'cspace' mod_cspace.la
mod_cspace.la: libmod_cspace.la
${APXS} -c -o $@ $< ${CFLAGS}
-EXTRA_DIST = INSTALL ChangeLog LICENSE build build.sh AUTHORS NOTICE *.c *.h
-
-dist-hook:
- rm -rf `find $(distdir)/ -type d -name linux`
- rm -rf `find $(distdir)/ -type d -name nmake`
- rm -rf `find $(distdir)/ -type d -name iis`
- rm -rf `find $(distdir)/ -type d -name .svn`
- rm -rf `find $(distdir)/ -type f -name *.la`
- rm -rf `find $(distdir)/ -type f -name *.o`
- rm -rf `find $(distdir)/ -type f -name *.lo`
- rm -rf `find $(distdir)/ -type f -name *.loT`
- rm -rf `find $(distdir)/ -type d -name .deps`
- rm -rf `find $(distdir)/ -type d -name .libs`
- rm -rf `find $(distdir)/ -type f -name Makefile`
- rm -rf `find $(distdir)/ -type d -name autom4te.cache`
+EXTRA_DIST = *.h
Modified: trunk/solutions/identity/modules/mod-cspace/src/mod_cspace.c
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/src/mod_cspace.c
(original)
+++ trunk/solutions/identity/modules/mod-cspace/src/mod_cspace.c Fri Mar
7 00:39:58 2008
@@ -455,7 +455,7 @@
cspace_log_error(buf, APLOG_DEBUG, r->server);
#ifdef CSPACE_DEBUG
- printf("TOKEN: %s\n", buf);
+ fprintf(stderr, "TOKEN: %s\n", buf);
#endif
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
