Work on debian package
This commit is contained in:
parent
a9abc1bad4
commit
63c3cb2d48
@ -43,6 +43,7 @@ For users:
|
|||||||
- New: Chart are faster to build
|
- New: Chart are faster to build
|
||||||
- New: Value of data into charts are visible on mouse hover.
|
- New: Value of data into charts are visible on mouse hover.
|
||||||
- New: Import wizard can import contacts.
|
- New: Import wizard can import contacts.
|
||||||
|
- New: Install process is now two times faster.
|
||||||
- Fix: Can use POS module with several concurrent users.
|
- Fix: Can use POS module with several concurrent users.
|
||||||
|
|
||||||
For developers:
|
For developers:
|
||||||
|
|||||||
@ -1,103 +0,0 @@
|
|||||||
README (english)
|
|
||||||
--------------------------------
|
|
||||||
Starter documentation
|
|
||||||
--------------------------------
|
|
||||||
|
|
||||||
1) Install Dolibarr
|
|
||||||
2) Upgrade Dolibarr from an older version
|
|
||||||
3) What's new in this version
|
|
||||||
4) What Dolibarr can do
|
|
||||||
5) What Dolibarr can't do yet, todo list
|
|
||||||
|
|
||||||
|
|
||||||
I - DOLIBARR INSTALL
|
|
||||||
--------------------
|
|
||||||
|
|
||||||
Dolibarr files and its dependencies are automatically installed when you install
|
|
||||||
the dolibarr Debian package.
|
|
||||||
|
|
||||||
Once package is installed, go on menu entry called Dolibarr or use your web browser
|
|
||||||
to call page http://localhost/dolibarr
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
II - DOLIBARR UPGRADE
|
|
||||||
---------------------
|
|
||||||
|
|
||||||
Dolibarr files and its dependencies are automatically upgraded when you install
|
|
||||||
the dolibarr Debian package.
|
|
||||||
|
|
||||||
Once new package is installed, go on menu entry called Dolibarr or use your web browser
|
|
||||||
to call page http://localhost/dolibarr
|
|
||||||
If a database upgrade is required, you will be prompted to.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
III - WHAT'S NEW
|
|
||||||
----------------
|
|
||||||
|
|
||||||
See ChangeLog file.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
IV - WHAT DOLIBARR CAN DO
|
|
||||||
-------------------------
|
|
||||||
|
|
||||||
Main modules/features:
|
|
||||||
- Products and services catalog
|
|
||||||
- Customers, Prospects or Suppliers directory
|
|
||||||
- Address book
|
|
||||||
- Stock management
|
|
||||||
- Bank accounts management
|
|
||||||
- Orders management with PDF export
|
|
||||||
- Commercial proposals management with PDF export
|
|
||||||
- Contracts management
|
|
||||||
- Invoices management with PDF export
|
|
||||||
- Payments management
|
|
||||||
- Standing orders management
|
|
||||||
- Shipping management
|
|
||||||
- ECM (Electronic Content Management)
|
|
||||||
- EMailings
|
|
||||||
- Agenda with ical,vcal export for third tools integration
|
|
||||||
- Management of foundation members
|
|
||||||
- Donation management
|
|
||||||
|
|
||||||
Other modules:
|
|
||||||
- Bookmarks management
|
|
||||||
- Can reports Dolibarr events inside Webcalendar or Phenix
|
|
||||||
- Data export tools
|
|
||||||
- LDAP connectivity
|
|
||||||
- Third parties or products categories
|
|
||||||
- ClickToDial phone numbers
|
|
||||||
- RSS
|
|
||||||
|
|
||||||
Miscellanous:
|
|
||||||
- Mutli-user, with several permissions levels for each feature.
|
|
||||||
- Serveral menu managers (can be used by internal users, as a back-office,
|
|
||||||
with a particular menu, or by external users, as a front-office, with
|
|
||||||
another menu and permissions).
|
|
||||||
- Very user friendly and easy to use.
|
|
||||||
- Optional WYSIWYG forms, optional Ajax forms.
|
|
||||||
- Several skins.
|
|
||||||
- Code is highly customizable (a lot of use of modules and submodules).
|
|
||||||
- Works with Mysql 3.1 or higher, experimental support for PostgreSql.
|
|
||||||
- Works with PHP 4.3 or higher.
|
|
||||||
- An easy to understand and maintain code (PHP with no heavy frameworks).
|
|
||||||
- A trigger architecture to allow you to make Dolibarr business events run
|
|
||||||
PHP code to update your own information system.
|
|
||||||
- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM
|
|
||||||
called "Non Perçue Récupérable").
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
|
|
||||||
------------------------------------------
|
|
||||||
This is features that Dolibarr does not support completely yet:
|
|
||||||
- Accountancy.
|
|
||||||
- Dolibarr can manage only one currency.
|
|
||||||
- Dolibarr does not support the double Canadian Tax.
|
|
||||||
- Dolibarr does not make coffee (not yet).
|
|
||||||
- Stock management with option increase/decrease on invoice works on
|
|
||||||
warehouse number one only (no way to choose warehouse).
|
|
||||||
- Stock management with option increase/decrease on orders works on
|
|
||||||
warehouse number one only (no way to choose warehouse).
|
|
||||||
12
build/debian/README.source
Normal file
12
build/debian/README.source
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
==================================================================
|
||||||
|
Dolibarr - Web based software to manage a small company or foundation
|
||||||
|
==================================================================
|
||||||
|
|
||||||
|
|
||||||
|
Note for package maintainers
|
||||||
|
----------------------------
|
||||||
|
This file explains how to modify official sources (from http://www.dolibarr.org)
|
||||||
|
to have ready to use source files to build a debian package.
|
||||||
|
|
||||||
|
All changes are included into patch file
|
||||||
|
build/debian/install.patch
|
||||||
@ -4,7 +4,7 @@ Standards-Version: 3.9.2
|
|||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Homepage: http://www.dolibarr.org
|
Homepage: http://www.dolibarr.org
|
||||||
Build-Depends: debhelper (>= 7), po-debconf
|
Build-Depends: debhelper (>= 7), po-debconf, dpatch
|
||||||
|
|
||||||
Package: dolibarr
|
Package: dolibarr
|
||||||
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
|
||||||
|
|||||||
@ -36,39 +36,8 @@ License: GPL-2+
|
|||||||
PURPOSE. See the GNU General Public License for more
|
PURPOSE. See the GNU General Public License for more
|
||||||
details.
|
details.
|
||||||
.
|
.
|
||||||
You should have received a copy of the GNU General Public
|
You should have received a copy of the GNU General Public License
|
||||||
License along with this package; if not, write to the Free
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301 USA
|
|
||||||
.
|
|
||||||
On Debian systems, the full text of the GNU General Public
|
|
||||||
License version 2 can be found in the file
|
|
||||||
`/usr/share/common-licenses/GPL-2'.
|
|
||||||
|
|
||||||
Files: htdocs/includes/artichow/*
|
|
||||||
Copyright: Artichow team
|
|
||||||
License: Public Domain
|
|
||||||
This work is not subject to copyright in any jurisdiction
|
|
||||||
|
|
||||||
Files: htdocs/includes/ckeditor/*
|
|
||||||
Copyright: CKeditor team
|
|
||||||
License: GPL-2+
|
|
||||||
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 package; if not, write to the Free
|
|
||||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301 USA
|
|
||||||
.
|
.
|
||||||
On Debian systems, the full text of the GNU General Public
|
On Debian systems, the full text of the GNU General Public
|
||||||
License version 2 can be found in the file
|
License version 2 can be found in the file
|
||||||
@ -89,10 +58,8 @@ License: GPL-2+
|
|||||||
PURPOSE. See the GNU General Public License for more
|
PURPOSE. See the GNU General Public License for more
|
||||||
details.
|
details.
|
||||||
.
|
.
|
||||||
You should have received a copy of the GNU General Public
|
You should have received a copy of the GNU General Public License
|
||||||
License along with this package; if not, write to the Free
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301 USA
|
|
||||||
.
|
.
|
||||||
On Debian systems, the full text of the GNU General Public
|
On Debian systems, the full text of the GNU General Public
|
||||||
License version 2 can be found in the file
|
License version 2 can be found in the file
|
||||||
@ -113,10 +80,8 @@ License: MIT or GPL-2+
|
|||||||
PURPOSE. See the GNU General Public License for more
|
PURPOSE. See the GNU General Public License for more
|
||||||
details.
|
details.
|
||||||
.
|
.
|
||||||
You should have received a copy of the GNU General Public
|
You should have received a copy of the GNU General Public License
|
||||||
License along with this package; if not, write to the Free
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301 USA
|
|
||||||
.
|
.
|
||||||
On Debian systems, the full text of the GNU General Public
|
On Debian systems, the full text of the GNU General Public
|
||||||
License version 2 can be found in the file
|
License version 2 can be found in the file
|
||||||
@ -160,10 +125,8 @@ License: GPL-2+
|
|||||||
PURPOSE. See the GNU General Public License for more
|
PURPOSE. See the GNU General Public License for more
|
||||||
details.
|
details.
|
||||||
.
|
.
|
||||||
You should have received a copy of the GNU General Public
|
You should have received a copy of the GNU General Public License
|
||||||
License along with this package; if not, write to the Free
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301 USA
|
|
||||||
.
|
.
|
||||||
On Debian systems, the full text of the GNU General Public
|
On Debian systems, the full text of the GNU General Public
|
||||||
License version 2 can be found in the file
|
License version 2 can be found in the file
|
||||||
@ -191,10 +154,8 @@ License: GPL-2+
|
|||||||
PURPOSE. See the GNU General Public License for more
|
PURPOSE. See the GNU General Public License for more
|
||||||
details.
|
details.
|
||||||
.
|
.
|
||||||
You should have received a copy of the GNU General Public
|
You should have received a copy of the GNU General Public License
|
||||||
License along with this package; if not, write to the Free
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
|
||||||
Boston, MA 02110-1301 USA
|
|
||||||
.
|
.
|
||||||
On Debian systems, the full text of the GNU General Public
|
On Debian systems, the full text of the GNU General Public
|
||||||
License version 2 can be found in the file
|
License version 2 can be found in the file
|
||||||
@ -204,4 +165,3 @@ Files: htdocs/includes/tcpdf/*
|
|||||||
Copyright: TCPDF team
|
Copyright: TCPDF team
|
||||||
License: LGPL 3.0
|
License: LGPL 3.0
|
||||||
See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html
|
See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html
|
||||||
|
|
||||||
@ -1,6 +1,8 @@
|
|||||||
etc/dolibarr/apache.conf
|
debian/dolibarr.desktop usr/share/applications
|
||||||
etc/dolibarr/lighttpd.conf
|
debian/dolibarr.xpm usr/share/pixmaps
|
||||||
usr/share/applications/dolibarr.desktop
|
build/debian/apache.conf etc/dolibarr
|
||||||
usr/share/dolibarr
|
build/debian/lighttpd.conf etc/dolibarr
|
||||||
usr/share/doc/dolibarr
|
build usr/share/dolibarr
|
||||||
usr/share/pixmaps
|
dev usr/share/dolibarr
|
||||||
|
htdocs usr/share/dolibarr
|
||||||
|
scripts usr/share/dolibarr
|
||||||
1
build/debian/patches/00list
Normal file
1
build/debian/patches/00list
Normal file
@ -0,0 +1 @@
|
|||||||
|
install.dpatch
|
||||||
50
build/debian/patches/install.dpatch
Executable file
50
build/debian/patches/install.dpatch
Executable file
@ -0,0 +1,50 @@
|
|||||||
|
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||||
|
## install.patch by <eldy@users.sourceforge.net>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Updates htdocs/filefunc.inc.php
|
||||||
|
## DP: Updates htdocs/install/inc.php
|
||||||
|
## DP: Updates htdocs/support/inc.php
|
||||||
|
|
||||||
|
@DPATCH@
|
||||||
|
|
||||||
|
|
||||||
|
--- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
|
||||||
|
+++ new/htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
|
||||||
|
@@ -64,8 +64,8 @@
|
||||||
|
$conffile = "conf/conf.php";
|
||||||
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
|
// For debian/redhat like systems
|
||||||
|
-//$conffile = "/etc/dolibarr/conf.php";
|
||||||
|
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
+$conffile = "/etc/dolibarr/conf.php";
|
||||||
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
|
||||||
|
|
||||||
|
// Include configuration
|
||||||
|
--- old/htdocs/install/inc.php 2011-09-03 02:33:26.450952000 +0200
|
||||||
|
+++ new/htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200
|
||||||
|
@@ -84,8 +84,8 @@
|
||||||
|
$conffile = "../conf/conf.php";
|
||||||
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
|
// For debian/redhat like systems
|
||||||
|
-//$conffile = "/etc/dolibarr/conf.php";
|
||||||
|
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
+$conffile = "/etc/dolibarr/conf.php";
|
||||||
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
|
||||||
|
|
||||||
|
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
||||||
|
--- old/htdocs/support/inc.php 2011-09-03 02:34:39.606952000 +0200
|
||||||
|
+++ new/htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200
|
||||||
|
@@ -79,8 +79,8 @@
|
||||||
|
$conffile = "../conf/conf.php";
|
||||||
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
|
// For debian/redhat like systems
|
||||||
|
-//$conffile = "/etc/dolibarr/conf.php";
|
||||||
|
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
+$conffile = "/etc/dolibarr/conf.php";
|
||||||
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
|
||||||
|
$charset="UTF-8"; // If not output format found in any conf file
|
||||||
|
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
||||||
28
build/debian/rules
Normal file → Executable file
28
build/debian/rules
Normal file → Executable file
@ -6,5 +6,31 @@ export DH_OPTIONS=-v
|
|||||||
|
|
||||||
#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file
|
#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file
|
||||||
|
|
||||||
%:
|
|
||||||
|
# use dpatch
|
||||||
|
include /usr/share/dpatch/dpatch.make
|
||||||
|
|
||||||
|
|
||||||
|
configure:
|
||||||
dh $@
|
dh $@
|
||||||
|
|
||||||
|
build: patch
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
build-arch: patch
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
build-indep: patch
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
binary:
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
binary-indep:
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
clean:
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
binary-arch:
|
||||||
|
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
# watch control file for uscan
|
||||||
|
#version=3
|
||||||
|
#http://http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate
|
||||||
@ -17,22 +17,35 @@ To submit a package on LaunchPad:
|
|||||||
- Create Project
|
- Create Project
|
||||||
- Link project to official SCM server
|
- Link project to official SCM server
|
||||||
- Upload SSH public key onto account
|
- Upload SSH public key onto account
|
||||||
- Run from command line: bzr launchpad-login yourlogin
|
- Run from command line:
|
||||||
|
bzr launchpad-login yourlogin
|
||||||
- Create a debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
|
bzr whoami "Your Name <email@email.com>"
|
||||||
|
- Create a Bazzar directory
|
||||||
- Create an empty directory dolibarr and go into it.
|
mkdir bzr
|
||||||
|
- Create debian directory and upload it onto bzr branch ~yourlogin/dolibarr/debian
|
||||||
|
cd bzr
|
||||||
|
mkdir debian
|
||||||
|
cd debian
|
||||||
|
bzr init
|
||||||
|
cp -pr dolibarr_root/debian bzr/debian
|
||||||
|
bzr add debian
|
||||||
|
bzr commit
|
||||||
|
bzr push lp:~eldy/dolibarr/debian
|
||||||
|
or download it from launchpad bazaar:
|
||||||
|
cd bzr
|
||||||
|
bzr branch lp:~eldy/dolibarr/debian
|
||||||
- Create a file dolibarr.recipe with content
|
- Create a file dolibarr.recipe with content
|
||||||
# bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
|
cd bzr
|
||||||
lp:dolibarr
|
vi dolibarr.recipe
|
||||||
merge packaging lp:~eldy/dolibarr/debian
|
# bzr-builder format 0.3 deb-version {debupstream}+{revno}+{revno:packaging}
|
||||||
|
lp:dolibarr
|
||||||
|
merge packaging lp:~eldy/dolibarr/debian
|
||||||
- Run command
|
- Run command
|
||||||
|
cd bzr
|
||||||
bzr dailydeb dolibarr.recipe working-dir
|
bzr dailydeb dolibarr.recipe working-dir
|
||||||
This will create a directory "working-dir" with dolibarr sources and will add sources from ~eldy/dolibarr/debian
|
This will create a directory "working-dir" with dolibarr sources and will add sources from ~eldy/dolibarr/debian
|
||||||
|
|
||||||
- Create a file /.pbuilderrc with content
|
- Create a file /.pbuilderrc with content
|
||||||
$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build
|
$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build
|
||||||
|
|
||||||
- Create chroot ubuntu env
|
- Create chroot ubuntu env
|
||||||
sudo pbuilder create
|
sudo pbuilder create
|
||||||
- Test package sources
|
- Test package sources
|
||||||
|
|||||||
@ -301,6 +301,8 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
|
||||||
|
$ret=`rm -f $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
|
||||||
|
$ret=`rm -f $BUILDROOT/$PROJECT/dev/README`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
|
$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_screenshot3.png`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
|
||||||
@ -318,8 +320,6 @@ if ($nboftargetok) {
|
|||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
|
$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/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* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`;
|
|
||||||
#$ret=`rm -fr $BUILDROOT/$PROJECT/.svn $BUILDROOT/$PROJECT/*/.svn $BUILDROOT/$PROJECT/*/*/.svn $BUILDROOT/$PROJECT/*/*/*/.svn $BUILDROOT/$PROJECT/*/*/*/*/.svn`;
|
|
||||||
$ret=`rm -f $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/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
|
$ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/fckeditor`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/fckeditor`;
|
||||||
@ -347,7 +347,8 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
print "\nBuild package for target $target\n";
|
print "\nBuild package for target $target\n";
|
||||||
|
|
||||||
if ($target eq 'SNAPSHOT') {
|
if ($target eq 'SNAPSHOT')
|
||||||
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
|
|
||||||
print "Remove target $FILENAMESNAPSHOT.tgz...\n";
|
print "Remove target $FILENAMESNAPSHOT.tgz...\n";
|
||||||
@ -371,7 +372,8 @@ if ($nboftargetok) {
|
|||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'TGZ') {
|
if ($target eq 'TGZ')
|
||||||
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
||||||
|
|
||||||
@ -396,7 +398,8 @@ if ($nboftargetok) {
|
|||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($target eq 'ZIP') {
|
if ($target eq 'ZIP')
|
||||||
|
{
|
||||||
$NEWDESTI=$DESTI;
|
$NEWDESTI=$DESTI;
|
||||||
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
||||||
|
|
||||||
@ -459,9 +462,6 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
|
print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
|
||||||
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
|
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
|
||||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2"`;
|
|
||||||
#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share\n";
|
|
||||||
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share"`;
|
|
||||||
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
|
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
|
||||||
$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
|
$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
@ -553,157 +553,101 @@ if ($nboftargetok) {
|
|||||||
print "Remove target ${FILENAMEDEB}.changes...\n";
|
print "Remove target ${FILENAMEDEB}.changes...\n";
|
||||||
unlink("$NEWDESTI/${FILENAMEDEB}.changes");
|
unlink("$NEWDESTI/${FILENAMEDEB}.changes");
|
||||||
|
|
||||||
#rmdir "$BUILDROOT/$PROJECT.tmp";
|
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
|
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
|
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
|
||||||
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
|
$ret=`$cmd`;
|
||||||
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
|
|
||||||
print "Fix filefunc.inc.php, install/inc.php, support/inc.php\n";
|
# print "Fix filefunc.inc.php, install/inc.php, support/inc.php\n";
|
||||||
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/filefunc.inc.php\" |
|
# $cmd="cat \"$BUILDROOT/$PROJECT/htdocs/filefunc.inc.php\" |
|
||||||
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
# sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
||||||
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
# sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
||||||
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/filefunc.inc.php\"";
|
# sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/htdocs/filefunc.inc.php\"";
|
||||||
$ret=`$cmd`;
|
# $ret=`$cmd`;
|
||||||
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/install/inc.php\" |
|
# $cmd="cat \"$BUILDROOT/$PROJECT/htdocs/install/inc.php\" |
|
||||||
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
# sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
||||||
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
# sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
||||||
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/install/inc.php\"";
|
# sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/htdocs/install/inc.php\"";
|
||||||
$ret=`$cmd`;
|
# $ret=`$cmd`;
|
||||||
$cmd="cat \"$BUILDROOT/$PROJECT/htdocs/support/inc.php\" |
|
# $cmd="cat \"$BUILDROOT/$PROJECT/htdocs/support/inc.php\" |
|
||||||
sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
# sed -e 's/conffile = \"\\\.\\\.\\\/conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
||||||
sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
# sed -e 's/conffile = \"conf\\\/conf.php\"/conffile = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' |
|
||||||
sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/support/inc.php\"";
|
# sed -e 's/conffiletoshow = \"htdocs\\\/conf\\\/conf.php\"/conffiletoshow = \"\\\/etc\\\/dolibarr\\\/conf.php\"/g' > \"$BUILDROOT/$PROJECT.tmp/htdocs/support/inc.php\"";
|
||||||
$ret=`$cmd`;
|
# $ret=`$cmd`;
|
||||||
|
|
||||||
print "Remove other files\n";
|
print "Remove other files\n";
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/ChangeLog`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/README-FR`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/README-FR`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/pad/README`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
|
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/README`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/config`;
|
||||||
#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/po`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/source`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/changelog`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/compat`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/format`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/config`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/install`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/control*`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/menu`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/copyright`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/postrm`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/dolibarr.desktop`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/postinst`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/dolibarr.lintian-overrides`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/format`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/install`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/templates`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/menu`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/templates.futur`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/postrm`;
|
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/wash`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/postinst`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/rules`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/README.debian`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/templates`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/templates.futur`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
|
||||||
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/debian/wash`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/doap`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/launchpad`;
|
|
||||||
$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`;
|
|
||||||
# We remove embedded libraries or fonts
|
# We remove embedded libraries or fonts
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/ckeditor`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fonts`,
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/fonts`,
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/geoip`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/geoip`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/nusoap`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/nusoap`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/odtphp/zip/pclzip`;
|
||||||
|
|
||||||
# Apache and lighttpd conf files
|
|
||||||
print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
|
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
|
|
||||||
$ret=`cp "$SOURCE/build/debian/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
|
|
||||||
print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n";
|
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
|
|
||||||
$ret=`cp "$SOURCE/build/debian/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`;
|
|
||||||
|
|
||||||
# dolibarr.desktop
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
|
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
|
|
||||||
print "Copy desktop file into $BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop\n";
|
|
||||||
$ret=`cp "$SOURCE/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop"`;
|
|
||||||
|
|
||||||
# pixmap
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps\n";
|
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/pixmaps"`;
|
|
||||||
print "Copy pixmap file into $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm\n";
|
|
||||||
$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm"`;
|
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
|
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
|
|
||||||
|
|
||||||
# changelog (to build binary package directly without sources. Useless if we build from sources)
|
|
||||||
$ret=`gzip -9 -c "$SOURCE/build/debian/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`;
|
|
||||||
|
|
||||||
# Set permissions
|
|
||||||
print "Set permissions on files/dir\n";
|
|
||||||
$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
|
|
||||||
$cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/translation/autotranslator.class.php`;
|
|
||||||
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/modMyModule.class.php`;
|
|
||||||
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_class.class.php`;
|
|
||||||
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_page.php`;
|
|
||||||
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_webservice_server.php`;
|
|
||||||
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
|
|
||||||
$ret=`$cmd`;
|
|
||||||
|
|
||||||
|
|
||||||
# Prepare binary package (init DEBIAN dir)
|
# Prepare binary package (init DEBIAN dir)
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
#print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
||||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
#$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
#print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
|
||||||
$ret=`cp -f "$SOURCE/build/debian/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
#$ret=`cp -f "$SOURCE/build/debian/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
#$ret=`cp -f "$SOURCE/build/debian/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
#$ret=`cp -f "$SOURCE/build/debian/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
#$ret=`cp -f "$SOURCE/build/debian/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
$ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
#$ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
|
|
||||||
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
|
# changelog (to build binary package directly without sources. Useless if we build from sources)
|
||||||
open (SPECFROM,"<$SOURCE/build/debian/control.debianbin") || die "Error";
|
#$ret=`gzip -9 -c "$SOURCE/build/debian/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
|
||||||
open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
|
|
||||||
while (<SPECFROM>) {
|
|
||||||
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
|
|
||||||
print SPECTO $_;
|
|
||||||
}
|
|
||||||
close SPECFROM;
|
|
||||||
close SPECTO;
|
|
||||||
print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
|
||||||
|
|
||||||
$cmd="find $BUILDROOT/$PROJECT.tmp/DEBIAN -type f -exec chmod 755 {} \\; ";
|
#print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
|
||||||
$ret=`$cmd`;
|
#open (SPECFROM,"<$SOURCE/build/debian/control.debianbin") || die "Error";
|
||||||
$ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/control`;
|
#open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
|
||||||
$ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`;
|
#while (<SPECFROM>) {
|
||||||
|
# $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
|
||||||
|
# print SPECTO $_;
|
||||||
|
#}
|
||||||
|
#close SPECFROM;
|
||||||
|
#close SPECTO;
|
||||||
|
#print "Version set to $MAJOR.$MINOR.$newbuild\n";
|
||||||
|
|
||||||
|
#$cmd="find $BUILDROOT/$PROJECT.tmp/DEBIAN -type f -exec chmod 755 {} \\; ";
|
||||||
|
#$ret=`$cmd`;
|
||||||
|
#$ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/control`;
|
||||||
|
#$ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`;
|
||||||
|
|
||||||
# Creation of binary package (to build without sources)
|
# Creation of binary package (to build without sources)
|
||||||
# Enable this to build a binary package without building sources first
|
# Enable this to build a binary package without building sources first
|
||||||
@ -713,33 +657,60 @@ if ($nboftargetok) {
|
|||||||
#print "Launch DEB build ($cmd)\n";
|
#print "Launch DEB build ($cmd)\n";
|
||||||
#$ret=`$cmd`;
|
#$ret=`$cmd`;
|
||||||
#print $ret."\n";
|
#print $ret."\n";
|
||||||
|
#$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
||||||
|
#$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/doc"`;
|
||||||
#exit;
|
#exit;
|
||||||
|
|
||||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
|
|
||||||
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
|
|
||||||
|
|
||||||
# Prepare source package (init debian dir)
|
# Prepare source package (init debian dir)
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
|
print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||||
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
|
||||||
# Add files for dpkg-source
|
# Add files for dpkg-source
|
||||||
$ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/changelog" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/changelog" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/install" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
|
||||||
$ret=`cp -f "$SOURCE/build/debian/compat" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/compat" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -fr "$SOURCE/build/debian/source" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -f "$SOURCE/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -f "$SOURCE/build/debian/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -f "$SOURCE/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -f "$SOURCE/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -f "$SOURCE/build/debian/install" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -fr "$SOURCE/build/debian/patches" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -fr "$SOURCE/build/debian/po" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
# Add files also required to build binary package with dpkg-buildpackages
|
$ret=`cp -f "$SOURCE/build/debian/README.source" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -f "$SOURCE/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
$ret=`cp -fr "$SOURCE/build/debian/source" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
# Add files also required to build binary package
|
||||||
$ret=`cp -f "$SOURCE/build/debian/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/config" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
$ret=`cp -f "$SOURCE/build/debian/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
$ret=`cp -f "$SOURCE/build/debian/templates" "$BUILDROOT/$PROJECT.tmp/debian"`;
|
||||||
|
|
||||||
|
|
||||||
|
# Set owners and permissions
|
||||||
|
print "Set owners on files/dir\n";
|
||||||
|
$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
|
||||||
|
print "Set permissions on files/dir\n";
|
||||||
|
$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
|
||||||
|
$cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
|
||||||
|
$ret=`$cmd`;
|
||||||
|
$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||||
|
$ret=`$cmd`;
|
||||||
|
$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
|
||||||
|
$ret=`$cmd`;
|
||||||
|
$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
|
||||||
|
$ret=`$cmd`;
|
||||||
|
$cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||||
|
$ret=`$cmd`;
|
||||||
|
$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
|
||||||
|
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
|
||||||
|
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
|
||||||
|
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
|
||||||
|
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
|
||||||
|
$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
|
||||||
|
$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
|
||||||
|
$ret=`$cmd`;
|
||||||
|
|
||||||
|
|
||||||
print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
|
print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
|
||||||
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
||||||
--- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200
|
--- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200
|
||||||
+++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
|
+++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
|
||||||
@@ -64,8 +64,8 @@ $conffiletoshowshort = "conf.php";
|
@@ -64,8 +64,8 @@
|
||||||
$conffile = "conf/conf.php";
|
$conffile = "conf/conf.php";
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
// For debian/redhat like systems
|
// For debian/redhat like systems
|
||||||
@ -15,7 +15,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
|||||||
diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
|
diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
|
||||||
--- htdocs/install/inc.php.patch 2011-09-03 02:33:26.450952000 +0200
|
--- htdocs/install/inc.php.patch 2011-09-03 02:33:26.450952000 +0200
|
||||||
+++ htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200
|
+++ htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200
|
||||||
@@ -75,8 +75,8 @@ $conffiletoshowshort = "conf.php";
|
@@ -84,8 +84,8 @@
|
||||||
$conffile = "../conf/conf.php";
|
$conffile = "../conf/conf.php";
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
// For debian/redhat like systems
|
// For debian/redhat like systems
|
||||||
@ -29,7 +29,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
|
|||||||
diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
|
diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
|
||||||
--- htdocs/support/inc.php.patch 2011-09-03 02:34:39.606952000 +0200
|
--- htdocs/support/inc.php.patch 2011-09-03 02:34:39.606952000 +0200
|
||||||
+++ htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200
|
+++ htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200
|
||||||
@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
|
@@ -79,8 +79,8 @@
|
||||||
$conffile = "../conf/conf.php";
|
$conffile = "../conf/conf.php";
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
// For debian/redhat like systems
|
// For debian/redhat like systems
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.0-alpha'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.0-alpha'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||||
if (! defined('EURO')) define('EURO',chr(128));
|
if (! defined('EURO')) define('EURO',chr(128));
|
||||||
|
|
||||||
// Definition des constantes syslog
|
// Define syslog constants
|
||||||
if (! defined('LOG_DEBUG'))
|
if (! defined('LOG_DEBUG'))
|
||||||
{
|
{
|
||||||
if (function_exists("define_syslog_variables"))
|
if (function_exists("define_syslog_variables"))
|
||||||
|
|||||||
@ -18,9 +18,10 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** \file htdocs/install/inc.php
|
/**
|
||||||
* \ingroup core
|
* \file htdocs/install/inc.php
|
||||||
* \brief File that define environment for install pages
|
* \ingroup core
|
||||||
|
* \brief File that define environment for support pages
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('DOL_VERSION','3.2.0-alpha'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
|
define('DOL_VERSION','3.2.0-alpha'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||||
@ -53,25 +54,25 @@ if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Definition des constantes syslog
|
// Define syslog constants
|
||||||
if (function_exists("define_syslog_variables"))
|
if (! defined('LOG_DEBUG'))
|
||||||
{
|
{
|
||||||
if (version_compare(PHP_VERSION, '5.3.0', '<'))
|
if (function_exists("define_syslog_variables"))
|
||||||
{
|
{
|
||||||
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
|
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
else
|
{
|
||||||
{
|
// Pour PHP sans syslog (comme sous Windows)
|
||||||
// Pour PHP sans syslog (comme sous Windows)
|
define('LOG_EMERG',0);
|
||||||
define('LOG_EMERG',0);
|
define('LOG_ALERT',1);
|
||||||
define('LOG_ALERT',1);
|
define('LOG_CRIT',2);
|
||||||
define('LOG_CRIT',2);
|
define('LOG_ERR',3);
|
||||||
define('LOG_ERR',3);
|
define('LOG_WARNING',4);
|
||||||
define('LOG_WARNING',4);
|
define('LOG_NOTICE',5);
|
||||||
define('LOG_NOTICE',5);
|
define('LOG_INFO',6);
|
||||||
define('LOG_INFO',6);
|
define('LOG_DEBUG',7);
|
||||||
define('LOG_DEBUG',7);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$includeconferror='';
|
$includeconferror='';
|
||||||
|
|||||||
@ -19,8 +19,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/support/inc.php
|
* \file htdocs/support/inc.php
|
||||||
* \brief File that define environment for support pages
|
* \ingroup core
|
||||||
|
* \brief File that define environment for support pages
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define('DOL_VERSION','3.2.0-alpha'); // Also defined in htdocs/master.inc.php
|
define('DOL_VERSION','3.2.0-alpha'); // Also defined in htdocs/master.inc.php
|
||||||
@ -49,27 +50,26 @@ if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Definition des constantes syslog
|
// Define syslog constants
|
||||||
if (function_exists("define_syslog_variables"))
|
if (! defined('LOG_DEBUG'))
|
||||||
{
|
{
|
||||||
if (version_compare(PHP_VERSION, '5.3.0', '<'))
|
if (function_exists("define_syslog_variables"))
|
||||||
{
|
{
|
||||||
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
|
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Pour PHP sans syslog (comme sous Windows)
|
||||||
|
define('LOG_EMERG',0);
|
||||||
|
define('LOG_ALERT',1);
|
||||||
|
define('LOG_CRIT',2);
|
||||||
|
define('LOG_ERR',3);
|
||||||
|
define('LOG_WARNING',4);
|
||||||
|
define('LOG_NOTICE',5);
|
||||||
|
define('LOG_INFO',6);
|
||||||
|
define('LOG_DEBUG',7);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// Pour PHP sans syslog (comme sous Windows)
|
|
||||||
define('LOG_EMERG',0);
|
|
||||||
define('LOG_ALERT',1);
|
|
||||||
define('LOG_CRIT',2);
|
|
||||||
define('LOG_ERR',3);
|
|
||||||
define('LOG_WARNING',4);
|
|
||||||
define('LOG_NOTICE',5);
|
|
||||||
define('LOG_INFO',6);
|
|
||||||
define('LOG_DEBUG',7);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$includeconferror='';
|
$includeconferror='';
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user