From 956215fc0ab85fa43a47de8bfafe18f33583b6a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 Apr 2012 17:16:07 +0200
Subject: [PATCH] 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 ba3332f1e2b..a1c9ac3c33a 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -22,7 +22,8 @@ AppVerName=DoliWamp-3.3.0-alpha
OutputBaseFilename=DoliWamp-3.3.0-alpha
; 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 7fdb6927509..8f6aadbd010 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;
}
}
--
GitLab