Rewritten

diff --git a/.gitignore b/.gitignore
index 21af8e90484e41a41858bb5586e22cfdba164752..e31a9639cb0d8dded489a31e86d137c497e85b83 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ db/news/*.serialized
 db/payments/*.serialized
 db/user/*.serialized
 db/user_points/*.serialized
-docs/html
 docs/warn.log

diff --git a/Doxyfile b/Doxyfile
index 985d2af2ffac69092303bd9b2a57654e14f0a26c..1c05f5d23a9a94eca468fd2b4d8c808b028ebf0a 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NUMBER         = 0.1a
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = /var/www/htdocs/ship-simu/docs/
+OUTPUT_DIRECTORY       = /var/www/htdocs/ship-simu/trunk/docs/
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -492,7 +492,7 @@ WARN_FORMAT            = "$file:$line: $text "
 # and error messages should be written. If left blank the output is written 
 # to stderr.
 
-WARN_LOGFILE           = /var/www/htdocs/ship-simu/docs/warn.log
+WARN_LOGFILE           = /var/www/htdocs/ship-simu/trunk/docs/warn.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -503,7 +503,7 @@ WARN_LOGFILE           = /var/www/htdocs/ship-simu/docs/warn.log
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /var/www/htdocs/ship-simu/
+INPUT                  = /var/www/htdocs/ship-simu/trunk/index.php /var/www/htdocs/ship-simu/trunk/inc/ /var/www/htdocs/ship-simu/trunk/application/ship-simu/
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 

diff --git a/package.sh b/package.sh
index aeb7db305a54d5f37641d73ebac6b1adb9993e1c..639837ebffabf13816228dfa7b43a34b1001935b 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -1,16 +1,14 @@
 #!/bin/sh
 
+NAME=shipsimu_dev_`date +%Y%m%d_%H%M%S`.zip
+
 sh ./clear-cache.sh
 
 echo -n "$0: Packaging... "
-zip -9 shipsimu_dev.zip docs/* Doxyfile *.php *.sh > /dev/null 2>&1
+zip -9 $NAME docs/* Doxyfile *.php *.sh > /dev/null 2>&1
 echo -n "."
-zip -9r shipsimu_dev.zip application/ db/ devel/ Doxyfile inc/ templates/ tests/ > /dev/null 2>&1
+zip -9r $NAME application/ db/ devel/ Doxyfile inc/ templates/ tests/ > /dev/null 2>&1
 echo -n "."
-zip -d shipsimu_dev.zip docs/warn.log db/*/*.serialized > /dev/null 2>&1
+zip -d $NAME docs/warn.log db/*/*.serialized > /dev/null 2>&1
 echo ". done"
-
-echo "$0: Renaming..."
-mv shipsimu_dev.zip shipsimu_dev_`date +%Y%m%d_%H%M%S`.zip
-
 echo "$0: All done."