lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on debian package

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-26 21:40:25 +00:00
parent e836c05c44
commit 318941da91
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/.cvsignore
View File

@ -13,4 +13,3 @@ module_pibarcode-1.0.tgz
version-phpsane.txt
makepack-phpsane.conf
html
*.deb

21
build/makepack-dolibarr.pl
View File

@ -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.117 2011/07/26 23:25:59 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.114 2011/07/25 23:20:14 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@ -34,7 +34,7 @@ $FILENAMESNAPSHOT="$PROJECT-snapshot";
$FILENAMETGZ="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
$FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
$FILENAMEDEB="$PROJECT-$MAJOR.$MINOR.$BUILD";
$FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
if (-d "/usr/src/redhat") {
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.117 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.114 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@ -458,8 +458,8 @@ if ($nboftargetok) {
# now newbuild is 0-1 or 0-4 for example
print "Version is $MAJOR.$MINOR.$newbuild\n";
print "Remove target ${FILENAMEDEB}_all.deb...\n";
unlink("$DESTI/${FILENAMEDEB}_all.deb");
print "Remove target $FILENAMEDEB.deb...\n";
unlink("$DESTI/$FILENAMEDEB.deb");
#rmdir "$BUILDROOT/$PROJECT.tmp";
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
@ -494,7 +494,6 @@ if ($nboftargetok) {
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
$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`;
@ -583,7 +582,7 @@ if ($nboftargetok) {
chdir("$BUILDROOT");
# Creation of binary package
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb";
print "Launch DEB build ($cmd)\n";
$ret=`$cmd`;
print $ret."\n";
@ -617,13 +616,13 @@ if ($nboftargetok) {
if ($OS =~ /windows/i)
{
print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n";
$ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`;
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
}
else
{
print "Move ${FILENAMEDEB}_all.deb to $DESTI/${FILENAMEDEB}_all.deb\n";
$ret=`mv "$BUILDROOT/${FILENAMEDEB}_all.deb" "$DESTI/${FILENAMEDEB}_all.deb"`;
print "Move ${FILENAMEDEB}.deb to $DESTI/${FILENAMEDEB}.deb\n";
$ret=`mv "$BUILDROOT/${FILENAMEDEB}.deb" "$DESTI/${FILENAMEDEB}.deb"`;
}
next;
}

6
htdocs/compta/bank/rappro.php
View File

@ -22,7 +22,7 @@
* \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.66 2011/07/20 19:03:31 eldy Exp $
*/
require("./pre.inc.php");
@ -162,7 +162,7 @@ if ($resql)
$numr=$db->num_rows($resqlr);
$i=0;
while (($i < $numr) && ($i < $nbmax))
{
{print $sql;
$objr = $db->fetch_object($resqlr);
$last_releve = $objr->num_releve;
$i++;
@ -403,5 +403,5 @@ else
$db->close();
llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
llxFooter('$Date: 2011/07/20 19:03:31 $ - $Revision: 1.66 $');
?>

23
htdocs/compta/index.php
View File

@ -22,7 +22,7 @@
* \file htdocs/compta/index.php
* \ingroup compta
* \brief Main page of accountancy area
* \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
* \version $Id: index.php,v 1.182 2011/06/30 21:53:02 eldy Exp $
*/
require('../main.inc.php');
@ -100,7 +100,12 @@ print_fiche_titre($langs->trans("AccountancyTreasuryArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr>';
print '<td valign="top" width="30%" class="notopnoleft">';
if (($conf->facture->enabled && $user->rights->facture->lire) ||
($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire))
{
print '<td valign="top" width="30%" class="notopnoleft">';
}
$max=3;
@ -316,8 +321,16 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
}
}
print '</td>';
print '<td valign="top" width="70%" class="notopnoleftnoright">';
if (($conf->facture->enabled && $user->rights->facture->lire) ||
($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
{
print '</td>';
print '<td valign="top" width="70%" class="notopnoleftnoright">';
}
else
{
print '<td valign="top" width="100%" class="notopnoleftnoright">';
}
// Last modified customer invoices
if ($conf->facture->enabled && $user->rights->facture->lire)
@ -1032,5 +1045,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $');
llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.182 $');
?>