diff --git a/build/deb/README b/build/deb/README index 76be8f1596c..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783. - Call for a mentor on ML debian-mentors to upload packages - Once package is uploaded, following URL are available: -http://packages.qa.debian.org/package +http://packages.qa.debian.org/package.html http://bugs.debian.org/package diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 2b5e9ba380b..32db31561bc 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.124 2011/07/31 13:17:03 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.125 2011/07/31 15:31:32 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.124 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.125 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -274,6 +274,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; diff --git a/build/rpm/README b/build/rpm/README index 11439542df7..f65f12cbb35 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -22,6 +22,8 @@ with format RPM (for Redhat, Mandriva, ...). # On Mageia (after su - root) # urpmi dolibarr-...rpm To install package and dependencies # urpme dolibarr To remove package +# +# More on rpm on page http://www.trustonme.net/didactels/273.html To submit a package to Fedora: diff --git a/htdocs/install/mysql/Makefile b/htdocs/install/mysql/Makefile deleted file mode 100644 index 4bdfcc2dc2f..00000000000 --- a/htdocs/install/mysql/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (C) 2001-2003 Rodolphe Quiedeville -# Copyright (C) 2005 Laurent Destailleur -# -# This program 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. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# $Id$ -# $Source$ -# -# ********************************************************************** -# Ce makefile permet d'initialiser la base de donnée de dolibarr en manuel. -# Il n'est utile que si vous n'utilisez pas l'installateur automatique -# accessible à http://localhost/dolibarr/install/ -# -# Pour une installation manuelle, créer la base dolibarr puis faire: -# make mysql.sql -# mysql dolibarr < mysql.sql -# -# Le script mysql.sql cotient tous le ordres sql pour créer la base -# Tables + Index et Clés + Données -# -# ********************************************************************** - -SQL=mysql -BASE=dolibarr -OPTIONS= - -FIND=find -#FIND="c:/Program files/cygwin/bin/find" - - -TABLES=$(shell $(FIND) tables/ -name "*sql") - - -all: - cat README - -load: - $(SQL) $(OPTIONS) $(BASE) < data/data.sql - -dev: - cd data \ - && make dev BASE=$(BASE) OPTIONS=$(OPTIONS) - - - -dropall: dropdb droppriv - -droppriv: - $(SQL) $(OPTIONS) $(SQL) -e "delete from db where Db='$(BASE)' ; " - -dropdb: - $(SQL) $(OPTIONS) $(SQL) -f -e "drop database if exists $(BASE) ; " - - - -create: createdb createpriv - -createdb: - $(SQL) $(OPTIONS) mysql -e "create database $(BASE) ; " - -createpriv: - $(SQL) $(OPTIONS) mysql -e "insert into db (Host, Db) values ('localhost', '$(BASE)') ; " - $(SQL) $(OPTIONS) mysql -e "update db set select_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set insert_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set update_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set delete_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set create_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set drop_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set grant_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set references_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set index_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "update db set alter_priv = 'Y' where db='$(BASE)' ; " - $(SQL) $(OPTIONS) mysql -e "flush privileges ; " - - - -mysql.sql: $(TABLES) data/data.sql Makefile - echo "-- Fichier généré par make mysql.sql" > mysql.sql - echo "-- Contient les ordres de creation des tables + les clés + les données" >> mysql.sql - echo "-- ;" >> mysql.sql - $(FIND) tables/ -name "*sql" | grep -v "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql - $(FIND) tables/ -name "*sql" | grep "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql - cat data/data.sql | grep -v ^-- >> mysql.sql