Skip to content

Commit

Permalink
- [DEV-464] server code cleanup
Browse files Browse the repository at this point in the history
	[svn merge svn://svn.zabbix.com/branches/1.8 -c 13619]
  • Loading branch information
Aleksandrs Saveljevs committed Jul 27, 2010
1 parent a47ed38 commit c0c3ba5
Show file tree
Hide file tree
Showing 14 changed files with 4 additions and 1,402 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ create/data/images/UPS_small.png -text svneol=unset#unset
create/data/images/Workstation.png -text svneol=unset#unset
create/data/images/Workstation_small.png -text svneol=unset#unset
create/schema/gen_php.php -text
docs/README -text
frontends/php/api/.htaccess -text
frontends/php/api/classes/class.apiexception.php -text
frontends/php/api/classes/class.caction.php -text
Expand Down Expand Up @@ -411,7 +410,6 @@ misc/init.d/fedora/core5/zabbix_agentd -text
misc/init.d/freebsd/zabbix_agentd -text
misc/init.d/freebsd/zabbix_server -text
misc/init.d/tru64/zabbix_server -text
/splint -text
src/libs/zbxalgo/Makefile.am -text
src/libs/zbxalgo/algodefs.c -text
src/libs/zbxalgo/binaryheap.c -text
Expand Down
5 changes: 0 additions & 5 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@ Core developers

* Alexei Vladishev <[email protected]>
Initial idea.

Contributors
===============

Please, see Zabbix Manual for a complete list of contributors.
10 changes: 0 additions & 10 deletions FAQ

This file was deleted.

13 changes: 2 additions & 11 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,26 @@ SUBDIRS = \
EXTRA_DIST = \
bin \
build \
docs \
FAQ \
frontends \
include \
CREDITS

## "dist-hook" run after the distribution directory is filled, but before the actual tar (or shar) file is created.
dist-hook:
# Update revision in common.h
@zabbix_revision=`svn info|grep "Last Changed Rev"|awk '{print $$4;}'`; \
cat $(top_distdir)/include/common.h|sed "s/{ZABBIX_REVISION}/$$zabbix_revision/g" >$(top_distdir)/include/common.h.new
mv $(top_distdir)/include/common.h.new $(top_distdir)/include/common.h

rm -rf `find $(top_distdir) -name ".svn"`
rm -f $(top_distdir)/include/config.h
rm -f $(top_distdir)/frontends/php/conf/zabbix.conf.php
rm -f $(top_distdir)/do
rm -f $(top_distdir)/go
rm -f $(top_distdir)/splint
rm -rf $(top_distdir)/test
rm -f $(top_distdir)/TODO
##TODO mkdir $(top_distdir)/docs
##TODO cp ?????/ZABBIX Manual v1.4.pdf $(top_distdir)/docs/

dbschema:
create/schema/gen.pl mysql > create/schema/mysql.sql
create/schema/gen.pl postgresql > create/schema/postgresql.sql
create/schema/gen.pl sqlite > create/schema/sqlite.sql
create/schema/gen.pl oracle > create/schema/oracle.sql
create/schema/gen.pl c >src/libs/zbxdbhigh/dbschema.c
create/schema/gen.pl c > src/libs/zbxdbhigh/dbschema.c
echo -e "\n#ifdef HAVE_MYSQL\nconst char *db_schema= {\"\\" >>src/libs/zbxdbhigh/dbschema.c
create/schema/gen.pl mysql|tr -s '\t' ' '|sed -e 's/$$/\\/' >>src/libs/zbxdbhigh/dbschema.c
echo -e "\"};\n#elif HAVE_POSTGRESQL\nconst char *db_schema = {\"\\" >>src/libs/zbxdbhigh/dbschema.c
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Check http://www.zabbix.com/news.php
Please see http://www.zabbix.com/news.php.
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Please see http://www.zabbix.com/ for detailed information about Zabbix.
On-line Zabbix documentation is available at http://www.zabbix.com/documentation/1.8/.
204 changes: 0 additions & 204 deletions TODO

This file was deleted.

1 change: 0 additions & 1 deletion docs/README

This file was deleted.

1 change: 0 additions & 1 deletion splint

This file was deleted.

2 changes: 0 additions & 2 deletions src/alphacode/poller/go

This file was deleted.

Loading

0 comments on commit c0c3ba5

Please sign in to comment.