Fix: Avoid errors into rpm packages
This commit is contained in:
Laurent Destailleur
parent
6187ab8c20
commit
5bb721b21c
@ -14,3 +14,6 @@ version-phpsane.txt
|
||||
makepack-phpsane.conf
|
||||
html
|
||||
*.deb
|
||||
*.dsc
|
||||
*.tar.gz
|
||||
*.changes
|
||||
|
||||
@ -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
|
||||
|
||||
@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
|
||||
* New upstream release.
|
||||
closes: bug#634783
|
||||
|
||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 18 Jul 2011 12:00:00 +0100
|
||||
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100
|
||||
|
||||
# More information into /usr/share/dolibarr/ChangeLog file.
|
||||
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.
|
||||
48
build/deb/control
Normal file
48
build/deb/control
Normal file
@ -0,0 +1,48 @@
|
||||
Package: dolibarr
|
||||
Version: __VERSION__
|
||||
Architecture: all
|
||||
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
Installed-Size: 61200
|
||||
Depends: debconf, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
|
||||
Section: web
|
||||
Priority: optional
|
||||
Recommends: firefox
|
||||
Homepage: http://www.dolibarr.org
|
||||
Description: Easy to use web based ERP & CRM software
|
||||
Dolibarr ERP & CRM is an easy to use open source/free software for small
|
||||
and medium companies, foundations or freelances. It includes different
|
||||
features for Enterprise Resource Planning (ERP) and Customer Relationship
|
||||
Management (CRM) but also for different other activities.
|
||||
It's a web software you can install as a standalone program or on any web
|
||||
hosting provider to use it from anywhere with any web browser.
|
||||
Dolibarr was designed to provide only features you need and be easy to use.
|
||||
.
|
||||
Only features you need are visible, depending on which module were activated.
|
||||
Most common used modules are:
|
||||
.
|
||||
Customers, Suppliers or Prospects directory
|
||||
Contacts directory
|
||||
Orders management
|
||||
Commercial proposals management
|
||||
Invoices management
|
||||
Products and services catalog
|
||||
Stock management
|
||||
Foundations members management
|
||||
Bank accounts management
|
||||
Point of Sale
|
||||
Payments management
|
||||
Commercial actions management
|
||||
Contracts management
|
||||
Standing orders management
|
||||
Shipping management
|
||||
Donations management
|
||||
Bookmarks management
|
||||
Mass Emailings
|
||||
Reports
|
||||
Data export and import tools
|
||||
LDAP connectivity
|
||||
PDF exports
|
||||
And a lot of more modules...
|
||||
.
|
||||
You can also add third parties external modules or develop yours.
|
||||
|
||||
@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
|
||||
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
|
||||
# Command to open an URL
|
||||
# For Fedora: xdg-open
|
||||
# For Debian/Ubuntu: xdg-open or x-www-browser
|
||||
# For Debian/Ubuntu: x-www-browser
|
||||
# (exo-open for xfde, gnome-open for gnome, ...)
|
||||
Exec=xdg-open http://localhost/dolibarr
|
||||
Exec=x-www-browser http://localhost/dolibarr
|
||||
Icon=dolibarr
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
||||
@ -4,19 +4,19 @@
|
||||
// This file must be present into htdocs/install directory
|
||||
// during install process to be used.
|
||||
//
|
||||
// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $
|
||||
// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
|
||||
//
|
||||
|
||||
$force_install_noedit=1;
|
||||
$force_install_noedit=2;
|
||||
$force_install_message='KeepDefaultValuesDeb';
|
||||
#$force_install_main_data_root='/usr/share/dolibarr/documents';
|
||||
$force_install_main_data_root='/var/lib/dolibarr/documents';
|
||||
$force_install_type='mysqli';
|
||||
$force_install_dbserver='localhost';
|
||||
$force_install_port='3306';
|
||||
$force_install_database='dolibarr';
|
||||
$force_install_database='dolibarrdebian';
|
||||
$force_install_createdatabase='1';
|
||||
$force_install_databaselogin='dolibarrmysql';
|
||||
$force_install_databaselogin='dolibarrdebian';
|
||||
$force_install_databasepass='';
|
||||
$force_install_createuser='1';
|
||||
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
||||
|
||||
@ -24,23 +24,31 @@ db_version 2.0
|
||||
echo Run the dolibarr postinst script
|
||||
|
||||
|
||||
# Define vars
|
||||
docdir='/var/lib/dolibarr/documents'
|
||||
#docdir='/usr/share/dolibarr/documents'
|
||||
|
||||
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||
apacheconfig="/etc/dolibarr/apache.conf"
|
||||
installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
||||
installconfig="/etc/dolibarr/install.forced.php"
|
||||
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
|
||||
config="/etc/dolibarr/conf.php"
|
||||
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
|
||||
# Copy apache.conf file into target directory.
|
||||
#fileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||
#config="/etc/dolibarr/apache.conf"
|
||||
#mkdir -p /etc/dolibarr
|
||||
#cp -p $fileorig $config
|
||||
# Create document directory for uploaded data files
|
||||
mkdir -p $docdir
|
||||
chown -R www-data:www-data $docdir
|
||||
chmod -R 775 $docdir
|
||||
chmod -R g+s $docdir
|
||||
|
||||
# Edit install.forced.php to match Debian values
|
||||
fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
|
||||
config="/usr/share/dolibarr/htdocs/install/install.forced.php"
|
||||
# Copy apache.conf file into target directory
|
||||
#mkdir -p /etc/dolibarr
|
||||
#cp -p $apachefileorig $apacheconfig
|
||||
|
||||
# Copy install config file (with matching Debian) values into target directory
|
||||
superuserlogin=''
|
||||
superuserpassword=''
|
||||
if [ -f /etc/mysql/debian.cnf ] ; then
|
||||
@ -50,29 +58,24 @@ case "$1" in
|
||||
fi
|
||||
echo Mysql superuser found to use is $superuserlogin
|
||||
if [ -z "$superuserlogin" ] ; then
|
||||
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
|
||||
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
|
||||
else
|
||||
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
|
||||
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
|
||||
fi
|
||||
|
||||
# Create document directory for uploaded data files
|
||||
mkdir -p $docdir
|
||||
chown -R www-data:www-data $docdir
|
||||
chmod -R 775 $docdir
|
||||
chmod -R g+s $docdir
|
||||
chown -R root:www-data $installconfig
|
||||
chmod -R 660 $installconfig
|
||||
|
||||
# Create an empty conf.php with permission to web server
|
||||
if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
|
||||
if [ ! -f $config ]
|
||||
then
|
||||
echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
touch /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
echo Create empty file $config
|
||||
touch $config
|
||||
chown -R root:www-data $config
|
||||
chmod -R 660 $config
|
||||
fi
|
||||
|
||||
#db_reset "dolibarr/webserver"
|
||||
|
||||
# Get the web server type (use db_get for interactive mode).
|
||||
#db_reset "dolibarr/webserver"
|
||||
#db_get "dolibarr/webserver" # Read value for webserver.
|
||||
#webserver="$RET"
|
||||
|
||||
@ -102,7 +105,7 @@ case "$1" in
|
||||
|
||||
# Set permissions to web server
|
||||
chown -R $webuser:$webgroup /usr/share/dolibarr
|
||||
chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
chown -R root:$webgroup $config
|
||||
|
||||
# Add link to config file
|
||||
echo Setup web server $server to add dolibarr config file
|
||||
@ -110,26 +113,6 @@ case "$1" in
|
||||
|
||||
done
|
||||
|
||||
#echo "Install menu entry"
|
||||
# This one is for Gnome ubuntu
|
||||
#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
|
||||
#target="/usr/share/applications/"
|
||||
#cp -f $fileorig $target
|
||||
# Not sure this is usefull
|
||||
#if test -x /usr/bin/update-menus; then
|
||||
# echo "update-menus"
|
||||
# update-menus;
|
||||
#fi
|
||||
|
||||
# TODO Create the file to force parameters in Web installer
|
||||
#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
|
||||
#then
|
||||
# perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
# perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
# perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
# perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
|
||||
#fi
|
||||
|
||||
# Restart servers
|
||||
servers="apache2-ssl apache2 mysql"
|
||||
# Another way to restart
|
||||
|
||||
111
build/deb/postrm
111
build/deb/postrm
@ -26,6 +26,11 @@ echo Run the dolibarr postrm script
|
||||
|
||||
docdir='/var/lib/dolibarr/documents'
|
||||
#docdir='/usr/share/dolibarr/documents'
|
||||
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
|
||||
apacheconfig="/etc/dolibarr/apache.conf"
|
||||
#config="/usr/share/dolibarr/htdocs/conf/conf.php"
|
||||
config="/etc/dolibarr/conf.php"
|
||||
lockfile="/usr/share/dolibarr/install.lock"
|
||||
|
||||
|
||||
export webserver=""
|
||||
@ -36,13 +41,38 @@ case $webserver in
|
||||
Both) webservers="apache2 apache2-ssl" ;;
|
||||
*) webservers="apache2 apache2-ssl" ;;
|
||||
esac
|
||||
export includefile=/etc/dolibarr/apache.conf
|
||||
|
||||
|
||||
case "$1" in
|
||||
|
||||
# Call when we upgrade
|
||||
upgrade)
|
||||
;;
|
||||
|
||||
# Call when we uninstall
|
||||
remove)
|
||||
rm -f $lockfile
|
||||
|
||||
# Remove include files
|
||||
export restart=""
|
||||
for server in $webservers ; do
|
||||
export conffile="/etc/$server/conf.d/dolibarr.conf"
|
||||
if [ -f $conffile ] ;
|
||||
then
|
||||
echo Delete link $conffile
|
||||
rm -f $conffile
|
||||
status=purge
|
||||
fi
|
||||
|
||||
if [ "x$status" = "xpurge" ] ;
|
||||
then restart="$restart $server"
|
||||
fi
|
||||
done
|
||||
;;
|
||||
|
||||
# Call when we uninstall and purge
|
||||
purge)
|
||||
echo "postrm purge webservers=$webservers includefile=$includefile"
|
||||
echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
|
||||
|
||||
# Ask if we must delete database
|
||||
echo "postrm db_input dolibarr/postrm"
|
||||
@ -59,7 +89,8 @@ case "$1" in
|
||||
echo postrm Mysql database deletion
|
||||
# Get database configuration
|
||||
dbserver="localhost"
|
||||
dbname="dolibarrmysql"
|
||||
dbuser="dolibarrdebian"
|
||||
dbname="dolibarrdebian"
|
||||
#db_get "dolibarr/db/name"
|
||||
#dbname="$RET"
|
||||
superuserlogin=''
|
||||
@ -120,23 +151,31 @@ case "$1" in
|
||||
fi
|
||||
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
|
||||
|
||||
# Now run the drop commands
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
log="${log}Droping database $dbname."
|
||||
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
error="Database $dbname NOT successfully droped. You have to do it manually."
|
||||
echo $error
|
||||
else
|
||||
status=drop
|
||||
fi
|
||||
# Now run the drop user
|
||||
if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
|
||||
echo Database login $dbuser removed
|
||||
else
|
||||
error="Unable to run the drop database script."
|
||||
error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
|
||||
echo $error
|
||||
fi
|
||||
|
||||
# Now run the drop commands
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
log="${log}Droping database $dbname."
|
||||
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
|
||||
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
|
||||
error="Database $dbname NOT successfully droped. You have to do it manually."
|
||||
echo $error
|
||||
else
|
||||
status=drop
|
||||
fi
|
||||
else
|
||||
error="Unable to run the drop database script."
|
||||
echo $error
|
||||
fi
|
||||
else
|
||||
status=nothing
|
||||
log="${log}Database $dbname already not exists."
|
||||
status=nothing
|
||||
log="${log}Database $dbname already not exists."
|
||||
fi
|
||||
|
||||
echo "Remove directory $docdir"
|
||||
@ -178,18 +217,6 @@ case "$1" in
|
||||
set -e
|
||||
done
|
||||
|
||||
# Remove file and conf file
|
||||
for dir in /usr/share/dolibarr; do
|
||||
if [ -d $dir ] ; then
|
||||
# We disable blocking errors
|
||||
set +e
|
||||
echo "Remove directory $dir"
|
||||
rm -rf $dir ;
|
||||
# We restore blocking errors
|
||||
set -e
|
||||
fi
|
||||
done
|
||||
|
||||
# We clean variable (we ignore errors because db_reset can fails if var was never set)
|
||||
set +e
|
||||
db_reset "dolibarr/postrm"
|
||||
@ -198,34 +225,6 @@ case "$1" in
|
||||
#db_purge
|
||||
;;
|
||||
|
||||
# Call when we uninstall
|
||||
remove)
|
||||
echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
|
||||
rm -fr /usr/share/dolibarr/htdocs/install
|
||||
|
||||
echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
|
||||
rm -fr /usr/share/dolibarr/htdocs/conf
|
||||
|
||||
# Remove include files
|
||||
export restart=""
|
||||
for server in $webservers ; do
|
||||
export conffile="/etc/$server/conf.d/dolibarr.conf"
|
||||
if [ -f $conffile ] ;
|
||||
then
|
||||
echo Delete file $conffile
|
||||
rm -f $conffile
|
||||
status=purge
|
||||
fi
|
||||
|
||||
if [ "x$status" = "xpurge" ] ;
|
||||
then restart="$restart $server"
|
||||
fi
|
||||
done
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
;;
|
||||
|
||||
failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Template: dolibarr/postrm
|
||||
Type: boolean
|
||||
Default: true
|
||||
_Description: Delete database and uploaded files ?
|
||||
Answer if you want to removed the Dolibarr MySQL database and all other
|
||||
datas (datas related to this question are the Dolibarr DBMS account, all
|
||||
Dolibarr tables, and all uploaded files).
|
||||
Description: Delete database ?
|
||||
Answer if you want to removed the Dolibarr MySQL database and all
|
||||
its datas (datas related to this quetion are the Dolibarr DBMS account
|
||||
and all Dolibarr tables).
|
||||
|
||||
@ -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.120 2011/07/28 18:32:00 eldy Exp $
|
||||
# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $
|
||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@ -11,7 +11,7 @@ use Cwd;
|
||||
$PROJECT="dolibarr";
|
||||
$MAJOR="3";
|
||||
$MINOR="1";
|
||||
$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||
$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
|
||||
$RPMSUBVERSION="auto"; # auto use value found into BUILD
|
||||
|
||||
@LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages
|
||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
||||
|
||||
|
||||
use vars qw/ $REVISION $VERSION /;
|
||||
$REVISION='$Revision: 1.120 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||
$VERSION="1.0 (build $REVISION)";
|
||||
|
||||
|
||||
@ -254,15 +254,18 @@ if ($nboftargetok) {
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
|
||||
@ -273,16 +276,28 @@ 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`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
|
||||
$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/htdocs/custom2`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
|
||||
@ -293,6 +308,7 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
|
||||
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
|
||||
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
|
||||
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
|
||||
@ -400,14 +416,19 @@ if ($nboftargetok) {
|
||||
}
|
||||
|
||||
if ($target eq 'RPM') { # Linux only
|
||||
$ARCH='i386';
|
||||
#$ARCH='i386';
|
||||
$ARCH='noarch';
|
||||
if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
|
||||
$newbuild = $BUILD;
|
||||
$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||
$newbuild =~ s/beta/1/gi; # beta
|
||||
$newbuild =~ s/rc./2/gi; # rc
|
||||
# For fedora
|
||||
$newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev
|
||||
$newbuild =~ s/beta/0.2.beta1/gi; # beta
|
||||
$newbuild =~ s/rc./0.3.rc1/gi; # rc
|
||||
if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||
# now newbuild is 0-0 or 0-3 for example
|
||||
#$newbuild =~ s/(dev|alpha)/0/gi; # dev
|
||||
#$newbuild =~ s/beta/1/gi; # beta
|
||||
#$newbuild =~ s/rc./2/gi; # rc
|
||||
#if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale
|
||||
$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
|
||||
if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
|
||||
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
|
||||
@ -425,7 +446,93 @@ if ($nboftargetok) {
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`;
|
||||
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`;
|
||||
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
|
||||
# To remove once stable
|
||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
|
||||
|
||||
# Apache conf files
|
||||
#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
|
||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
|
||||
#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
|
||||
|
||||
# Dolibarr conf files
|
||||
# TODO
|
||||
|
||||
# dolibarr.desktop
|
||||
#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
|
||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
|
||||
#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
|
||||
#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
|
||||
|
||||
# pixmap
|
||||
#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
|
||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
|
||||
#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
|
||||
#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
|
||||
|
||||
# Set owners
|
||||
print "Set owners on files/dir\n";
|
||||
$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
|
||||
|
||||
print "Set permissions on files/dir\n";
|
||||
$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
|
||||
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
$cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
||||
$ret=`$cmd`;
|
||||
|
||||
# Build tgz
|
||||
print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
|
||||
$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
|
||||
|
||||
@ -453,6 +560,10 @@ if ($nboftargetok) {
|
||||
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
|
||||
$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
||||
$ret=`$cmd`;
|
||||
print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
|
||||
$cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
|
||||
$ret=`$cmd`;
|
||||
|
||||
next;
|
||||
}
|
||||
|
||||
@ -503,19 +614,33 @@ if ($nboftargetok) {
|
||||
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
|
||||
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
|
||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
|
||||
@ -523,18 +648,15 @@ if ($nboftargetok) {
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/uml`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/xdebug`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
|
||||
@ -578,17 +700,7 @@ if ($nboftargetok) {
|
||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
|
||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
|
||||
|
||||
#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
||||
#$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
|
||||
|
||||
# copyright (to build binary package directly without sources. Useless if we build from sources)
|
||||
#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
|
||||
#$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
|
||||
|
||||
# changelog (to build binary package directly without sources. Useless if we build from sources)
|
||||
#$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
|
||||
#$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
|
||||
|
||||
# Set owners
|
||||
print "Set owners on files/dir\n";
|
||||
$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
|
||||
|
||||
@ -632,29 +744,25 @@ if ($nboftargetok) {
|
||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
|
||||
print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||
# Add files for dpkg-source
|
||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
|
||||
$ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`;
|
||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
|
||||
# Add files also required to build binary package with dpkg-buildpackages
|
||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||
|
||||
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||
$ret=`$cmd`;
|
||||
@ -670,12 +778,18 @@ if ($nboftargetok) {
|
||||
if ($OS =~ /windows/i)
|
||||
{
|
||||
print "Move *_all.deb to $DESTI\n";
|
||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
||||
}
|
||||
else
|
||||
{
|
||||
print "Move *_all.deb to $DESTI\n";
|
||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
|
||||
$ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
|
||||
}
|
||||
next;
|
||||
}
|
||||
@ -703,14 +817,21 @@ if ($nboftargetok) {
|
||||
$ret=`$cmd`;
|
||||
|
||||
print "Remove other files\n";
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/dbmodel`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/fpdf`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/initdata`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/iso-normes`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpcheckstyle`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpunit`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/uml`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/xdebug`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/flyer`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/font`;
|
||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/tshirt`;
|
||||
|
||||
@ -19,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
|
||||
Icon=dolibarr
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Office
|
||||
Categories=Office;
|
||||
StartupNotify=true
|
||||
InitialPreference=5
|
||||
#NoDisplay=true
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
|
||||
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
|
||||
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* 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
|
||||
@ -22,7 +22,7 @@
|
||||
/**
|
||||
* \file htdocs/admin/modules.php
|
||||
* \brief Page to activate/disable all modules
|
||||
* \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
|
||||
* \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -79,35 +79,12 @@ $modules = array();
|
||||
$orders = array();
|
||||
$categ = array();
|
||||
$dirmod = array();
|
||||
$modulesdir = array();
|
||||
$i = 0; // is a sequencer of modules found
|
||||
$j = 0; // j is module number. Automatically affected if module number not defined.
|
||||
|
||||
foreach ($conf->file->dol_document_root as $type => $dirroot)
|
||||
foreach ($conf->file->dol_document_root as $dirroot)
|
||||
{
|
||||
$modulesdir[] = $dirroot . "/includes/modules/";
|
||||
|
||||
if ($type == 'alt')
|
||||
{
|
||||
$althandle=@opendir($dirroot);
|
||||
if (is_resource($althandle))
|
||||
{
|
||||
while (($file = readdir($althandle))!==false)
|
||||
{
|
||||
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
|
||||
{
|
||||
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
|
||||
{
|
||||
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$dir = $dirroot . "/includes/modules/";
|
||||
|
||||
foreach ($modulesdir as $dir)
|
||||
{
|
||||
// Load modules attributes in arrays (name, numero, orders) from dir directory
|
||||
//print $dir."\n<br>";
|
||||
dol_syslog("Scan directory ".$dir." for modules");
|
||||
@ -472,5 +449,5 @@ print '</div>';
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
|
||||
?>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* \file htdocs/admin/perms.php
|
||||
* \ingroup core
|
||||
* \brief Page d'administration/configuration des permissions par defaut
|
||||
* \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
|
||||
* \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -76,34 +76,10 @@ $db->begin();
|
||||
|
||||
// Charge les modules soumis a permissions
|
||||
$modules = array();
|
||||
$modulesdir = array();
|
||||
|
||||
foreach ($conf->file->dol_document_root as $type => $dirroot)
|
||||
foreach ($conf->file->dol_document_root as $dirroot)
|
||||
{
|
||||
$modulesdir[] = $dirroot . "/includes/modules/";
|
||||
|
||||
if ($type == 'alt')
|
||||
{
|
||||
$handle=@opendir($dirroot);
|
||||
if (is_resource($handle))
|
||||
{
|
||||
while (($file = readdir($handle))!==false)
|
||||
{
|
||||
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
|
||||
{
|
||||
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
|
||||
{
|
||||
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
|
||||
}
|
||||
}
|
||||
}
|
||||
closedir($handle);
|
||||
}
|
||||
}
|
||||
}
|
||||
$dir = $dirroot . "/includes/modules/";
|
||||
|
||||
foreach ($modulesdir as $dir)
|
||||
{
|
||||
// Load modules attributes in arrays (name, numero, orders) from dir directory
|
||||
//print $dir."\n<br>";
|
||||
$handle=@opendir($dir);
|
||||
@ -218,5 +194,5 @@ print '</div>';
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
|
||||
?>
|
||||
|
||||
@ -12,15 +12,14 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/admin/proxy.php
|
||||
* \ingroup core
|
||||
* \brief Page setup proxy to use for external web access
|
||||
* \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
|
||||
* \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg);
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
|
||||
?>
|
||||
|
||||
@ -13,15 +13,14 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/admin/security_other.php
|
||||
* \ingroup core
|
||||
* \brief Security options setup
|
||||
* \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
|
||||
* \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../main.inc.php");
|
||||
@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
|
||||
?>
|
||||
|
||||
@ -14,14 +14,13 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/admin/system/constall.php
|
||||
* \brief Page to show all Dolibarr setup (config file and database constants)
|
||||
* \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
|
||||
* \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
|
||||
@ -14,14 +14,13 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/admin/system/index.php
|
||||
* \brief Home page of system information
|
||||
* \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
|
||||
* \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -127,5 +126,5 @@ print '<br>';
|
||||
print info_admin($langs->trans("SystemInfoDesc")).'<br>';
|
||||
|
||||
|
||||
llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
|
||||
?>
|
||||
|
||||
@ -14,8 +14,7 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
require('../main.inc.php');
|
||||
|
||||
@ -16,15 +16,14 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/comm/action/index.php
|
||||
* \ingroup agenda
|
||||
* \brief Home page of calendar events
|
||||
* \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $
|
||||
* \version $Id: index.php,v 1.184 2011/07/31 22:23:20 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../../main.inc.php");
|
||||
@ -786,7 +785,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
|
||||
';
|
||||
*/
|
||||
|
||||
llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.184 $');
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -15,15 +15,14 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/compta/bank/bankid_fr.php
|
||||
* \ingroup banque
|
||||
* \brief Fiche creation compte bancaire
|
||||
* \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
|
||||
?>
|
||||
|
||||
@ -15,15 +15,14 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/compta/bank/fiche.php
|
||||
* \ingroup banque
|
||||
* \brief Page to create/view a bank account
|
||||
* \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
|
||||
* \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
@ -608,5 +607,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
|
||||
?>
|
||||
|
||||
@ -14,15 +14,14 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/compta/bank/rappro.php
|
||||
* \ingroup banque
|
||||
* \brief Page to reconciliate bank transactions
|
||||
* \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
|
||||
* \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
@ -403,5 +402,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $');
|
||||
?>
|
||||
|
||||
@ -15,14 +15,13 @@
|
||||
* 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.
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/compta/prelevement/create.php
|
||||
* \brief Prelevement
|
||||
* \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $
|
||||
* \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $
|
||||
*/
|
||||
|
||||
require("../bank/pre.inc.php");
|
||||
@ -276,5 +275,5 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $');
|
||||
llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $');
|
||||
?>
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
* \file htdocs/filefunc.inc.php
|
||||
* \ingroup core
|
||||
* \brief File that include conf.php file and functions.lib.php
|
||||
* \version $Id: filefunc.inc.php,v 1.19 2011/07/21 22:11:30 eldy Exp $
|
||||
* \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
@ -61,8 +61,17 @@ error_reporting(E_ALL ^ E_NOTICE);
|
||||
//error_reporting(E_ALL);
|
||||
|
||||
|
||||
$conffiletoshowshort = "conf.php";
|
||||
# Define localization of conf file
|
||||
$conffile = "conf/conf.php";
|
||||
$conffiletoshow = "htdocs/conf/conf.php";
|
||||
# For debian like systems
|
||||
#$conffile = "/etc/dolibarr/conf.php";
|
||||
#$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||
|
||||
|
||||
// Include configuration
|
||||
$result=@include_once("conf/conf.php");
|
||||
$result=@include_once($conffile);
|
||||
if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session
|
||||
{
|
||||
header("Location: install/index.php");
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
|
||||
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1);
|
||||
|
||||
-- Regions Chile (id country=67)
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
|
||||
|
||||
-- Regions San Salvador (id country=86)
|
||||
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
|
||||
--
|
||||
|
||||
--
|
||||
@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
|
||||
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.82 2011/07/28 18:34:46 eldy Exp $
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $
|
||||
--
|
||||
-- Be carefull to requests order.
|
||||
-- This file must be loaded by calling /install/index.php page
|
||||
@ -25,8 +25,10 @@ ALTER TABLE llx_c_ziptown MODIFY fk_county integer NULL;
|
||||
|
||||
ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0;
|
||||
ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0 after model_pdf;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0 after fk_cond_reglement;
|
||||
ALTER TABLE llx_commande_fournisseur ADD COLUMN import_key varchar(14);
|
||||
|
||||
--ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default '';
|
||||
|
||||
ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255);
|
||||
@ -129,6 +131,9 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR
|
||||
-- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
|
||||
ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
|
||||
|
||||
-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product);
|
||||
ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
|
||||
|
||||
ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
||||
ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext;
|
||||
ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext;
|
||||
@ -478,3 +483,4 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email;
|
||||
ALTER TABLE llx_don ADD phone varchar(24) after email;
|
||||
|
||||
ALTER TABLE llx_user ADD civilite varchar(6) after entity;
|
||||
|
||||
|
||||
@ -1246,9 +1246,9 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
|
||||
CashDesk=TPV
|
||||
CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
|
||||
CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
|
||||
CashDeskBankAccountForSell=Compte a utilitzar per als cobraments en efectiu (caixa)
|
||||
CashDeskBankAccountForCheque=Compte a utilitzar per als cobraments amb xecs
|
||||
CashDeskBankAccountForCB=Compte a utilitzar per als cobraments amb targeta de crèdit
|
||||
CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
|
||||
CashDeskBankAccountForCheque=Compte per defecte a utilitzar per als cobraments amb xecs
|
||||
CashDeskBankAccountForCB=Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
|
||||
CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
|
||||
##### Bookmark #####
|
||||
BookmarkSetup=Configuració del mòdul Bookmark
|
||||
|
||||
@ -1246,9 +1246,9 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
|
||||
CashDesk=TPV
|
||||
CashDeskSetup=Configuración del módulo Terminal Punto de Venta
|
||||
CashDeskThirdPartyForSell=Tercero genérico a usar para la venta
|
||||
CashDeskBankAccountForSell=Cuenta a utilizar para los cobros en efectivo (caja)
|
||||
CashDeskBankAccountForCheque=Cuenta a utilizar para los cobros con cheques
|
||||
CashDeskBankAccountForCB=Cuenta a utilizar para los cobros con tarjeta de crédito
|
||||
CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
|
||||
CashDeskBankAccountForCheque=Cuenta por defecto a utilizar para los cobros con cheques
|
||||
CashDeskBankAccountForCB=Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
|
||||
CashDeskIdWareHouse=Almacén a utilizar para las ventas
|
||||
##### Bookmark #####
|
||||
BookmarkSetup=Configuración del módulo Marcadores
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
/**
|
||||
* \file htdocs/theme/auguria/style.css.php
|
||||
* \brief Fichier de style CSS du theme auguria
|
||||
* \version $Id: style.css.php,v 1.90 2011/07/28 13:26:34 eldy Exp $
|
||||
* \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $
|
||||
*/
|
||||
|
||||
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
|
||||
@ -1101,7 +1101,7 @@ border-left-style: solid;
|
||||
}
|
||||
|
||||
table.noborder td {
|
||||
padding: 1px 2px 0px 1px; /* t r b l */
|
||||
padding: 1px 2px 2px 1px; /* t r b l */
|
||||
}
|
||||
|
||||
table.nobordernopadding {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user