Retouched new structure.

diff --git a/base/Doxyfile b/base/Doxyfile
index caed41fe647bfe32937d5be8a5415a5786fb653b..af316504a451c0373e5fe14873b42df83a3c8984 100644 (file)
--- 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 <luca@lugmen.org.ar>                    |
-# +--------------------------------------------------------------------+
-#
-# $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 4bfa3e552d30b0eee7c5afbd6061ec140b0e616b..0da066a61aa09e2c964a6c67ae47b6abca4495e6 100644 (file)
--- 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 '<?php' | \
-                       egrep -v '^\s*//' \
-               ); \
-               echo -n '?>' \
-       ) > $(MODULE_FILE)
+       @find src -name '*.bak' | xargs rm -vf

diff --git a/base/README b/base/README
index 13737e007b38dfb3f8817b895b50f4f72af52df8..71b0cfafb55f4c838c601331c5417604348ec4b6 100644 (file)
--- 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 bdf7124415988fbb2f24abcbadb7d645b884d01e..3581fdef536902de61651a31166648b87d77fc42 100644 (file)
--- a/base/bife.xmi
+++ b/base/base.xmi
@@ -5,14 +5,14 @@
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.1</XMI.exporterVersion>
   </XMI.documentation>
-  <XMI.model xmi.name="bife" href="/home/luca/website/www/test/bife/base/bife.xmi" />
+  <XMI.model xmi.name="base" href="/home/luca/website/www/test/bife/base/base.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <docsettings viewid="2" documentation="Parse XML data getting widgets." uniqueid="159" />
   <umlobjects>
-   <UML:Class stereotype="" package="BIFE" xmi.id="5" abstract="1" documentation="Base container widget class." name="Container" static="0" scope="200" />
-   <UML:Class stereotype="" package="BIFE" xmi.id="61" abstract="1" documentation="Fallback widget to use when no specific widget is implemented." name="Fallback" static="0" scope="200" />
+   <UML:Class stereotype="" package="BIFE" xmi.id="5" abstract="1" documentation="x2c:extern" name="Container" static="0" scope="200" />
+   <UML:Class stereotype="" package="BIFE" xmi.id="61" abstract="1" documentation="x2c:extern" name="Fallback" static="0" scope="200" />
    <UML:Class stereotype="" package="BIFE" xmi.id="7" abstract="0" documentation="This is a generic and simple (but very usefull) BIFE_Fallback implementation. Translate widgets using a template with it's name, prepended with 'bife_'. If not template is found, it copy the XML to the output." name="Translate" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="12" type="string" abstract="0" documentation="Renders the widget." name="render" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;HTML_Template_HIT" abstract="0" documentation="Template to use to render the widget." name="template" static="0" scope="200" />

diff --git a/base/examples/index.php b/base/examples/index.php
index c38ac9c098d524c35dd3903f19b0bb0e13ff0098..898334990513cce894c051b5c28fc0e4020ad2e8 100644 (file)
--- 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 3cfff25319bb1ddc49e8517646b9af171d96b3ee..03ff5effba9f6a98e371cd17458722da1c1ce6bd 100644 (file)
--- a/base/package.xml
+++ b/base/package.xml
@@ -24,16 +24,23 @@
         <provides type="class" name="BIFE_Translate"/>
         <filelist>
             <!-- PHP -->
-            <file role="php">BIFE/Link.php</file>
-            <file role="php">BIFE/Translate.php</file>
+            <dir name="/" baseinstalldir="BIFE" role="php">
+                <file install-as="Link.php" name="src/BIFE/Link.php"/>
+                <file install-as="Translate.php" name="src/BIFE/Translate.php"/>
+            </dir>
             <!-- DOC -->
-            <file role="doc">README</file>
-            <file role="doc">ROADMAP</file>
-            <file role="doc">examples/index.php</file>
-            <file role="doc">examples/index.xbf</file>
-            <file role="doc">examples/templates/bife_page.tpl.html</file>
-            <file role="doc">examples/templates/bife_title.tpl.html</file>
-            <file role="doc">examples/templates/bife_link.tpl.html</file>
+            <dir name="/" role="doc">
+                <file>README</file>
+                <file>ROADMAP</file>
+            </dir>
+            <!-- EXAMPLES -->
+            <dir name="examples" role="doc">
+                <file>index.php</file>
+                <file>index.xbf</file>
+                <file>templates/bife_page.tpl.html</file>
+                <file>templates/bife_title.tpl.html</file>
+                <file>templates/bife_link.tpl.html</file>
+            </dir>
         </filelist>
     </release>
     <deps>

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 7540819e770bd117dcf559aee19b494d8af5f7a1..6c6a5d34e95270cfbb527480da79548473358edc 100644 (file)
--- a/base/xmi2code.config
+++ b/base/xmi2code.config
@@ -34,7 +34,7 @@
   <option key="config-file" value="xmi2code.config"/>
   <option key="config-file-set" value="false"/>
   <option key="handler" value="umbrello"/>
-  <option key="generator-path" value="."/>
+  <option key="generator-path" value="src"/>
   <option key="use-package-as-dir" value="true"/>
   <option key="indent" value="    "/>
   <option key="files-case" value="preserve"/>