diff --git a/build/linux/buildxmapp.sh b/build/linux/buildxmapp.sh
index d9058ed47b..e1d139794e 100755
--- a/build/linux/buildxmapp.sh
+++ b/build/linux/buildxmapp.sh
@@ -1,4 +1,4 @@
-tar zxvf $1
+tar zxvf $1/xampp.tar.gz
cd lampp
# rm useless files.
@@ -17,16 +17,91 @@ chmod -R 777 tmp
# rm useless settings.
rm -fr etc/proftpd.conf
rm -fr etc/webalizer.conf*
+rm -fr etc/freetds.conf
+rm -fr etc/openssl.cnf
+rm -fr etc/php.ini-pre1.7.2
+rm -fr etc/pear.conf
+rm -fr etc/pool.conf
rm -fr etc/openldap
rm -fr etc/original
rm -fr etc/httpd.conf.bak
rm -fr etc/lampp/startftp
+rm -fr etc/ssl*
+rm -fr etc/extra/httpd-dav.conf
+rm -fr etc/extra/httpd-info.conf
+rm -fr etc/extra/httpd-manual.conf
+rm -fr etc/extra/httpd-ssl.conf
+rm -fr etc/extra/httpd-manual.conf
+rm -fr etc/extra/httpd-userdir.conf
+rm -fr etc/extra/httpd-multilang-errordoc.conf
+rm -fr etc/lampp/startssl
+
+# process httpd conf
+grep -v '#' etc/httpd.conf | \
+grep -v '^$' | \
+grep -v 'mod_actions.so' | \
+grep -v 'authn_dbm' | \
+grep -v 'authn_anon' | \
+grep -v 'authn_dbd' | \
+grep -v 'authn_default' | \
+grep -v 'authz_groupfile' | \
+grep -v 'authz_dbm' | \
+grep -v 'authz_owner' | \
+grep -v 'authnz_ldap' | \
+grep -v 'authz_default' | \
+grep -v 'auth_digest_module' | \
+grep -v 'cache.so' | \
+grep -v 'mod_bucketeer' | \
+grep -v 'mod_dumpio' | \
+grep -v 'mod_echo' | \
+grep -v 'mod_case*' | \
+grep -v 'mod_ext_filter*' | \
+grep -v 'mod_include' | \
+grep -v 'mod_filter' | \
+grep -v 'mod_charset_lite' | \
+grep -v 'mod_ldap' | \
+grep -v 'mod_log_config' | \
+grep -v 'mod_logio' | \
+grep -v 'mod_cern_meta' | \
+grep -v 'mod_headers' | \
+grep -v 'mod_ident' | \
+grep -v 'mod_usertrack' | \
+grep -v 'mod_unique_id' | \
+grep -v 'mod_proxy*' | \
+grep -v 'mod_dav*' | \
+grep -v 'mod_status' | \
+grep -v 'mod_asis' | \
+grep -v 'mod_info' | \
+grep -v 'mod_suexec' | \
+grep -v 'mod_cgi*' | \
+grep -v 'mod_negotiation' | \
+grep -v 'mod_imagemap' | \
+grep -v 'mod_speling' | \
+grep -v 'mod_userdir' | \
+grep -v 'mod_apreq2' | \
+grep -v 'mod_ssl' | \
+grep -v 'multilang-errordoc' > etc/httpd.conf.lite
+mv etc/httpd.conf.lite etc/httpd.conf
+
+# process my.cnf
+grep -v '^#' etc/my.cnf|grep -v '^$' etc/my.cnf > etc/my.cnf.new
+mv etc/my.cnf.new etc/my.cnf
+
+# process php.ini
+grep -v '^;' etc/php.ini |\
+grep -v '^$' |\
+grep -v 'sqlite.so' |\
+grep -v 'radius.so' |\
+grep -v 'pgsql.so' |\
+grep -v 'ming.so' |\
+grep -v 'ncurses.so' > etc/php.ini.new
+mv etc/php.ini.new etc/php.ini
# rm useless binaries.
mv bin bin.bak
mkdir bin
cd bin.bak
-cp apachectl apxs my_print_defaults mysql mysql.server mysqld_safe mysqldump php php-config phpize httpd ../bin/
+cp htpasswd apachectl apxs my_print_defaults mysql mysql.server mysqld_safe mysqldump php php-config phpize httpd ../bin/
cd ../
rm -fr bin.bak
@@ -46,16 +121,66 @@ mv share share.bak
mkdir share
mv share.bak/english share/
mv share.bak/lampp share
+echo >share/lampp/allons
rm -fr share.bak
+rm -fr share/lampp/alladdons
+touch share/lampp/alladdons
+chmod a+rx share/lampp/alladdons
+
# process lib directory.
mv lib/php/extensions lib/phpextensions
rm -fr lib/php
mkdir lib/php
mv lib/phpextensions lib/php/extensions
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/interbase.so
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/ming.so
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/ncurses.so
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/oci8.so
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/pgsql.so
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/radius.so
+rm -fr lib/php/extensions/no-debug-non-zts-20090626/sqlite.so
rm -fr lib/perl5
rm -fr lib/proftpd
rm -fr lib/fonts
+rm -fr apr-util-1
+rm -fr apr.exp
+rm -fr aprutil.exp
+rm -fr engines
+rm -fr fips_premain.c
+rm -fr fips_premain.c.sha1
+rm -fr gettext
+rm -fr icu
+rm -fr libapr-1*
+rm -fr libapreq2*
+rm -fr libdb.so.3
+rm -fr libform.so*
+rm -fr libicule.so*
+rm -fr libiculx.*
+rm -fr libicutu.*
+rm -fr liblber*
+rm -fr libldap_r*
+rm -fr libmcrypt
+rm -fr libmenu.so*
+rm -fr libming.so*
+rm -fr libmysqlclient.*
+rm -fr libncurses.so*
+rm -fr libpanel.so*
+rm -fr libpbmscl.so*
+rm -fr libpng.so*
+rm -fr libsablot.so*
+rm -fr libsqlite*
+rm -fr libtds.so*
+rm -fr libtdssrv.so*
+rm -fr libxslt-plugins
+rm -fr libzzip-0*
+rm -fr libzzipwrap*
+rm -fr pkgconfig
+rm -fr plugin
+rm -fr stjR6sfX
+rm -fr terminfo
+rm -fr xml2Conf.sh
+rm -fr xsltConf.sh
# process var directory.
rm -fr var/perl
@@ -69,14 +194,69 @@ chmod -R 777 var/mysql
# process modules directory.
rm -fr modules/mod_perl.so
+rm -fr modules/mod_actions.so
+rm -fr modules/mod_asis.so
+rm -fr modules/mod_authn_dbm
+rm -fr modules/mod_authn_anon
+rm -fr modules/mod_authn_dbd
+rm -fr modules/mod_authn_default
+rm -fr modules/mod_authz_dbm.so
+rm -fr modules/mod_authz_default.so
+rm -fr modules/mod_authz_groupfile.so
+rm -fr modules/mod_authz_owner.so
+rm -fr modules/mod_bucketeer.so
+rm -fr modules/mod_cache*
+rm -fr modules/mod_case**
+rm -fr modules/mod_cern_meta.so
+rm -fr modules/mod_cgi*
+rm -fr modules/mod_charset_lite.so
+rm -fr modules/mod_dav*.so
+rm -fr modules/mod_dbd.so
+rm -fr modules/mod_disk_cache.so
+rm -fr modules/mod_dumpio.so
+rm -fr modules/mod_ext_filter.so
+rm -fr modules/mod_file_cache.so
+rm -fr modules/mod_filter.so
+rm -fr modules/mod_headers.so
+rm -fr modules/mod_ident.so
+rm -fr modules/mod_imagemap.so
+rm -fr modules/mod_include.so
+rm -fr modules/mod_info.so
+rm -fr modules/mod_ldap.so
+rm -fr modules/mod_log*.so
+rm -fr modules/mod_mem_cache.so
+rm -fr modules/mod_negotiation.so
+rm -fr modules/mod_proxy*
+rm -fr modules/mod_reqtimeout.so
+rm -fr modules/mod_speling.so
+rm -fr modules/mod_ssl.so
+rm -fr modules/mod_status.so
+rm -fr modules/mod_substitute.so
+rm -fr modules/mod_suexec.so
+rm -fr modules/mod_unique_id.so
+rm -fr modules/mod_userdir.so
+rm -fr modules/mod_usertrack.so
+rm -fr modules/mod_version.so
# copy customized xmapp config to etc/extra
cp ../zentao.conf etc/extra/httpd-xampp.conf
# copy the zentao code.
-mv ../../../zentaopms ./zentao
+#mv ../../../zentaopms ./zentao
# copy needed files.
cp ../Makefile .
cp ../start .
+cp ../start88 .
cp ../stop .
+cp ../../windows/xampp/index.php htdocs/
+
+# copy sqlbuddy.
+mkdir admin
+unzip $1/sqlbuddy.zip
+mv sqlbuddy admin/
+
+# make the auth file
+mkdir auth
+touch auth/users
+echo 'use htpasswd users username password to add a new user.' > auth/readme
diff --git a/build/linux/start b/build/linux/start
index 00c6ddba1e..1e21bc5cca 100644
--- a/build/linux/start
+++ b/build/linux/start
@@ -5,6 +5,18 @@ then
exit
fi
+sed -e 's/88/80/g' etc/httpd.conf > etc/httpd.conf.80
+mv etc/httpd.conf.80 etc/httpd.conf
+
+sed -e 's/88/80/g' etc/extra/httpd-vhosts.conf > etc/extra/httpd-vhosts.conf.80
+mv etc/extra/httpd-vhosts.conf.80 etc/extra/httpd-vhosts.conf
+
+sed -e 's/3308/3306/g' etc/my.cnf > etc/my.cnf.3306
+mv etc/my.cnf.3306 etc/my.cnf
+
+sed -e 's/3308/3306/g' zentao/config/my.php > zentao/config/my.php.3306
+mv zentao/config/my.php.3306 zentao/config/my.php
+
chown nobody -R var/mysql
chmod 777 tmp
./lampp start
diff --git a/build/linux/start88 b/build/linux/start88
new file mode 100755
index 0000000000..6fef121cc4
--- /dev/null
+++ b/build/linux/start88
@@ -0,0 +1,22 @@
+#!/bin/bash
+if test "`id -u`" -ne 0
+then
+ echo "You need to start XAMPP as root!"
+ exit
+fi
+
+sed -e 's/80/88/g' etc/httpd.conf > etc/httpd.conf.88
+mv etc/httpd.conf.88 etc/httpd.conf
+
+sed -e 's/80/88/g' etc/extra/httpd-vhosts.conf > etc/extra/httpd-vhosts.conf.88
+mv etc/extra/httpd-vhosts.conf.88 etc/extra/httpd-vhosts.conf
+
+sed -e 's/3306/3308/g' etc/my.cnf > etc/my.cnf.3308
+mv etc/my.cnf.3308 etc/my.cnf
+
+sed -e 's/3306/3308/g' zentao/config/my.php > zentao/config/my.php.3308
+mv zentao/config/my.php.3308 zentao/config/my.php
+
+chown nobody -R var/mysql
+chmod 777 tmp
+./lampp start
diff --git a/build/linux/zentao.conf b/build/linux/zentao.conf
index a06abd0368..ad27672db8 100644
--- a/build/linux/zentao.conf
+++ b/build/linux/zentao.conf
@@ -16,6 +16,17 @@ Alias /zentao "/opt/lampp/zentao/www/"
AllowOverride All
+# setting for admin
+Alias /sqlbuddy "/opt/lampp/admin/sqlbuddy"
+
+ #Order allow,deny
+ #Allow from 127.0.0.1
+ AuthName 'zentao admin'
+ AuthType Basic
+ AuthUserFile /opt/lampp/auth/users
+ require valid-user
+
+
# setting of gzip.
DeflateCompressionLevel 9
diff --git a/build/windows/xampp/index.php b/build/windows/xampp/index.php
index 7e12bf3b37..d6e3fef25b 100644
--- a/build/windows/xampp/index.php
+++ b/build/windows/xampp/index.php
@@ -1,4 +1,3 @@
-
@@ -12,13 +11,11 @@
该集成环境基于xampp usb lite版本精简而成,同时内置了禅道的应用程序。
xampp是非常优秀的apache, mysql, php集成运行环境,官方网站是:http://www.apachefriends.org/zh_cn/xampp.html
-
常用链接
-