Fix: Update doc and packager for doliwamp

Conflicts:
	build/exe/doliwamp/doliwamp.iss

build/README

@@ -7,10 +7,27 @@ All sub-directories of "build" directory contains files required to build
 automatically Dolibarr packages.
 There are several tools:
 
+
+
 - To build full Dolibarr packages, launch the script
-> Edit version in makepack-dolibarr.pl file.
 > Launch command perl makepack-dolibarr.pl
 
+Note: Prerequisites to build tgz, debian, rpm package
+> apt-get install tar dpkg dpatch p7zip-full rpm zip
+
+Note: Prerequisites to build autoexe DoliWamp package:
+> Install InnoSetup
+   For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
+> Install WampServer into "C:\Program Files\Wamp"
+   For example by running wampserver2.2e-php5.4.3-httpd-2.4.2-mysql5.5.24-x64.exe (http://www.wampserver.com)
+> Install WampServer addon to have versions: Apache2.2.11, Mysql5.0.45, Php5.3.0
+   For example by running WampServer2-APACHE2211.exe (http://www.wampserver.com)
+   For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
+   For example by running WampServer2-PHP530.exe (http://www.wampserver.com)
+> To build from Windows (running from makepack-dolibarr.pl script is however
+  recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
+  The .exe file will be build into directory build.
+
 - To build a translaction package, launch the script
 > perl makepack-dolibarrlang.pl
 
@@ -20,17 +37,6 @@ There are several tools:
 - To build a package for a module, launch the script
 > perl makepack-dolibarrmodule.pl
 
-- To build an autoexe DoliWamp package:
-> Install InnoSetup (http://www.jrsoftware.org)
-> Install WampServer into "C:\Program Files\Wamp" (http://www.wampserver.com)
-> Install WampServer addon to have versions:
-   Apache2.2.6, Mysql5.0.45, Php5.2.5
-> Modify file build/exe/doliwamp.iss to change variable SourceDir
-  with value of Dolibarr repository.
-> Modify AppVerName and OutputBaseFilename.
-> Launch innosetup, open file build/exe/doliwamp.iss and click on
-  button "Compile". The .exe file will be build into directory build.
-
 - To build developper documentation, launch the script
 > perl dolybarr-doxygen-build.pl
 
@@ -43,24 +49,33 @@ generated packages will not contains this "build" directory.
 
 We can find in "build", following sub-directories:
 
-* deb:
+* aps:
+To build APS package.
+
+* debian:
 To build Debian package.
 
-* rpm:
+* dmg:
-To build Redhat or Mandrake package.
+To build Mac OS package (not ready yet).
 
-* tgz:
+* doap:
-To build a tgz package.
+To build Doap descriptor to promote/describe Dolibarr releases.
+
+* doxygen:
+Dir with config file to build doxygen documentation.
 
 * exe:
 To build exe package for Windows that distribute Dolibarr sources or
 to build the complete DoliWamp package.
 
-* tgz:
+* launchpad:
-To build a zip package.
+Doc file to explain how to use launchpad.
 
-* doap:
+* live:
-To build Doap descriptor to promote/describe Dolibarr releases.
+Doc file to explain how to create a demo live CD.
+
+* obs:
+Doc file to explain how to push release onto OBS.
 
 * pad:
 To build a PAD file descriptor to promote/describe Dolibarr releases.
@@ -68,5 +83,14 @@ To build a PAD file descriptor to promote/describe Dolibarr releases.
 * patch:
 Script file to generate a patch file to distribute a Dolibarr mod.
 
-* dmg:
+* perl:
-To build dmg DoliMamp package for Mac OS X
+Tool to install dolibarr when using virtualmin pro
+
+* rpm:
+To build Redhat, Opensuse or Mandriva package.
+
+* tgz:
+To build a tgz package.
+
+* zip:
+To build a zip package.

build/exe/doliwamp/doliwamp.iss

@@ -20,12 +20,12 @@ AppName=DoliWamp
 AppVerName=DoliWamp-3.5.0-beta
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
 OutputBaseFilename=DoliWamp-3.5.0-beta
-; Define full path from wich all relative path are defined
+; ----- End of change
+;OutputManifestFile=build\doliwampbuild.log
+; Define full path from which all relative path are defined
 ; You must modify this to put here your dolibarr root directory
 ;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
 SourceDir=..\..\..
-; ----- End of change
-;OutputManifestFile=build\doliwampbuild.log
 AppId=doliwamp
 AppPublisher=NLTechno
 AppPublisherURL=http://www.nltechno.com
@@ -51,7 +51,6 @@ CreateUninstallRegKey=yes
 OutputDir=build
 ShowLanguageDialog=auto
 ShowUndisplayableLanguages=no
-;LanguageDetectionMethod=none
 LanguageDetectionMethod=uilanguage
 ;SignedUninstaller=yes