From 3e2eb5e41c2a7fae1a552153e7665786d379b82b Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Sun, 6 Jul 2003 02:04:22 +0000 Subject: [PATCH] Retouched new structure. --- base/Doxyfile | 42 ++++++++----------------------- base/Makefile | 34 ++++--------------------- base/README | 2 +- base/{bife.xmi => base.xmi} | 6 ++--- base/examples/index.php | 5 ++-- base/package.xml | 25 +++++++++++------- base/{ => src}/BIFE/Container.php | 0 base/{ => src}/BIFE/Fallback.php | 0 base/{ => src}/BIFE/Link.php | 0 base/{ => src}/BIFE/Parser.php | 0 base/{ => src}/BIFE/Translate.php | 0 base/{ => src}/BIFE/Widget.php | 0 base/xmi2code.config | 2 +- 13 files changed, 39 insertions(+), 77 deletions(-) rename base/{bife.xmi => base.xmi} (95%) rename base/{ => src}/BIFE/Container.php (100%) rename base/{ => src}/BIFE/Fallback.php (100%) rename base/{ => src}/BIFE/Link.php (100%) rename base/{ => src}/BIFE/Parser.php (100%) rename base/{ => src}/BIFE/Translate.php (100%) rename base/{ => src}/BIFE/Widget.php (100%) diff --git a/base/Doxyfile b/base/Doxyfile index caed41f..af31650 100644 --- a/base/Doxyfile +++ b/base/Doxyfile @@ -1,38 +1,13 @@ -# vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4: -# +--------------------------------------------------------------------+ -# | BIFE - Buil It FastEr | -# +--------------------------------------------------------------------+ -# | This file is part of BIFE. | -# | | -# | BIFE is free software; you can redistribute it and/or modify it | -# | under the terms of the GNU General Public License as published by | -# | the Free Software Foundation; either version 2 of the License, or | -# | (at your option) any later version. | -# | | -# | BIFE is distributed in the hope that it will be useful, but | -# | WITHOUT ANY WARRANTY; without even the implied warranty of | -# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -# | General Public License for more details. | -# | | -# | You should have received a copy of the GNU General Public License | -# | along with Hooks; if not, write to the Free Software Foundation, | -# | Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | -# +--------------------------------------------------------------------+ -# | Created: Mon May 19 00:16:56 ART 2003 | -# | Authors: Leandro Lucarella | -# +--------------------------------------------------------------------+ -# -# $Id$ -# +# Doxyfile 1.3.2 -# Doxyfile 1.3-rc3 #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "BIFE - Build It FastEr" +PROJECT_NAME = "BIFE Base" PROJECT_NUMBER = 0.11 OUTPUT_DIRECTORY = api OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES @@ -51,7 +26,6 @@ INTERNAL_DOCS = YES CASE_SENSE_NAMES = YES SHORT_NAMES = NO HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES SHOW_INCLUDE_FILES = YES JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO @@ -60,7 +34,7 @@ INHERIT_DOCS = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 +TAB_SIZE = 4 GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES @@ -83,7 +57,7 @@ WARN_LOGFILE = doxygen.warn #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = +INPUT = src FILE_PATTERNS = *.php RECURSIVE = YES EXCLUDE = @@ -103,6 +77,7 @@ INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -143,6 +118,7 @@ LATEX_HEADER = PDF_HYPERLINKS = YES USE_PDFLATEX = NO LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -163,6 +139,7 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO +XML_OUTPUT = xml XML_SCHEMA = XML_DTD = #--------------------------------------------------------------------------- @@ -204,15 +181,18 @@ HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = YES +UML_LOOK = YES TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES +CALL_GRAPH = YES GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 0 GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- diff --git a/base/Makefile b/base/Makefile index 4bfa3e5..0da066a 100644 --- a/base/Makefile +++ b/base/Makefile @@ -25,41 +25,17 @@ # $Id$ # -VERSION=0.11 -MODULE_FILE=BIFE.php -MODULE_NAME=Core -PHP_FILES=$(filter-out $(MODULE_FILE),$(subst ./,,$(shell find -name '*.php'))) +MODULE=base + +PHP_FILES=$(subst ./,,$(shell find src -name '*.php')) EXAMPLE_FILES=$(subst ./,,$(shell find examples -regex '.*\.svn.*')) DOC_FILES=README ROADMAP -X2C_TEMPLATE=xmi2code.tpl.php package: package.xml $(PHP_FILES) $(EXAMPLE_FILES) $(DOC_FILES) pear package -code: bife.xmi xmi2code.config +code: $(MODULE).xmi xmi2code.config @xmi2code code-clean: - @find -name '*.bak' | xargs rm -vf - -$(MODULE_FILE): code $(PHP_FILES) $(X2C_TEMPLATE) - @( \ - ( \ - cat $(X2C_TEMPLATE) | \ - grep -v '@@date' | \ - grep -v '$$Id' | \ - egrep -v '^//$$' \ - ); \ - echo '//'; \ - echo -n '// BIFE $(MODULE_NAME) (version $(VERSION)) - '; \ - date; \ - echo '//'; \ - ( \ - cat $(PHP_FILES) | \ - grep -v require_once | \ - grep -v '?>' | \ - grep -v '' \ - ) > $(MODULE_FILE) + @find src -name '*.bak' | xargs rm -vf diff --git a/base/README b/base/README index 13737e0..71b0cfa 100644 --- a/base/README +++ b/base/README @@ -3,4 +3,4 @@ $Id$ This is a basic implementation of BIFE to make a simple website or to use it to make more complex widgets. -There's a tentative roadmap in ROADMAP. +There's a tentative ROADMAP. diff --git a/base/bife.xmi b/base/base.xmi similarity index 95% rename from base/bife.xmi rename to base/base.xmi index bdf7124..3581fde 100644 --- a/base/bife.xmi +++ b/base/base.xmi @@ -5,14 +5,14 @@ umbrello uml modeller http://uml.sf.net 1.1 - + - - + + diff --git a/base/examples/index.php b/base/examples/index.php index c38ac9c..8983349 100644 --- a/base/examples/index.php +++ b/base/examples/index.php @@ -26,9 +26,8 @@ // $Id$ // -$tmp = ini_get('include_path'); -ini_set('include_path', "..:$tmp"); -unset($tmp); +ini_set('include_path', '../src:../../hit/src:../../bife/src:', + ini_get('include_path')); umask('002'); require_once 'HTML/Template/HIT.php'; diff --git a/base/package.xml b/base/package.xml index 3cfff25..03ff5ef 100644 --- a/base/package.xml +++ b/base/package.xml @@ -24,16 +24,23 @@ - BIFE/Link.php - BIFE/Translate.php + + + + - README - ROADMAP - examples/index.php - examples/index.xbf - examples/templates/bife_page.tpl.html - examples/templates/bife_title.tpl.html - examples/templates/bife_link.tpl.html + + README + ROADMAP + + + + index.php + index.xbf + templates/bife_page.tpl.html + templates/bife_title.tpl.html + templates/bife_link.tpl.html + diff --git a/base/BIFE/Container.php b/base/src/BIFE/Container.php similarity index 100% rename from base/BIFE/Container.php rename to base/src/BIFE/Container.php diff --git a/base/BIFE/Fallback.php b/base/src/BIFE/Fallback.php similarity index 100% rename from base/BIFE/Fallback.php rename to base/src/BIFE/Fallback.php diff --git a/base/BIFE/Link.php b/base/src/BIFE/Link.php similarity index 100% rename from base/BIFE/Link.php rename to base/src/BIFE/Link.php diff --git a/base/BIFE/Parser.php b/base/src/BIFE/Parser.php similarity index 100% rename from base/BIFE/Parser.php rename to base/src/BIFE/Parser.php diff --git a/base/BIFE/Translate.php b/base/src/BIFE/Translate.php similarity index 100% rename from base/BIFE/Translate.php rename to base/src/BIFE/Translate.php diff --git a/base/BIFE/Widget.php b/base/src/BIFE/Widget.php similarity index 100% rename from base/BIFE/Widget.php rename to base/src/BIFE/Widget.php diff --git a/base/xmi2code.config b/base/xmi2code.config index 7540819..6c6a5d3 100644 --- a/base/xmi2code.config +++ b/base/xmi2code.config @@ -34,7 +34,7 @@