From c317691574365a97042e14fe386f1b7504b42fce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 3 Dec 2009 18:39:51 +0000
Subject: [PATCH] Backport after release
---
build/doap/doap_dolibarr.rdf | 2 +-
build/exe/doliwamp/rundolihelp.bat.install | 1 +
build/makepack-dolibarr.pl | 7 ++++---
build/tgz/tar_exclude.txt | 3 ++-
build/zip/zip_exclude.txt | 3 ++-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/build/doap/doap_dolibarr.rdf b/build/doap/doap_dolibarr.rdf
index 17d4c9caad1..9172795be28 100644
--- a/build/doap/doap_dolibarr.rdf
+++ b/build/doap/doap_dolibarr.rdf
@@ -48,7 +48,7 @@
<release>
<Version>
<name>stable</name>
- <created>2009-10-20</created>
+ <created>2009-12-01</created>
<revision>2.7</revision>
</Version>
</release>
diff --git a/build/exe/doliwamp/rundolihelp.bat.install b/build/exe/doliwamp/rundolihelp.bat.install
index 2bb46aa6dba..eed5346de9f 100644
--- a/build/exe/doliwamp/rundolihelp.bat.install
+++ b/build/exe/doliwamp/rundolihelp.bat.install
@@ -3,4 +3,5 @@ REM Launch Dolibarr Help center
REM ---------------------------
REM Go to help center page
+echo Please wait...
start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index ef4779e1db4..fc0fbd4c32a 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -62,15 +62,16 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
$SOURCE="$DIR/..";
$DESTI="$SOURCE/build";
+
# Detect OS type
# --------------
if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
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 "makepack-dolibarr.pl aborted.\n";
+ print "$PROG.$Extension aborted.\n";
sleep 2;
exit 1;
}
@@ -90,7 +91,7 @@ if ($OS =~ /windows/) {
if (! $TEMP || ! -d $TEMP) {
print "Error: A temporary directory can not be find.\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;
exit 2;
}
diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt
index 37fe5187370..39f342877fb 100644
--- a/build/tgz/tar_exclude.txt
+++ b/build/tgz/tar_exclude.txt
@@ -84,4 +84,5 @@ tourteau
bulot
huitre
pdf_huitre.modules.php
-doxygen_warnings.log
\ No newline at end of file
+doxygen_warnings.log
+dolibarr_install.log
\ No newline at end of file
diff --git a/build/zip/zip_exclude.txt b/build/zip/zip_exclude.txt
index 945524b5cf2..83cd82460ba 100644
--- a/build/zip/zip_exclude.txt
+++ b/build/zip/zip_exclude.txt
@@ -80,4 +80,5 @@ cvschangelogbuilder_dolibarr*
*/bulot/*
*/huitre/*
*/pdf_huitre.modules.php
-doxygen_warnings.log
\ No newline at end of file
+doxygen_warnings.log
+dolibarr_install.log
\ No newline at end of file
--
GitLab