From bc53b25db3b957ddfbd9b4254c34d34057802536 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 18 Sep 2011 22:08:52 +0000 Subject: [PATCH] Fix: Package works with git --- build/.gitignore | 8 ++++++++ build/makepack-dolibarr.pl | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100755 build/.gitignore diff --git a/build/.gitignore b/build/.gitignore new file mode 100755 index 00000000000..a858a0d18df --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,8 @@ +/dolibarr_*.deb +/dolibarr_*.dsc +/dolibarr_*.changes +/dolibarr_*.gz +/dolibarr-*.tgz +/dolibarr-*.rpm +/dolibarr-*.zip +/dolibarr-*.tgz \ No newline at end of file diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index b59ddf9d822..aa516d4f5fb 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -242,14 +242,17 @@ if ($nboftargetok) { } print "Clean $BUILDROOT\n"; $ret=`rm -f $BUILDROOT/$PROJECT/index.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.buildpath`; + $ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`; $ret=`rm -fr $BUILDROOT/$PROJECT/.git`; - $ret=`rm -fr $BUILDROOT/$PROJECT/.gitmodules`; + $ret=`rm -f $BUILDROOT/$PROJECT/.gitmodules`; + $ret=`rm -f $BUILDROOT/$PROJECT/.gitignore`; $ret=`rm -fr $BUILDROOT/$PROJECT/.project`; $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`; - $ret=`rm -fr $BUILDROOT/$PROJECT/pom.xml`; - $ret=`rm -fr $BUILDROOT/$PROJECT/default.properties`; + $ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`; + $ret=`rm -f $BUILDROOT/$PROJECT/default.properties`; + $ret=`rm -f $BUILDROOT/$PROJECT/git2cvs.sh`; + $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`;