From 8957f0aca6026435759563f68d7a9132fa9d6dbc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 20 Dec 2010 10:53:47 +0000 Subject: [PATCH] Prepare 3.0 branch --- build/makepack-dolibarr.pl | 3 +++ build/tgz/tar_exclude.txt | 1 + build/zip/zip_exclude.txt | 1 + 3 files changed, 5 insertions(+) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 8fa2e6bd7c6..222045c76a8 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -238,12 +238,15 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.project`; $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`; $ret=`rm -fr $BUILDROOT/$PROJECT/index.php`; + $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; + $ret=`rm -fr $BUILDROOT/$PROJECT/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`; } diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt index ffb5ac62cce..e1008ed80f2 100644 --- a/build/tgz/tar_exclude.txt +++ b/build/tgz/tar_exclude.txt @@ -30,6 +30,7 @@ htdocs/conf/conf.php.mysql htdocs/conf/conf.php.old htdocs/conf/conf.php.postgres htdocs/avoir +htdocs/custom htdocs/document htdocs/documents htdocs/includes/jpgraph2 diff --git a/build/zip/zip_exclude.txt b/build/zip/zip_exclude.txt index 61c0f64cb78..e65dd403460 100644 --- a/build/zip/zip_exclude.txt +++ b/build/zip/zip_exclude.txt @@ -27,6 +27,7 @@ */htdocs/conf/conf.php.old */htdocs/conf/conf.php.postgres */htdocs/avoir/* +*/htdocs/custom/* */htdocs/document/* */htdocs/documents/* */htdocs/lolix/*