Backport after release
This commit is contained in:
parent
2f3e77ff93
commit
c317691574
@ -48,7 +48,7 @@
|
|||||||
<release>
|
<release>
|
||||||
<Version>
|
<Version>
|
||||||
<name>stable</name>
|
<name>stable</name>
|
||||||
<created>2009-10-20</created>
|
<created>2009-12-01</created>
|
||||||
<revision>2.7</revision>
|
<revision>2.7</revision>
|
||||||
</Version>
|
</Version>
|
||||||
</release>
|
</release>
|
||||||
|
|||||||
@ -3,4 +3,5 @@ REM Launch Dolibarr Help center
|
|||||||
REM ---------------------------
|
REM ---------------------------
|
||||||
|
|
||||||
REM Go to help center page
|
REM Go to help center page
|
||||||
|
echo Please wait...
|
||||||
start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
|
start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
|
||||||
|
|||||||
@ -62,15 +62,16 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
|
|||||||
$SOURCE="$DIR/..";
|
$SOURCE="$DIR/..";
|
||||||
$DESTI="$SOURCE/build";
|
$DESTI="$SOURCE/build";
|
||||||
|
|
||||||
|
|
||||||
# Detect OS type
|
# Detect OS type
|
||||||
# --------------
|
# --------------
|
||||||
if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
|
if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
|
||||||
elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
|
elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
|
||||||
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
|
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
|
||||||
if (! $OS) {
|
if (! $OS) {
|
||||||
print "makepack-dolbarr.pl was not able to detect your OS.\n";
|
print "$PROG.$Extension was not able to detect your OS.\n";
|
||||||
print "Can't continue.\n";
|
print "Can't continue.\n";
|
||||||
print "makepack-dolibarr.pl aborted.\n";
|
print "$PROG.$Extension aborted.\n";
|
||||||
sleep 2;
|
sleep 2;
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
@ -90,7 +91,7 @@ if ($OS =~ /windows/) {
|
|||||||
if (! $TEMP || ! -d $TEMP) {
|
if (! $TEMP || ! -d $TEMP) {
|
||||||
print "Error: A temporary directory can not be find.\n";
|
print "Error: A temporary directory can not be find.\n";
|
||||||
print "Check that TEMP or TMP environment variable is set correctly.\n";
|
print "Check that TEMP or TMP environment variable is set correctly.\n";
|
||||||
print "makepack-dolibarr.pl aborted.\n";
|
print "$PROG.$Extension aborted.\n";
|
||||||
sleep 2;
|
sleep 2;
|
||||||
exit 2;
|
exit 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -84,4 +84,5 @@ tourteau
|
|||||||
bulot
|
bulot
|
||||||
huitre
|
huitre
|
||||||
pdf_huitre.modules.php
|
pdf_huitre.modules.php
|
||||||
doxygen_warnings.log
|
doxygen_warnings.log
|
||||||
|
dolibarr_install.log
|
||||||
@ -80,4 +80,5 @@ cvschangelogbuilder_dolibarr*
|
|||||||
*/bulot/*
|
*/bulot/*
|
||||||
*/huitre/*
|
*/huitre/*
|
||||||
*/pdf_huitre.modules.php
|
*/pdf_huitre.modules.php
|
||||||
doxygen_warnings.log
|
doxygen_warnings.log
|
||||||
|
dolibarr_install.log
|
||||||
Loading…
Reference in New Issue
Block a user