Restore stable version to allow 3.1 branch creation
This commit is contained in:
parent
8fa846f0d5
commit
c3fda2f810
@ -2,7 +2,7 @@
|
|||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
# \file build/makepack-dolibarr.pl
|
# \file build/makepack-dolibarr.pl
|
||||||
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
||||||
# \version $Id: makepack-dolibarr.pl,v 1.139 2011/08/07 23:44:55 eldy Exp $
|
# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $
|
||||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake
|
|||||||
|
|
||||||
|
|
||||||
use vars qw/ $REVISION $VERSION /;
|
use vars qw/ $REVISION $VERSION /;
|
||||||
$REVISION='$Revision: 1.139 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||||
$VERSION="3.1 (build $REVISION)";
|
$VERSION="3.1 (build $REVISION)";
|
||||||
|
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ else {
|
|||||||
my $NUM_SCRIPT;
|
my $NUM_SCRIPT;
|
||||||
while (! $found) {
|
while (! $found) {
|
||||||
my $cpt=0;
|
my $cpt=0;
|
||||||
printf(" %2d - %-12s (%s)\n",$cpt,"All (Except SNAPSHOT)","Need ".join(",",values %REQUIREMENTTARGET));
|
printf(" %2d - %-12s (%s)\n",$cpt,"All","Need ".join(",",values %REQUIREMENTTARGET));
|
||||||
foreach my $target (@LISTETARGET) {
|
foreach my $target (@LISTETARGET) {
|
||||||
$cpt++;
|
$cpt++;
|
||||||
printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
|
printf(" %2d - %-12s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
|
||||||
@ -157,7 +157,7 @@ else {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
foreach my $key (@LISTETARGET) {
|
foreach my $key (@LISTETARGET) {
|
||||||
if ($key ne 'SNAPSHOT') { $CHOOSEDTARGET{$key}=1; }
|
$CHOOSEDTARGET{$key}=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -615,8 +615,6 @@ if ($nboftargetok) {
|
|||||||
|
|
||||||
#rmdir "$BUILDROOT/$PROJECT.tmp";
|
#rmdir "$BUILDROOT/$PROJECT.tmp";
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
|
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
|
||||||
$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
|
|
||||||
|
|
||||||
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
|
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share\n";
|
||||||
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
|
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share"`;
|
||||||
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
|
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
|
||||||
@ -824,7 +822,7 @@ if ($nboftargetok) {
|
|||||||
$ret=`$cmd`;
|
$ret=`$cmd`;
|
||||||
|
|
||||||
# Creation of source package
|
# Creation of source package
|
||||||
print "Go to directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
|
print "Go to directory $BUILDROOT\n";
|
||||||
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
|
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
|
||||||
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
|
||||||
$cmd="dpkg-buildpackage -us -uc";
|
$cmd="dpkg-buildpackage -us -uc";
|
||||||
|
|||||||
@ -19,9 +19,10 @@ beta version of Dolibarr, step by step.
|
|||||||
- Add a CVS Tag (DOLIBARR_x_y_BETA)
|
- Add a CVS Tag (DOLIBARR_x_y_BETA)
|
||||||
- Create a branch (DOLIBARR_x_y_BRANCH).
|
- Create a branch (DOLIBARR_x_y_BRANCH).
|
||||||
|
|
||||||
- Run makepack-dolibarr.pl to generate all packages.
|
- Update the CVS on server that build automatically the tgz beta package
|
||||||
- Enable the category that point to the beta files on joomla
|
or build Dolibarr and DoliWamp with makepack-dolibarr.pl
|
||||||
web site www.dolibarr.org
|
- Enable entries on joomla web site www.dolibarr.org with links
|
||||||
|
that point to that file ("Dolibarr CVS snapshot of current beta").
|
||||||
|
|
||||||
- Post a news on dolibarr.org/dolibarr.fr
|
- Post a news on dolibarr.org/dolibarr.fr
|
||||||
- Send mail on mailings-list
|
- Send mail on mailings-list
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user