lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Update doc and packager for doliwamp

Browse Source 
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
This commit is contained in:
Laurent Destailleur 2013-12-31 15:41:25 +01:00
parent 7fc052ce19
commit 0e54780377
12 changed files with 1088 additions and 1062 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2,6 +2,13 @@
English Dolibarr ChangeLog English Dolibarr ChangeLog
-------------------------------------------------------------- --------------------------------------------------------------
***** ChangeLog for 3.3.5 compared to 3.3.4 *****
- Fix: jcrop file to match debian rules
- Fix: Add missing country UK.
- Fix: Minor fix into package.
- Fix: Add missing label on project field.
***** ChangeLog for 3.3.4 compared to 3.3.3 ***** ***** ChangeLog for 3.3.4 compared to 3.3.3 *****
- Fix: [ bug #1001 ] Social Contribution : State not correct - Fix: [ bug #1001 ] Social Contribution : State not correct

70
build/README
View File

@ -7,10 +7,27 @@ All sub-directories of "build" directory contains files required to build
automatically Dolibarr packages. automatically Dolibarr packages.
There are several tools: There are several tools:
- To build full Dolibarr packages, launch the script - To build full Dolibarr packages, launch the script
> Edit version in makepack-dolibarr.pl file.
> Launch command perl makepack-dolibarr.pl > 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 - To build a translaction package, launch the script
> perl makepack-dolibarrlang.pl > perl makepack-dolibarrlang.pl
@ -20,17 +37,6 @@ There are several tools:
- To build a package for a module, launch the script - To build a package for a module, launch the script
> perl makepack-dolibarrmodule.pl > 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 - To build developper documentation, launch the script
> perl dolybarr-doxygen-build.pl > 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: We can find in "build", following sub-directories:
* deb: * aps:
To build APS package.
* debian:
To build Debian package. 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: * exe:
To build exe package for Windows that distribute Dolibarr sources or To build exe package for Windows that distribute Dolibarr sources or
to build the complete DoliWamp package. 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: * pad:
To build a PAD file descriptor to promote/describe Dolibarr releases. 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: * patch:
Script file to generate a patch file to distribute a Dolibarr mod. 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.

4
build/debian/changelog
View File

@ -1,6 +1,6 @@
dolibarr (3.3.4) unstable; urgency=low dolibarr (3.3.5) unstable; urgency=low
[ Laurent Destailleur (eldy) ] [ Laurent Destailleur (eldy) ]
* New upstream release. * New upstream release.
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 22 Apr 2013 12:00:00 +0100 -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Mon, 30 Dec 2013 12:00:00 +0100

2041
build/exe/doliwamp/doliwamp.iss
View File

File diff suppressed because it is too large Load Diff

2
build/makepack-dolibarr.pl
View File

@ -10,7 +10,7 @@ use Cwd;
$PROJECT="dolibarr"; $PROJECT="dolibarr";
$MAJOR="3"; $MAJOR="3";
$MINOR="3"; $MINOR="3";
$BUILD="4"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $BUILD="5"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$RPMSUBVERSION="auto"; # auto use value found into BUILD $RPMSUBVERSION="auto"; # auto use value found into BUILD
@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages

8
build/pad/pad_dolibarr.xml
View File

@ -34,10 +34,10 @@
</Company_Info> </Company_Info>
<Program_Info> <Program_Info>
<Program_Name>Dolibarr</Program_Name> <Program_Name>Dolibarr</Program_Name>
<Program_Version>3.3.2</Program_Version> <Program_Version>3.3.5</Program_Version>
<Program_Release_Month>05</Program_Release_Month> <Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>17</Program_Release_Day> <Program_Release_Day>01</Program_Release_Day>
<Program_Release_Year>2013</Program_Release_Year> <Program_Release_Year>2014</Program_Release_Year>
<Program_Cost_Dollars /> <Program_Cost_Dollars />
<Program_Cost_Other_Code /> <Program_Cost_Other_Code />
<Program_Cost_Other /> <Program_Cost_Other />

8
build/pad/pad_doliwamp.xml
View File

@ -34,10 +34,10 @@
</Company_Info> </Company_Info>
<Program_Info> <Program_Info>
<Program_Name>DoliWamp</Program_Name> <Program_Name>DoliWamp</Program_Name>
<Program_Version>3.3.2</Program_Version> <Program_Version>3.3.5</Program_Version>
<Program_Release_Month>05</Program_Release_Month> <Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>17</Program_Release_Day> <Program_Release_Day>01</Program_Release_Day>
<Program_Release_Year>2013</Program_Release_Year> <Program_Release_Year>2014</Program_Release_Year>
<Program_Cost_Dollars /> <Program_Cost_Dollars />
<Program_Cost_Other_Code /> <Program_Cost_Other_Code />
<Program_Cost_Other /> <Program_Cost_Other />

2
build/rpm/dolibarr_fedora.spec
View File

@ -335,5 +335,5 @@ fi
%changelog %changelog
* Mon Apr 22 2013 Laurent Destailleur 3.3.4-0.3 * Mon Apr 22 2013 Laurent Destailleur 3.3.5-0.3
- Initial version (#723326) - Initial version (#723326)

2
build/rpm/dolibarr_generic.spec
View File

@ -548,5 +548,5 @@ fi
%changelog %changelog
* Mon Apr 22 2013 Laurent Destailleur 3.3.4-0.3 * Mon Apr 22 2013 Laurent Destailleur 3.3.5-0.3
- Initial version (#723326) - Initial version (#723326)

2
build/rpm/dolibarr_mandriva.spec
View File

@ -333,5 +333,5 @@ fi
%changelog %changelog
* Mon Apr 22 2013 Laurent Destailleur 3.3.4-0.3 * Mon Apr 22 2013 Laurent Destailleur 3.3.5-0.3
- Initial version (#723326) - Initial version (#723326)

2
build/rpm/dolibarr_opensuse.spec
View File

@ -342,5 +342,5 @@ fi
%changelog %changelog
* Mon Apr 22 2013 Laurent Destailleur 3.3.4-0.3 * Mon Apr 22 2013 Laurent Destailleur 3.3.5-0.3
- Initial version (#723326) - Initial version (#723326)

2
htdocs/filefunc.inc.php
View File

@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php * \brief File that include conf.php file and commons lib like functions.lib.php
*/ */
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.4'); if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.5');
if (! defined('EURO')) define('EURO',chr(128)); if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants // Define syslog constants