From 2187f3fda78398af546a5a8758510988911a98bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Apr 2012 15:38:29 +0200
Subject: [PATCH 1/2] Fix: Bad case

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index f1d7bed8418..d2226bcb871 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -24,7 +24,7 @@ $RPMSUBVERSION="auto";	# auto use value found into BUILD
 "RPM_OPENSUSE"=>"rpmbuild",
 "DEB"=>"dpkg",
 "APS"=>"zip",
-"EXEDOLIWAMP"=>"iscc.exe"
+"EXEDOLIWAMP"=>"ISCC.exe"
 );
 %ALTERNATEPATH=(
 "7z"=>"7-ZIP",

From 0f20381453f56c399dfa79422678e6c050c338e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Apr 2012 17:16:07 +0200
Subject: [PATCH 2/2] Fix: Script to build package for doliwamp is now ok.

---
 build/exe/doliwamp/doliwamp.iss |  3 ++-
 build/makepack-dolibarr.pl      | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index d0191e7f785..4e77d880df0 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -22,7 +22,8 @@ AppVerName=DoliWamp-3.2.0-beta
 OutputBaseFilename=DoliWamp-3.2.0-beta
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-SourceDir=c:\Documents and Settings\ldestail\git\dolibarr
+;SourceDir=C:\Documents and Settings\ldestail\git\dolibarrold
+SourceDir=Z:\home\ldestail\git\dolibarrold
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index d2226bcb871..e991273597f 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -38,7 +38,7 @@ $FILENAMEZIP="$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION";
 $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}";
 $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app";
-$FILENAMEEXEDOLIWAMP="$PROJECT-$MAJOR.$MINOR.$BUILD";
+$FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD";
 if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat
 if (-d "/usr/src/RPM")    { $RPMDIR="/usr/src/RPM"; } # mandrake
 
@@ -763,8 +763,10 @@ if ($nboftargetok) {
      		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
     		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
  
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$cmd= "iscc.exe \"$SOURCE\\build\\exe\\doliwamp\\doliwamp.iss\"";
+ 			$SOURCEBACK=$SOURCE;
+ 			$SOURCEBACK =~ s/\//\\/g;
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";
@@ -772,6 +774,8 @@ if ($nboftargetok) {
     		# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
     		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
+            print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
+            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
     		next;
     	}
     }