diff --git a/build/debian/compat b/build/debian/compat deleted file mode 100644 index 9a037142aa3..00000000000 --- a/build/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 \ No newline at end of file diff --git a/build/debian/po/POTFILES.in b/build/debian/po/POTFILES.in deleted file mode 100644 index 40130aadd20..00000000000 --- a/build/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] dolibarr.templates \ No newline at end of file diff --git a/build/debian/source/format b/build/debian/source/format deleted file mode 100644 index 46ebe026659..00000000000 --- a/build/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) \ No newline at end of file diff --git a/build/flatpack/org.flatpak.Dolibarr.json b/build/flatpack/org.flatpak.Dolibarr.json deleted file mode 100644 index 69140d32372..00000000000 --- a/build/flatpack/org.flatpak.Dolibarr.json +++ /dev/null @@ -1 +0,0 @@ -"Help wanted..." \ No newline at end of file diff --git a/build/.gitignore b/dev/build/.gitignore similarity index 100% rename from build/.gitignore rename to dev/build/.gitignore diff --git a/build/README b/dev/build/README similarity index 98% rename from build/README rename to dev/build/README index dc9c743175f..549937881b3 100644 --- a/build/README +++ b/dev/build/README @@ -7,7 +7,7 @@ Building packages ################################################## All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages. -The build directory and all its contents is absolutely not required to make Dolibarr working. +The build directory and all its contents is absolutely not required to make Dolibarr working. It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory. @@ -21,7 +21,7 @@ There are several tools: See makepack-howto.txt for prerequisites. -------------------------------------------------------------------------------------------------- - + - To build a theme package, launch the script > perl makepack-dolibarrtheme.pl diff --git a/build/composer/README b/dev/build/composer/README similarity index 97% rename from build/composer/README rename to dev/build/composer/README index 5d39336a337..6595b9200cf 100644 --- a/build/composer/README +++ b/dev/build/composer/README @@ -5,7 +5,7 @@ update-alternatives --config php -* To list packages +* To list packages cd htdocs/includes/diroflib composer install @@ -37,4 +37,3 @@ Edit composer.json to change version to "x.y.z" composer -v update --root-reqs --no-dev --ignore-platform-reqs composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp - diff --git a/build/debian/README.Debian b/dev/build/debian/README.Debian similarity index 100% rename from build/debian/README.Debian rename to dev/build/debian/README.Debian diff --git a/build/debian/README.howto b/dev/build/debian/README.howto similarity index 95% rename from build/debian/README.howto rename to dev/build/debian/README.howto index f01add2f013..1e8e6d56d7a 100644 --- a/build/debian/README.howto +++ b/dev/build/debian/README.howto @@ -43,16 +43,16 @@ END # Complete .bashrc with DEBEMAIL and DEBFULLNAME Example: -export DEBFULLNAME="Laurent Destailleur (eldy)" +export DEBFULLNAME="Laurent Destailleur (eldy)" export DEBEMAIL=eldy@users.sourceforge.net Other example: -export DEBFULLNAME="Laurent Destailleur" +export DEBFULLNAME="Laurent Destailleur" export DEBEMAIL="eldy@destailleur.fr" export QUILT_PATCHES=debian/patches -# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public +# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public * Create an account login * Update your ~/.ssh/config file to add: Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org @@ -72,10 +72,10 @@ export QUILT_PATCHES=debian/patches # podebconf-report-po --from email@email.com To send email to ask translations # Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete # msgfmt -v -c -o /dev/null XX.po To have status of translation for language XX - + # To check package integrity -# lintian --pedantic -E -I package.deb To test a binary package -# lintian --pedantic -E -I package.dsc To test a source package +# lintian --pedantic -E -I package.deb To test a binary package +# lintian --pedantic -E -I package.dsc To test a source package # To manipulate packages # dpkg -l List all packages @@ -84,7 +84,7 @@ export QUILT_PATCHES=debian/patches # dpkg -I package.deb Give information on package # dpkg -i package.deb Install a package # dpkg-reconfigure -plow package Reconfigure package -# dpkg -L packagename List content of installed package +# dpkg -L packagename List content of installed package # dpkg -r packagename Remove config files and interactive saved answers # dpkg -s packagename Give status of installed package # dpkg --purge Remove config files and interactive saved answers @@ -104,9 +104,9 @@ See page https://www.debian.org/devel/wnpp/#l1 for example of ITP requests conte - Wait until you received bug number. For first ITP submission of Dolibarr, bug id was 634783. -- Check bug is into database by searching with id on +- Check bug is into database by searching with id on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783 - + - Add a line for upstream into file changelog with bug number - Call for a mentor on ML debian-mentors to upload packages @@ -129,26 +129,26 @@ To set status of a bug to "pending" > bts --smtp-host=yoursmtpserver tag 999999 +pending or replay to email 999999@bugs.debian.org + submitter of bug -With a message starting with: +With a message starting with: Control: tag -1 +pending Thanks. Fixed into git. or replay to email control@bugs.debian.org -With only message +With only message tag 729538 +pending To remove status of a bug without "moreinfo" (bug can be processed) or replay to email 999999@bugs.debian.org + submitter of bug -With a message starting with: +With a message starting with: Control: tag -1 -moreinfo Thanks. Fixed into git. or replay to email control@bugs.debian.org -With only message +With only message tag 729538 -moreinfo @@ -172,7 +172,7 @@ Pour lister les env chroot or > ls /srv/chroot -Puis pour se connecter et préparer l'environnement +Puis pour se connecter et préparer l'environnement > schroot -c name_of_chroot (example schroot -c unstable-amd64-sbuild) > cat /etc/debian_chroot to check which debian branch we are into > apt-get install vim dialog @@ -212,7 +212,7 @@ or better * You can then create a PHP project from Eclipse called tcpdf-debian from git clone dir and make link to git. - + * If local branch upstream and pristine-tar does not exists, create it from origin/upstream and origin/pristine. @@ -220,7 +220,7 @@ from origin/upstream and origin/pristine. > debian/get-orig-source.sh If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this. -* Some files are removed from archive by the get-orig-source.sh +* Some files are removed from archive by the get-orig-source.sh * Modify the tag file to replace sRGB.icc with correct free version and rename file into tcpdf_x.y.z+dfsgw.orig.tar.xz @@ -243,14 +243,14 @@ Warning: Date must have format reported by "date -R" Warning: Name and email must match value into debian/control file (Entry added here is used by next step). * We try to build package -> rm -fr ../build-area; +> rm -fr ../build-area; > git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-x.y.z] ou > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z] Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x] Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file -Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match +Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match Note: Package is built into directory ../build-area Note: To compare 2 packages: debdiff package1.dsc package2.dsc @@ -297,7 +297,7 @@ from origin/upstream and origin/pristine. > debian/get-orig-source.sh If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this. -* Edit orig.tar.gz file to remove +* Edit orig.tar.gz file to remove - debian - htdocs/includes/ckeditor - htdocs/includes/jquery/css @@ -311,7 +311,7 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER - htdocs/includes/restler/framework/Luracast/Restler/explorer - htdocs/includes/swiftmailer - htdocs/includes/tcpdf or htdocs/includes/tecnickcom -And rename file into +And rename file into dolibarr-x.y.z+dfsgw.tgz (x.y.z = version, w start from 1 and is increased for each new git-import-orig already done) @@ -343,7 +343,7 @@ To update dolibarr debian package when only files into debian has changed: To update dolibarr debian package when only files not into debian has changed: -* Checkout the branch you want to work on: master of debian/... +* Checkout the branch you want to work on: master of debian/... * Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch" * You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch. * Update the debian/changelog to add entry of change. @@ -358,7 +358,7 @@ ou Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5] Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file -Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match +Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match Note: Package is built into directory ../build-area Note: To compare 2 packages: debdiff package1.dsc package2.dsc @@ -382,7 +382,7 @@ Note: If there was errors managed manually, you may need to make a git commit bu * Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at: http://ftp-master.debian.org/new/ - + * Once package is validated, you should see it into area unstable at: http://packages.qa.debian.org @@ -390,7 +390,7 @@ http://packages.qa.debian.org -##### Send an unblock request to make a full update of a stable package +##### Send an unblock request to make a full update of a stable package Use this to move from unstable to testing. @@ -402,7 +402,7 @@ Fill message, for example: "Please unblock package dolibarr A security error CVE-2015-3935 was reported and is fixed into package 3.5.7. Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security, -so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. +so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. After discussion with ..., it appears that security holes are enough to request this unblock request." @@ -423,14 +423,14 @@ Pro are: - Patches were already tested because deployed and used by several thousands of users. - It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version. - Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged) -Cons are: +Cons are: - The patch include more than the only one security reported fixes So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs, since it provides more stability and is for me a more secured process. " -##### Send an request to ask a simple fix of a stable package +##### Send an request to ask a simple fix of a stable package Use this to ask to apply patches on a stable version. @@ -442,7 +442,7 @@ Fill message, for example: "Please unblock package dolibarr A security error CVE-2015-3935 was reported and is fixed into package 3.5.7. Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security, -so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. +so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. After discussion with ..., it appears that security holes are enough to request this unblock request." Note: If there is a response to ask more information, don't forget to remove the tag during answer. diff --git a/build/debian/apache/.htaccess b/dev/build/debian/apache/.htaccess similarity index 100% rename from build/debian/apache/.htaccess rename to dev/build/debian/apache/.htaccess diff --git a/build/debian/apache/dolibarr.conf b/dev/build/debian/apache/dolibarr.conf similarity index 100% rename from build/debian/apache/dolibarr.conf rename to dev/build/debian/apache/dolibarr.conf diff --git a/build/debian/changelog b/dev/build/debian/changelog similarity index 81% rename from build/debian/changelog rename to dev/build/debian/changelog index 326405a6d2b..7ad3facc917 100644 --- a/build/debian/changelog +++ b/dev/build/debian/changelog @@ -2,5 +2,5 @@ dolibarr (__VERSION__) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 12 May 2015 12:00:00 +0100 + + -- Laurent Destailleur (eldy) Tue, 12 May 2015 12:00:00 +0100 diff --git a/dev/build/debian/compat b/dev/build/debian/compat new file mode 100644 index 00000000000..f599e28b8ab --- /dev/null +++ b/dev/build/debian/compat @@ -0,0 +1 @@ +10 diff --git a/build/debian/conf.php.install b/dev/build/debian/conf.php.install similarity index 99% rename from build/debian/conf.php.install rename to dev/build/debian/conf.php.install index c373664deef..0d5cd22ad53 100644 --- a/build/debian/conf.php.install +++ b/dev/build/debian/conf.php.install @@ -137,7 +137,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci'; # Default value: dolibarr # Possible values: Any values found in files in htdocs/core/login directory after # the "function_" string and before the ".php" string. You can also separate several -# values using a ",". In this case, Dolibarr will check login/pass for each value in +# values using a ",". In this case, Dolibarr will check login/pass for each value in # order defined into value. However, note that this can't work with all values. # Examples: # $dolibarr_main_authentication='http'; @@ -235,4 +235,3 @@ $dolibarr_main_prod='0'; # dolibarr_main_distrib # A key to identify the distribution used for first installation $dolibarr_main_distrib = 'debian'; - diff --git a/build/debian/control b/dev/build/debian/control similarity index 97% rename from build/debian/control rename to dev/build/debian/control index b2890253b32..73a9bc0f68c 100644 --- a/build/debian/control +++ b/dev/build/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.6 Homepage: https://www.dolibarr.org Build-Depends: debhelper (>= 9), po-debconf # This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version - + Package: dolibarr Architecture: all # For debian 7 or 8 or 9 @@ -35,8 +35,8 @@ Recommends: apache2 | lighttpd | httpd, php-xml, php-mbstring, php-intl Suggests: www-browser, php5-geoip Description: Web based software to manage a company or foundation - Dolibarr ERP & CRM is an easy to use open source/free software package for - companies, foundations or freelances. It includes different + Dolibarr ERP & CRM is an easy to use open source/free software package for + companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. . diff --git a/build/debian/copyright b/dev/build/debian/copyright similarity index 99% rename from build/debian/copyright rename to dev/build/debian/copyright index 5f1b73d9b64..719e6dc5de0 100644 --- a/build/debian/copyright +++ b/dev/build/debian/copyright @@ -38,7 +38,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville 2011, Herve Prot 2011, Remy Younes 2012-2013, Christophe Battarel - + License: GPL-3+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -147,7 +147,7 @@ Comments: ------------------------------------------------------------ Files: doc/images/* -Copyright: Laurent Destailleur +Copyright: Laurent Destailleur License: CC-BY-SA-3.0 You are free: to Share (to copy, distribute and transmit the work) and @@ -306,7 +306,7 @@ Comment: Files: htdocs/includes/odtphp/* Copyright: 2008, Julien Pauli - 2008, Cyril PIERRE de GEYER + 2008, Cyril PIERRE de GEYER 2010, Laurent Destailleur License: GPL-2+ This program is free software; you can redistribute it diff --git a/build/debian/dolibarr.config b/dev/build/debian/dolibarr.config old mode 100644 new mode 100755 similarity index 100% rename from build/debian/dolibarr.config rename to dev/build/debian/dolibarr.config diff --git a/build/debian/dolibarr.desktop b/dev/build/debian/dolibarr.desktop similarity index 97% rename from build/debian/dolibarr.desktop rename to dev/build/debian/dolibarr.desktop index dd59be792d2..99a941d8831 100644 --- a/build/debian/dolibarr.desktop +++ b/dev/build/debian/dolibarr.desktop @@ -12,7 +12,7 @@ Comment[es]=Software para gestión de PYMES, profesionales independientes, auto Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL -# For Fedora: xdg-open +# For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) Exec=xdg-open http://localhost/dolibarr diff --git a/build/debian/dolibarr.docs b/dev/build/debian/dolibarr.docs similarity index 100% rename from build/debian/dolibarr.docs rename to dev/build/debian/dolibarr.docs diff --git a/build/debian/dolibarr.install b/dev/build/debian/dolibarr.install similarity index 91% rename from build/debian/dolibarr.install rename to dev/build/debian/dolibarr.install index a49ad442eb5..331be0333e3 100644 --- a/build/debian/dolibarr.install +++ b/dev/build/debian/dolibarr.install @@ -8,4 +8,4 @@ htdocs usr/share/dolibarr/ scripts usr/share/dolibarr/ doc/install usr/share/doc/dolibarr/ doc/user usr/share/doc/dolibarr/ -doc/index.html usr/share/doc/dolibarr/ \ No newline at end of file +doc/index.html usr/share/doc/dolibarr/ diff --git a/build/debian/dolibarr.lintian-overrides b/dev/build/debian/dolibarr.lintian-overrides similarity index 98% rename from build/debian/dolibarr.lintian-overrides rename to dev/build/debian/dolibarr.lintian-overrides index 90120971ce9..63e742c70ec 100644 --- a/build/debian/dolibarr.lintian-overrides +++ b/dev/build/debian/dolibarr.lintian-overrides @@ -7,4 +7,4 @@ dolibarr: apache2-deprecated-auth-config Order dolibarr: apache2-deprecated-auth-config Allow # Ignore warning required for a good install process dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod -dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf \ No newline at end of file +dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf diff --git a/build/debian/dolibarr.postinst b/dev/build/debian/dolibarr.postinst old mode 100644 new mode 100755 similarity index 100% rename from build/debian/dolibarr.postinst rename to dev/build/debian/dolibarr.postinst diff --git a/build/debian/dolibarr.postrm b/dev/build/debian/dolibarr.postrm old mode 100644 new mode 100755 similarity index 100% rename from build/debian/dolibarr.postrm rename to dev/build/debian/dolibarr.postrm diff --git a/build/debian/dolibarr.templates b/dev/build/debian/dolibarr.templates similarity index 100% rename from build/debian/dolibarr.templates rename to dev/build/debian/dolibarr.templates diff --git a/build/debian/dolibarr.templates.futur b/dev/build/debian/dolibarr.templates.futur similarity index 99% rename from build/debian/dolibarr.templates.futur rename to dev/build/debian/dolibarr.templates.futur index a6fc2c94670..0c70e8475e9 100644 --- a/build/debian/dolibarr.templates.futur +++ b/dev/build/debian/dolibarr.templates.futur @@ -102,4 +102,3 @@ Description: Delete database ? # Delete also all uploaded and generated files (datas related # to this quetion are all files found into /usr/share/dolibarr/documents, # uploaded or generated when using Dolibarr) ? - \ No newline at end of file diff --git a/build/debian/dolibarr.xpm b/dev/build/debian/dolibarr.xpm similarity index 100% rename from build/debian/dolibarr.xpm rename to dev/build/debian/dolibarr.xpm diff --git a/build/debian/get-orig-source.sh b/dev/build/debian/get-orig-source.sh similarity index 100% rename from build/debian/get-orig-source.sh rename to dev/build/debian/get-orig-source.sh diff --git a/build/debian/install.forced.php.install b/dev/build/debian/install.forced.php.install similarity index 97% rename from build/debian/install.forced.php.install rename to dev/build/debian/install.forced.php.install index 801b1b372af..64b6f8cbb32 100644 --- a/build/debian/install.forced.php.install +++ b/dev/build/debian/install.forced.php.install @@ -27,7 +27,7 @@ $force_install_lockinstall='444'; $force_install_distrib='debian'; // Value to overwrite path to use shared libraries/fonts instead of embedded one. -// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are +// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are // - not removed from package (see rm in rules file), // - declared into dependencies (see Depends in control file) //$force_dolibarr_lib_TCPDF_PATH=''; diff --git a/build/debian/lighttpd/50-dolibarr.conf b/dev/build/debian/lighttpd/50-dolibarr.conf similarity index 81% rename from build/debian/lighttpd/50-dolibarr.conf rename to dev/build/debian/lighttpd/50-dolibarr.conf index e3d1bdfce7e..523bd0a62f8 100644 --- a/build/debian/lighttpd/50-dolibarr.conf +++ b/dev/build/debian/lighttpd/50-dolibarr.conf @@ -1,11 +1,11 @@ # Alias for dolibarr directory -alias.url += ( +alias.url += ( "/dolibarr" => "/usr/share/dolibarr/htdocs", ) # Disallow access to libraries -#$HTTP["url"] =~ "^/dolibarr/libraries" { -# url.access-deny = ( "" ) +#$HTTP["url"] =~ "^/dolibarr/libraries" { +# url.access-deny = ( "" ) #} # Limit access to setup script diff --git a/build/debian/patches/series b/dev/build/debian/patches/series similarity index 100% rename from build/debian/patches/series rename to dev/build/debian/patches/series diff --git a/build/debian/patches/use-etc-dolibarr-conf.patch b/dev/build/debian/patches/use-etc-dolibarr-conf.patch similarity index 99% rename from build/debian/patches/use-etc-dolibarr-conf.patch rename to dev/build/debian/patches/use-etc-dolibarr-conf.patch index c5cede64470..8f14d52acb2 100644 --- a/build/debian/patches/use-etc-dolibarr-conf.patch +++ b/dev/build/debian/patches/use-etc-dolibarr-conf.patch @@ -19,8 +19,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; - - + + // Include configuration --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -32,6 +32,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; - + $short_options = "c:h"; $long_options = array( diff --git a/dev/build/debian/po/POTFILES.in b/dev/build/debian/po/POTFILES.in new file mode 100644 index 00000000000..7075002fe62 --- /dev/null +++ b/dev/build/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] dolibarr.templates diff --git a/build/debian/po/fr.po b/dev/build/debian/po/fr.po similarity index 100% rename from build/debian/po/fr.po rename to dev/build/debian/po/fr.po diff --git a/build/debian/po/templates.pot b/dev/build/debian/po/templates.pot similarity index 100% rename from build/debian/po/templates.pot rename to dev/build/debian/po/templates.pot diff --git a/build/debian/rules b/dev/build/debian/rules similarity index 99% rename from build/debian/rules rename to dev/build/debian/rules index 5f8b14e49ea..5b70362c610 100755 --- a/build/debian/rules +++ b/dev/build/debian/rules @@ -66,7 +66,7 @@ override_dh_install: rm -fr dev/xdebug rm -f dev/dolibarr_changes.txt rm -f dev/README - + rm -f doc/images/dolibarr_screenshot2.png rm -f doc/images/dolibarr_screenshot3.png rm -f doc/images/dolibarr_screenshot4.png @@ -91,7 +91,7 @@ override_dh_install: rm -fr build/perl rm -fr build/rpm rm -fr build/zip - + # clean from all PHP embedded libraries (we use package dependencies instead) # rm -fr htdocs/includes/geoip # rm -fr htdocs/includes/nusoap @@ -128,4 +128,3 @@ override_dh_fixperms: # Give rights to the webserver on the upload directory chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents chmod 2775 debian/dolibarr/var/lib/dolibarr/documents - diff --git a/dev/build/debian/source/format b/dev/build/debian/source/format new file mode 100644 index 00000000000..163aaf8d82b --- /dev/null +++ b/dev/build/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/build/debian/source/lintian-overrides b/dev/build/debian/source/lintian-overrides similarity index 99% rename from build/debian/source/lintian-overrides rename to dev/build/debian/source/lintian-overrides index e64eae84887..ed3a130fbc9 100644 --- a/build/debian/source/lintian-overrides +++ b/dev/build/debian/source/lintian-overrides @@ -14,4 +14,3 @@ source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/li # Those are false positives, the files are their own sources since # they are data files source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json - diff --git a/build/debian/source/options b/dev/build/debian/source/options similarity index 100% rename from build/debian/source/options rename to dev/build/debian/source/options diff --git a/build/debian/watch b/dev/build/debian/watch similarity index 100% rename from build/debian/watch rename to dev/build/debian/watch diff --git a/build/dmg/dolimamp/README b/dev/build/dmg/dolimamp/README similarity index 85% rename from build/dmg/dolimamp/README rename to dev/build/dmg/dolimamp/README index 56929860bde..0a57996fcef 100644 --- a/build/dmg/dolimamp/README +++ b/dev/build/dmg/dolimamp/README @@ -4,4 +4,4 @@ DOLIMAMP Package tools ################################################## This directory contains files and docs used to build -a DoliMamp package for Mac OS X. \ No newline at end of file +a DoliMamp package for Mac OS X. diff --git a/build/dmg/dolimamp/install.forced.php b/dev/build/dmg/dolimamp/install.forced.php similarity index 100% rename from build/dmg/dolimamp/install.forced.php rename to dev/build/dmg/dolimamp/install.forced.php diff --git a/build/doap/README b/dev/build/doap/README similarity index 100% rename from build/doap/README rename to dev/build/doap/README diff --git a/build/docker-dev/.dockerignore b/dev/build/docker-dev/.dockerignore similarity index 100% rename from build/docker-dev/.dockerignore rename to dev/build/docker-dev/.dockerignore diff --git a/build/docker-dev/Dockerfile b/dev/build/docker-dev/Dockerfile similarity index 100% rename from build/docker-dev/Dockerfile rename to dev/build/docker-dev/Dockerfile diff --git a/build/docker-dev/README.md b/dev/build/docker-dev/README.md similarity index 100% rename from build/docker-dev/README.md rename to dev/build/docker-dev/README.md diff --git a/build/docker-dev/docker-compose.yml b/dev/build/docker-dev/docker-compose.yml similarity index 100% rename from build/docker-dev/docker-compose.yml rename to dev/build/docker-dev/docker-compose.yml diff --git a/build/docker-dev/docker-run.sh b/dev/build/docker-dev/docker-run.sh similarity index 100% rename from build/docker-dev/docker-run.sh rename to dev/build/docker-dev/docker-run.sh diff --git a/build/docker-dev/mariadb/Dockerfile b/dev/build/docker-dev/mariadb/Dockerfile similarity index 100% rename from build/docker-dev/mariadb/Dockerfile rename to dev/build/docker-dev/mariadb/Dockerfile diff --git a/build/docker/.github/workflows/build.yml b/dev/build/docker/.github/workflows/build.yml similarity index 100% rename from build/docker/.github/workflows/build.yml rename to dev/build/docker/.github/workflows/build.yml diff --git a/build/docker/.github/workflows/test.yml b/dev/build/docker/.github/workflows/test.yml similarity index 100% rename from build/docker/.github/workflows/test.yml rename to dev/build/docker/.github/workflows/test.yml diff --git a/build/docker/.gitignore b/dev/build/docker/.gitignore similarity index 100% rename from build/docker/.gitignore rename to dev/build/docker/.gitignore diff --git a/build/docker/Dockerfile b/dev/build/docker/Dockerfile similarity index 100% rename from build/docker/Dockerfile rename to dev/build/docker/Dockerfile diff --git a/build/docker/README.md b/dev/build/docker/README.md similarity index 100% rename from build/docker/README.md rename to dev/build/docker/README.md diff --git a/build/docker/docker-compose.yml b/dev/build/docker/docker-compose.yml similarity index 100% rename from build/docker/docker-compose.yml rename to dev/build/docker/docker-compose.yml diff --git a/build/docker/docker-run.sh b/dev/build/docker/docker-run.sh similarity index 100% rename from build/docker/docker-run.sh rename to dev/build/docker/docker-run.sh diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/dev/build/doxygen/dolibarr-doxygen-build.pl similarity index 99% rename from build/doxygen/dolibarr-doxygen-build.pl rename to dev/build/doxygen/dolibarr-doxygen-build.pl index 32a852f22d8..e8100011666 100755 --- a/build/doxygen/dolibarr-doxygen-build.pl +++ b/dev/build/doxygen/dolibarr-doxygen-build.pl @@ -27,7 +27,7 @@ if (! -s "build/doxygen/$CONFFILE") print '> perl .\dolibarr-doxygen-build.pl (on Windows)'."\n"; print '> perl ../dolibarr-doxygen-build.pl (on Linux or BSD)'."\n"; sleep 4; - exit 1; + exit 1; } $SOURCE="."; diff --git a/build/doxygen/dolibarr-doxygen-filter.pl b/dev/build/doxygen/dolibarr-doxygen-filter.pl similarity index 100% rename from build/doxygen/dolibarr-doxygen-filter.pl rename to dev/build/doxygen/dolibarr-doxygen-filter.pl diff --git a/build/doxygen/dolibarr-doxygen-getversion.pl b/dev/build/doxygen/dolibarr-doxygen-getversion.pl similarity index 97% rename from build/doxygen/dolibarr-doxygen-getversion.pl rename to dev/build/doxygen/dolibarr-doxygen-getversion.pl index 6d05037e7dd..31c52434d1f 100755 --- a/build/doxygen/dolibarr-doxygen-getversion.pl +++ b/dev/build/doxygen/dolibarr-doxygen-getversion.pl @@ -8,7 +8,7 @@ # Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot $file=$ARGV[0]; -if (! $file) +if (! $file) { print "Usage: dolibarr-doxygen-getversion.pl pathtofilefromdolibarrroot\n"; exit; diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/dev/build/doxygen/dolibarr-doxygen.doxyfile similarity index 98% rename from build/doxygen/dolibarr-doxygen.doxyfile rename to dev/build/doxygen/dolibarr-doxygen.doxyfile index d6fc7b1ef9e..66d86a6aa22 100644 --- a/build/doxygen/dolibarr-doxygen.doxyfile +++ b/dev/build/doxygen/dolibarr-doxygen.doxyfile @@ -89,7 +89,7 @@ REPEAT_BRIEF = YES # "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then # Doxygen will generate a detailed section even if there is only a brief @@ -126,7 +126,7 @@ STRIP_FROM_PATH = "/home/dolibarr/doxygen.dolibarr.org/" # definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter # (but less readable) file names. This can be useful is your file systems @@ -182,7 +182,7 @@ TAB_SIZE = 2 # will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C # sources only. Doxygen will then generate output that is more tailored for C. @@ -469,7 +469,7 @@ GENERATE_DEPRECATEDLIST = YES # The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = # The MAX_INITIALIZER_LINES tag determines the maximum number of lines # the initial value of a variable or define consists of for it to appear in @@ -515,7 +515,7 @@ SHOW_NAMESPACES = NO # is used as the file version. See the manual for examples. #FILE_VERSION_FILTER = dolibarr-doxygen-getversion.pl -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated @@ -524,7 +524,7 @@ FILE_VERSION_FILTER = # You can optionally specify a file name after the option, if omitted # DoxygenLayout.xml will be used as the name of the layout file. -LAYOUT_FILE = +LAYOUT_FILE = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages @@ -638,13 +638,13 @@ EXCLUDE_PATTERNS = */CVS/* # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see # the \include command). -#EXAMPLE_PATH = htdocs/modulebuilder/template +#EXAMPLE_PATH = htdocs/modulebuilder/template # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -678,7 +678,7 @@ IMAGE_PATH = doc/images # Works on Linux only #INPUT_FILTER = ../dolibarr-doxygen-filter.pl #INPUT_FILTER = "perl ../dolibarr-doxygen-filter.pl" -INPUT_FILTER = +INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. @@ -689,7 +689,7 @@ INPUT_FILTER = # info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using # INPUT_FILTER) will be used to filter the input files when producing source @@ -774,7 +774,7 @@ ALPHABETICAL_INDEX = YES # The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output @@ -820,7 +820,7 @@ HTML_FOOTER = build/doxygen/doxygen_footer.html # the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. # Doxygen will adjust the colors in the stylesheet and background images @@ -927,14 +927,14 @@ GENERATE_HTMLHELP = NO # can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can # be used to specify the location (absolute path including file name) of # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that @@ -946,7 +946,7 @@ GENERATE_CHI = NO # is used to encode HtmlHelp index (hhk), content (hhc) and project file # content. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag # controls whether a binary table of contents is generated (YES) or a @@ -970,7 +970,7 @@ GENERATE_QHP = NO # be used to specify the file name of the resulting .qch file. # The path specified is relative to the HTML output folder. -QCH_FILE = +QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating # Qt Help Project output. For more information please see @@ -988,14 +988,14 @@ QHP_VIRTUAL_FOLDER = doc # add. For more information please see # http://doc.trolltech.com/qthelpproject.html#custom-filters -QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_NAME = # The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see # # Qt Help Project / Custom Filters. -QHP_CUST_FILTER_ATTRS = +QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's @@ -1003,14 +1003,14 @@ QHP_CUST_FILTER_ATTRS = # # Qt Help Project / Filter Attributes. -QHP_SECT_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can # be used to specify the location of Qt's qhelpgenerator. # If non-empty doxygen will try to run qhelpgenerator on the generated # .qhp file. -QHG_LOCATION = +QHG_LOCATION = # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files # will be generated, which together with the HTML files, form an Eclipse help @@ -1146,14 +1146,14 @@ PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = # The LATEX_HEADER tag can be used to specify a personal LaTeX header for # the generated latex document. The header should contain everything until # the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will @@ -1223,12 +1223,12 @@ RTF_HYPERLINKS = NO # config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = # Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output @@ -1278,13 +1278,13 @@ XML_OUTPUT = xml # which can be used by a validating XML parser to check the # syntax of the XML files. -#XML_SCHEMA = +#XML_SCHEMA = # The XML_DTD tag can be used to specify an XML DTD, # which can be used by a validating XML parser to check the # syntax of the XML files. -#XML_DTD = +#XML_DTD = # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting @@ -1338,7 +1338,7 @@ PERLMOD_PRETTY = YES # This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor @@ -1372,14 +1372,14 @@ SEARCH_INCLUDES = YES # contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the # directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = # The PREDEFINED tag can be used to specify one or more macro names that # are defined before the preprocessor is started (similar to the -D option of @@ -1389,14 +1389,14 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. # The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then # doxygen's preprocessor will remove all function-like macros that are alone @@ -1427,12 +1427,12 @@ SKIP_FUNCTION_MACROS = YES # If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = # If the ALLEXTERNALS tag is set to YES all external classes will be listed # in the class index. If set to NO only the inherited external classes @@ -1471,7 +1471,7 @@ CLASS_DIAGRAMS = NO # the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. -#MSCGEN_PATH = +#MSCGEN_PATH = # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented @@ -1515,7 +1515,7 @@ DOT_FONTSIZE = 10 # different font using DOT_FONTNAME you can set the path where dot # can find it using this tag. -DOT_FONTPATH = +DOT_FONTPATH = # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and @@ -1598,13 +1598,13 @@ DOT_IMAGE_FORMAT = png # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -DOT_PATH = +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of # nodes that will be shown in the graph. If the number of nodes in a graph diff --git a/build/doxygen/doxygen-awesome.css b/dev/build/doxygen/doxygen-awesome.css similarity index 99% rename from build/doxygen/doxygen-awesome.css rename to dev/build/doxygen/doxygen-awesome.css index 21150c99adc..65fdbb400f2 100644 --- a/build/doxygen/doxygen-awesome.css +++ b/dev/build/doxygen/doxygen-awesome.css @@ -204,7 +204,7 @@ html { --code-background: #2a2c2f; --tablehead-background: #2a2c2f; - + --blockquote-background: #222325; --blockquote-foreground: #7e8c92; @@ -884,7 +884,7 @@ div.header { flex-wrap: nowrap; align-items: flex-start; } - + div.contents .textblock { min-width: 200px; flex-grow: 1; @@ -973,21 +973,21 @@ html.dark-mode div.contents table iframe { h2.groupheader { border-bottom: 0px; color: var(--page-foreground-color); - box-shadow: - 100px 0 var(--page-background-color), + box-shadow: + 100px 0 var(--page-background-color), -100px 0 var(--page-background-color), 100px 0.75px var(--separator-color), -100px 0.75px var(--separator-color), - 500px 0 var(--page-background-color), + 500px 0 var(--page-background-color), -500px 0 var(--page-background-color), 500px 0.75px var(--separator-color), -500px 0.75px var(--separator-color), - 900px 0 var(--page-background-color), + 900px 0 var(--page-background-color), -900px 0 var(--page-background-color), 900px 0.75px var(--separator-color), -900px 0.75px var(--separator-color), 1400px 0 var(--page-background-color), - -1400px 0 var(--page-background-color), + -1400px 0 var(--page-background-color), 1400px 0.75px var(--separator-color), -1400px 0.75px var(--separator-color), 1900px 0 var(--page-background-color), @@ -1143,8 +1143,8 @@ div.toc li a.aboveActive { div.contents .toc.interactive > h3::before { content: ""; - width: 0; - height: 0; + width: 0; + height: 0; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 5px solid var(--primary-color); @@ -1822,8 +1822,8 @@ table.memberdecls img[src="closed.png"], table.memberdecls img[src="open.png"], div.dynheader img[src="open.png"], div.dynheader img[src="closed.png"] { - width: 0; - height: 0; + width: 0; + height: 0; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 5px solid var(--primary-color); @@ -1841,7 +1841,7 @@ table.memberdecls img { table.memberdecls img[src="closed.png"], div.dynheader img[src="closed.png"] { transform: rotate(-90deg); - + } .compoundTemplParams { @@ -1884,7 +1884,7 @@ div.dynheader img[src="closed.png"] { margin-bottom: calc(0px - var(--page-font-size)); } - table.memberdecls .memItemRight, + table.memberdecls .memItemRight, table.memberdecls .mdescRight, table.memberdecls .memTemplItemRight { border-top: 0; @@ -2070,8 +2070,8 @@ html.dark-mode .iconfopen, html.dark-mode .iconfclosed { background-color: transparent; } -/* - Class Index Doxygen 1.8 +/* + Class Index Doxygen 1.8 */ table.classindex { @@ -2212,7 +2212,7 @@ div.contents .toc::-webkit-scrollbar-thumb { background-color: transparent; border: var(--webkit-scrollbar-padding) solid transparent; border-radius: calc(var(--webkit-scrollbar-padding) + var(--webkit-scrollbar-padding)); - background-clip: padding-box; + background-clip: padding-box; } #nav-tree:hover::-webkit-scrollbar-thumb, @@ -2406,8 +2406,8 @@ h2:hover a.anchorlink, h1:hover a.anchorlink, h3:hover a.anchorlink, h4:hover a. #MSearchBox .left { - background: none !important; + background: none !important; } #MSearchBox .right { - background: none !important; + background: none !important; } diff --git a/build/doxygen/doxygen_footer.html b/dev/build/doxygen/doxygen_footer.html similarity index 97% rename from build/doxygen/doxygen_footer.html rename to dev/build/doxygen/doxygen_footer.html index 2615af0b485..1a43e7e9dc0 100644 --- a/build/doxygen/doxygen_footer.html +++ b/dev/build/doxygen/doxygen_footer.html @@ -1,4 +1,4 @@ - @@ -23,4 +23,4 @@ File added into doxygen generated documentation - \ No newline at end of file + diff --git a/build/doxygen/doxygen_header.html b/dev/build/doxygen/doxygen_header.html similarity index 99% rename from build/doxygen/doxygen_header.html rename to dev/build/doxygen/doxygen_header.html index f60f4829d76..9ab8aa57a0c 100644 --- a/build/doxygen/doxygen_header.html +++ b/dev/build/doxygen/doxygen_header.html @@ -48,5 +48,3 @@ - - diff --git a/build/exakat/README.md b/dev/build/exakat/README.md similarity index 100% rename from build/exakat/README.md rename to dev/build/exakat/README.md diff --git a/build/exe/doliwamp/.gitignore b/dev/build/exe/doliwamp/.gitignore similarity index 100% rename from build/exe/doliwamp/.gitignore rename to dev/build/exe/doliwamp/.gitignore diff --git a/build/exe/doliwamp/Languages/MyBasque.isl b/dev/build/exe/doliwamp/Languages/MyBasque.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyBasque.isl rename to dev/build/exe/doliwamp/Languages/MyBasque.isl diff --git a/build/exe/doliwamp/Languages/MyBrazilianPortuguese.isl b/dev/build/exe/doliwamp/Languages/MyBrazilianPortuguese.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyBrazilianPortuguese.isl rename to dev/build/exe/doliwamp/Languages/MyBrazilianPortuguese.isl diff --git a/build/exe/doliwamp/Languages/MyCatalan.isl b/dev/build/exe/doliwamp/Languages/MyCatalan.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyCatalan.isl rename to dev/build/exe/doliwamp/Languages/MyCatalan.isl diff --git a/build/exe/doliwamp/Languages/MyCzech.isl b/dev/build/exe/doliwamp/Languages/MyCzech.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyCzech.isl rename to dev/build/exe/doliwamp/Languages/MyCzech.isl diff --git a/build/exe/doliwamp/Languages/MyDanish.isl b/dev/build/exe/doliwamp/Languages/MyDanish.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyDanish.isl rename to dev/build/exe/doliwamp/Languages/MyDanish.isl diff --git a/build/exe/doliwamp/Languages/MyDutch.isl b/dev/build/exe/doliwamp/Languages/MyDutch.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyDutch.isl rename to dev/build/exe/doliwamp/Languages/MyDutch.isl diff --git a/build/exe/doliwamp/Languages/MyEnglish.isl b/dev/build/exe/doliwamp/Languages/MyEnglish.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyEnglish.isl rename to dev/build/exe/doliwamp/Languages/MyEnglish.isl diff --git a/build/exe/doliwamp/Languages/MyFinnish.isl b/dev/build/exe/doliwamp/Languages/MyFinnish.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyFinnish.isl rename to dev/build/exe/doliwamp/Languages/MyFinnish.isl diff --git a/build/exe/doliwamp/Languages/MyFrench.isl b/dev/build/exe/doliwamp/Languages/MyFrench.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyFrench.isl rename to dev/build/exe/doliwamp/Languages/MyFrench.isl diff --git a/build/exe/doliwamp/Languages/MyGerman.isl b/dev/build/exe/doliwamp/Languages/MyGerman.isl similarity index 97% rename from build/exe/doliwamp/Languages/MyGerman.isl rename to dev/build/exe/doliwamp/Languages/MyGerman.isl index 7d7fa1662a8..b78c2155e27 100644 --- a/build/exe/doliwamp/Languages/MyGerman.isl +++ b/dev/build/exe/doliwamp/Languages/MyGerman.isl @@ -21,7 +21,7 @@ DoYouWantToStart=Möchten Sie den Installationsprozess starten? TechnicalParameters=technische Parameter IfFirstInstall=Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte. -; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS +; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS SMTPServer=SMTP Server (your own or ISP SMTP server, first install only) : ApachePort=Apache Port (first install only, Standard ist 80) : MySqlPort=MySQL Port (first install only, Standard ist 3306) : @@ -29,7 +29,7 @@ MySqlPassword=MySQL Server und Datenbank Passwort für root (first install only) FailedToDeleteLock=Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ... -PortAlreadyInUse=Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen. Auswahl abbrechen und einen anderen Wert wählen ? +PortAlreadyInUse=Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen. Auswahl abbrechen und einen anderen Wert wählen ? FirefoxDetected=Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden? ChromeDetected=Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden? diff --git a/build/exe/doliwamp/Languages/MyHebrew.isl b/dev/build/exe/doliwamp/Languages/MyHebrew.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyHebrew.isl rename to dev/build/exe/doliwamp/Languages/MyHebrew.isl diff --git a/build/exe/doliwamp/Languages/MyHungarian.isl b/dev/build/exe/doliwamp/Languages/MyHungarian.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyHungarian.isl rename to dev/build/exe/doliwamp/Languages/MyHungarian.isl diff --git a/build/exe/doliwamp/Languages/MyItalian.isl b/dev/build/exe/doliwamp/Languages/MyItalian.isl similarity index 98% rename from build/exe/doliwamp/Languages/MyItalian.isl rename to dev/build/exe/doliwamp/Languages/MyItalian.isl index bb85ba864b6..8d72059f862 100644 --- a/build/exe/doliwamp/Languages/MyItalian.isl +++ b/dev/build/exe/doliwamp/Languages/MyItalian.isl @@ -9,4 +9,4 @@ ProgramOnTheWeb=%1 sul Web UninstallProgram=Disinstalla %1 LaunchProgram=Avvia %1 AssocFileExtension=&Associa l'estensione %2 a %1 -AssocingFileExtension=Associazione dell'estensione %2 a %1 in corso... \ No newline at end of file +AssocingFileExtension=Associazione dell'estensione %2 a %1 in corso... diff --git a/build/exe/doliwamp/Languages/MyJapanese.isl b/dev/build/exe/doliwamp/Languages/MyJapanese.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyJapanese.isl rename to dev/build/exe/doliwamp/Languages/MyJapanese.isl diff --git a/build/exe/doliwamp/Languages/MyNorwegian.isl b/dev/build/exe/doliwamp/Languages/MyNorwegian.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyNorwegian.isl rename to dev/build/exe/doliwamp/Languages/MyNorwegian.isl diff --git a/build/exe/doliwamp/Languages/MyPolish.isl b/dev/build/exe/doliwamp/Languages/MyPolish.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyPolish.isl rename to dev/build/exe/doliwamp/Languages/MyPolish.isl diff --git a/build/exe/doliwamp/Languages/MyPortuguese.isl b/dev/build/exe/doliwamp/Languages/MyPortuguese.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyPortuguese.isl rename to dev/build/exe/doliwamp/Languages/MyPortuguese.isl diff --git a/build/exe/doliwamp/Languages/MyRussian.isl b/dev/build/exe/doliwamp/Languages/MyRussian.isl similarity index 100% rename from build/exe/doliwamp/Languages/MyRussian.isl rename to dev/build/exe/doliwamp/Languages/MyRussian.isl diff --git a/build/exe/doliwamp/Languages/MySlovak.isl b/dev/build/exe/doliwamp/Languages/MySlovak.isl similarity index 90% rename from build/exe/doliwamp/Languages/MySlovak.isl rename to dev/build/exe/doliwamp/Languages/MySlovak.isl index 28e66e0f8a5..578415e631d 100644 --- a/build/exe/doliwamp/Languages/MySlovak.isl +++ b/dev/build/exe/doliwamp/Languages/MySlovak.isl @@ -5,7 +5,7 @@ AdditionalIcons= CreateDesktopIcon=Vytvori zstupcu na &ploche CreateQuickLaunchIcon=Vytvori zstupcu na paneli &Rchle spustenie ProgramOnTheWeb=Aplikcia %1 na internete -UninstallProgram=Odintalova aplikciu %1 +UninstallProgram=Odintalova aplikciu %1 LaunchProgram=Spusti aplikciu %1 AssocFileExtension=Vytvori &asociciu medzi sbormi typu %2 a aplikciou %1 AssocingFileExtension=Vytvra sa asocicia medzi sbormi typu %2 a aplikciou %1... diff --git a/build/exe/doliwamp/Languages/MySlovenian.isl b/dev/build/exe/doliwamp/Languages/MySlovenian.isl similarity index 100% rename from build/exe/doliwamp/Languages/MySlovenian.isl rename to dev/build/exe/doliwamp/Languages/MySlovenian.isl diff --git a/build/exe/doliwamp/Languages/MySpanish.isl b/dev/build/exe/doliwamp/Languages/MySpanish.isl similarity index 99% rename from build/exe/doliwamp/Languages/MySpanish.isl rename to dev/build/exe/doliwamp/Languages/MySpanish.isl index 4500e776672..6789bf008c0 100644 --- a/build/exe/doliwamp/Languages/MySpanish.isl +++ b/dev/build/exe/doliwamp/Languages/MySpanish.isl @@ -42,6 +42,6 @@ DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reinici OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr - + DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp. ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito) diff --git a/build/exe/doliwamp/Makefile b/dev/build/exe/doliwamp/Makefile similarity index 98% rename from build/exe/doliwamp/Makefile rename to dev/build/exe/doliwamp/Makefile index 3344232b177..f2727e54298 100644 --- a/build/exe/doliwamp/Makefile +++ b/dev/build/exe/doliwamp/Makefile @@ -1,7 +1,7 @@ #-------------------------------------------------------------------# # Makefile to build UsedPort exe #-------------------------------------------------------------------# -# 1.0 Laurent Destailleur Creation +# 1.0 Laurent Destailleur Creation #-------------------------------------------------------------------# # Works with GCC CYGWIN, GCC MINGW #-------------------------------------------------------------------# @@ -126,7 +126,7 @@ $(LIBDIR)%.obj: %.cpp $(CPP) -c $(CFLAGS) $(SRC)$< $(OUT)$@ # @echo ----- Archivage en $(ARCHIVE) # $(AR) $(ARCHIVE) $@ - + $(LIBDIR)%.o: %.c @echo ----- Compilation C by $(COMP) $(CC) - $@ @echo CC=$(CC) diff --git a/build/exe/doliwamp/README.md b/dev/build/exe/doliwamp/README.md similarity index 100% rename from build/exe/doliwamp/README.md rename to dev/build/exe/doliwamp/README.md diff --git a/build/exe/doliwamp/UsedPort.cpp b/dev/build/exe/doliwamp/UsedPort.cpp similarity index 98% rename from build/exe/doliwamp/UsedPort.cpp rename to dev/build/exe/doliwamp/UsedPort.cpp index a63938c5038..5d77f7c9ec5 100644 --- a/build/exe/doliwamp/UsedPort.cpp +++ b/dev/build/exe/doliwamp/UsedPort.cpp @@ -5,7 +5,7 @@ // GCC CYGWIN 3.4.4 (May need cygwin1.dll, depending on functions used) // GCC MINGW 3.4.5 // Not tested with: -// VC++ 4.0.0 +// VC++ 4.0.0 // GCC Linux 3.4.4 //--------------------------------------------------------------------------- // 06/09/09 1.0 Laurent Destailleur Creation @@ -122,7 +122,7 @@ mailentry tabmails[MAX_MAILS+1]; // Tab of mails entries First=1 int iRet; int iNbUnread; // Nb of unread mails unsigned long int lSizeUnread; // Size of all unread mails -int Port=0; +int Port=0; char Host[MAXHOSTNAMELEN]=""; #ifdef _WIN32 WSADATA Data; @@ -153,7 +153,7 @@ int testConnect() SOCKET sc; char s[2048],t[256]; int i; - + startgetmess: @@ -177,7 +177,7 @@ startgetmess: { return(DoQuit(FAILED_TO_RESOLVE_HOST)); } - + //***** Connect to server SOCKADDR_IN sin; sin.sin_port = htons((u_short) Port); @@ -190,7 +190,7 @@ startgetmess: #ifdef _WIN32 if (connect(sc,(LPSOCKADDR) &sin,sizeof(sin))) #else - if (connect(sc,(const struct sockaddr *) &sin,sizeof(sin))) + if (connect(sc,(const struct sockaddr *) &sin,sizeof(sin))) #endif { printf("Failed to connect !\n"); @@ -223,7 +223,7 @@ int Ack(SOCKET sc) int rlen; int Received = 0; - if (!buf) + if (!buf) if ((buf = (char *) malloc(liSizeOfMail+1)) == NULL) // The first time, create buf return(OUT_OF_MEMORY); again: @@ -310,7 +310,7 @@ if (help|invalide) { printf("\n"); exit(-1); } - + // Print input values diff --git a/build/exe/doliwamp/UsedPort.exe b/dev/build/exe/doliwamp/UsedPort.exe similarity index 100% rename from build/exe/doliwamp/UsedPort.exe rename to dev/build/exe/doliwamp/UsedPort.exe diff --git a/build/exe/doliwamp/builddemosslfiles.bat.install b/dev/build/exe/doliwamp/builddemosslfiles.bat.install similarity index 100% rename from build/exe/doliwamp/builddemosslfiles.bat.install rename to dev/build/exe/doliwamp/builddemosslfiles.bat.install diff --git a/build/exe/doliwamp/ca_demo_dolibarr.crt b/dev/build/exe/doliwamp/ca_demo_dolibarr.crt similarity index 100% rename from build/exe/doliwamp/ca_demo_dolibarr.crt rename to dev/build/exe/doliwamp/ca_demo_dolibarr.crt diff --git a/build/exe/doliwamp/ca_demo_dolibarr.key b/dev/build/exe/doliwamp/ca_demo_dolibarr.key similarity index 100% rename from build/exe/doliwamp/ca_demo_dolibarr.key rename to dev/build/exe/doliwamp/ca_demo_dolibarr.key diff --git a/build/exe/doliwamp/config.inc.php.install b/dev/build/exe/doliwamp/config.inc.php.install similarity index 100% rename from build/exe/doliwamp/config.inc.php.install rename to dev/build/exe/doliwamp/config.inc.php.install diff --git a/build/exe/doliwamp/dolibarr.conf.install b/dev/build/exe/doliwamp/dolibarr.conf.install similarity index 84% rename from build/exe/doliwamp/dolibarr.conf.install rename to dev/build/exe/doliwamp/dolibarr.conf.install index db7a3ddc048..2b5e5589695 100644 --- a/build/exe/doliwamp/dolibarr.conf.install +++ b/dev/build/exe/doliwamp/dolibarr.conf.install @@ -1,4 +1,4 @@ -Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" +Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" # NOTE FOR APACHE 2.2: # To restrict access to dolibarr from outside set lines @@ -9,7 +9,7 @@ Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" # # instead of # -# Order Allow,Deny +# Order Allow,Deny # Allow from all # # NOTE FOR APACHE 2.3: @@ -26,4 +26,4 @@ Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" Options Indexes FollowSymLinks MultiViews AllowOverride all Require all granted - \ No newline at end of file + diff --git a/build/exe/doliwamp/doliwamp.bmp b/dev/build/exe/doliwamp/doliwamp.bmp similarity index 100% rename from build/exe/doliwamp/doliwamp.bmp rename to dev/build/exe/doliwamp/doliwamp.bmp diff --git a/build/exe/doliwamp/doliwamp.iss b/dev/build/exe/doliwamp/doliwamp.iss similarity index 98% rename from build/exe/doliwamp/doliwamp.iss rename to dev/build/exe/doliwamp/doliwamp.iss index 1a14058de68..a637b7deca1 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/dev/build/exe/doliwamp/doliwamp.iss @@ -24,7 +24,7 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__ ;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=..\..\.. +SourceDir=..\..\..\.. AppId=doliwamp AppPublisher=DoliCloud AppPublisherURL=https://www.dolicloud.com @@ -205,20 +205,20 @@ begin if Result then begin - + //---------------------------------------------- // Test if msvcr110 DLL has been installed //---------------------------------------------- - + if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then begin - // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept + // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept Result := MsgBox(CustomMessage('DLLMissing')+#13#13+CustomMessage('ContinueAnyway'), mbConfirmation, MB_YESNO) = IDYES; - + end; // Pb seems similar with msvcp110.dll //vcredist_x64.exe - + end; end; @@ -307,7 +307,7 @@ begin Page.Add(CustomMessage('MySqlPort'), False); Page.Add(CustomMessage('MySqlPassword'), False); end; - + // Default values Page.Values[0] := smtpServer; Page.Values[1] := apachePort; @@ -348,7 +348,7 @@ var themessage: String; begin res := True; - + //MsgBox(''+CurPageID,mbConfirmation,MB_YESNO); if CurPageID = Page.ID then @@ -361,12 +361,12 @@ begin pathWithSlashes := path; StringChange (pathWithSlashes, '\','/'); - + // Migration of database // datadir := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/data'; // exedirold := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/'; // exedirnew := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/'; - + // If we have a new database version, we should only copy old my.ini file into new directory // and change only all basedir= strings to use new version. Like this, data dir is still correct. // Install of service and stop/start scripts are already rebuild by installer. @@ -391,7 +391,7 @@ begin // Copie des dll de php vers apache //---------------------------------------------- // TODO Update this list when changing PHP/Apache versions - + phpDllCopy := 'libssh2.dll'; filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); phpDllCopy := 'icuuc64.dll'; @@ -424,7 +424,7 @@ begin if not FileExists (srcFile) then begin firstinstall := true; - + // Values from wizard mysmtp := Page.Values[0]; myporta := Page.Values[1]; @@ -435,7 +435,7 @@ begin else begin firstinstall := false; - + // Values from registry mysmtp := smtpServer; myporta := apachePort; @@ -443,13 +443,13 @@ begin myport := mysqlPort; mypass := newPassword; end; - + paramok := True; // TODO Test if choice of param is ok if firstinstall if (firstinstall) then begin - + // Test serveur SMTP // if paramok then // begin @@ -463,7 +463,7 @@ begin // paramok := False; // end; // end; - + if paramok then begin // Test port Apache @@ -477,7 +477,7 @@ begin paramok := False; end; end; - + if paramok then begin // Test port Mysql @@ -491,13 +491,13 @@ begin paramok := False; end; end; - + end; - + if paramok then begin - + //---------------------------------------------- // check that we don't try an upgrade (mysql upgrade no supported) //---------------------------------------------- @@ -512,7 +512,7 @@ begin //---------------------------------------------- // Rename file c:/windows/php.ini (we don't want it) //---------------------------------------------- - + if FileExists ('c:/windows/php.ini') then begin if MsgBox('A previous c:/windows/php.ini file has been detected in your Windows directory. Do you want DoliWamp to rename it to php_old.ini to avoid conflicts ?',mbConfirmation,MB_YESNO) = IDYES then @@ -527,28 +527,28 @@ begin RenameFile('c:/winnt/php.ini','c:/winnt/php_old.ini'); end; end; - - - + + + //---------------------------------------------- // Create rundoliwamp.bat, rundolihelp.bat and rundoliadmin.bat (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/rundoliwamp.bat'; srcFile := pathWithSlashes+'/rundoliwamp.bat.install'; - + destFileH := pathWithSlashes+'/rundolihelp.bat'; srcFileH := pathWithSlashes+'/rundolihelp.bat.install'; - + destFileA := pathWithSlashes+'/rundoliadmin.bat'; srcFileA := pathWithSlashes+'/rundoliadmin.bat.install'; - + if (not FileExists (destFile) or not FileExists (destFileH) or not FileExists (destFileA)) and (FileExists(srcFile) and FileExists(srcFileH) and FileExists(srcFileA)) then begin //navigateur browser := 'iexplore.exe'; - + if browser = 'iexplore.exe' then begin if FileExists (pfPath+'/Google/Chrome/Application/chrome.exe') then @@ -570,7 +570,7 @@ begin end; end; end; - + if browser = 'iexplore.exe' then begin if FileExists (winPath+'/SystemApps/Microsoft.MicrosoftEdge_8wekyb3d8bbwe/MicrosoftEdge.exe') then @@ -604,19 +604,19 @@ begin GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath, 'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe'); end; end; - + LoadStringFromFile (srcFile, srcContents); StringChangeEx (srcContents, 'WAMPBROWSER', browser, True); StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True); StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True); SaveStringToFile(destFile,srcContents, False); - + LoadStringFromFile (srcFileH, srcContents); StringChangeEx (srcContents, 'WAMPBROWSER', browser, True); StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True); StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True); SaveStringToFile(destFileH,srcContents, False); - + LoadStringFromFile (srcFileA, srcContents); StringChangeEx (srcContents, 'WAMPBROWSER', browser, True); StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True); @@ -628,23 +628,23 @@ begin if MsgBox(CustomMessage('DoliWampWillStartApacheMysql'),mbConfirmation,MB_YESNO) = IDYES then begin - + //---------------------------------------------- // Create file alias dolibarr (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/alias/dolibarr.conf'; srcFile := pathWithSlashes+'/alias/dolibarr.conf.install'; - + if FileExists(srcFile) then begin if not FileExists (destFile) then begin LoadStringFromFile (srcFile, srcContents); - + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); - + SaveStringToFile(destFile, srcContents, False); end else @@ -652,25 +652,25 @@ begin // We must replace to use format 2.4 of apache DeleteFile(destFile); LoadStringFromFile (srcFile, srcContents); - + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); - + SaveStringToFile(destFile, srcContents, False); end; end; DeleteFile(srcFile); - - - - + + + + //---------------------------------------------- // Create file httpd.conf (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/conf/httpd.conf'; srcFile := pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/conf/httpd.conf.install'; - + if not FileExists (destFile) and FileExists (srcFile) then begin LoadStringFromFile (srcFile, srcContents); @@ -681,42 +681,42 @@ begin StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); StringChangeEx (srcContents, 'WAMPAPACHEPORT', myporta, True); StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True); - + SaveStringToFile(destFile,srcContents, False); end; - - - - + + + + //---------------------------------------------- // Create file my.ini (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini'; srcFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini.install'; - + if not FileExists (destFile) then begin LoadStringFromFile (srcFile, srcContents); - + //installDir et version de php StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); - + SaveStringToFile(destFile,srcContents, False); end; - - - - + + + + //---------------------------------------------- // Create file index.php (always but archive if exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/www/index.php'; srcFile := pathWithSlashes+'/www/index.php.install'; - + if not FileExists (destFile) then begin LoadStringFromFile (srcFile, srcContents); @@ -738,164 +738,164 @@ begin StringChangeEx (srcContents, 'WAMPAPACHEPSSL', myportas, True); SaveStringToFile(destFile, srcContents, False); end; - - - - - + + + + + //---------------------------------------------- // Create file dolibarr parametres predefinis install web (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/www/dolibarr/htdocs/install/install.forced.php'; srcFile := pathWithSlashes+'/www/dolibarr/htdocs/install/install.forced.php.install'; - + if not FileExists (destFile) and FileExists (srcFile) then begin LoadStringFromFile (srcFile, srcContents); - + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); - - SaveStringToFile(destFile,srcContents, False); - end; - - - - //---------------------------------------------- - // Create file install_services.bat (always) - //---------------------------------------------- - - destFile := pathWithSlashes+'/install_services.bat'; - srcFile := pathWithSlashes+'/install_services.bat.install'; - - if FileExists(srcFile) then - begin - LoadStringFromFile (srcFile, srcContents); - - //version de apache et mysql - StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); - StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); - StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); - StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); - StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); - - SaveStringToFile(destFile,srcContents, False); - end; - - - - //---------------------------------------------- - // Create file uninstall_services.bat (always) - //---------------------------------------------- - - destFile := pathWithSlashes+'/uninstall_services.bat'; - srcFile := pathWithSlashes+'/uninstall_services.bat.install'; - - if FileExists (srcFile) then - begin - LoadStringFromFile (srcFile, srcContents); - - //version de apache et mysql - StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); - StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); - StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); - - SaveStringToFile(destFile,srcContents, False); - end; - - - - //---------------------------------------------- - // Create file mysqlinitpassword.bat (always) - //---------------------------------------------- - - destFile := pathWithSlashes+'/mysqlinitpassword.bat'; - srcFile := pathWithSlashes+'/mysqlinitpassword.bat.install'; - - if FileExists (srcFile) then - begin - LoadStringFromFile (srcFile, srcContents); - - //version de apache et mysql - StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); - StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); - StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); - - SaveStringToFile(destFile,srcContents, False); - end; - - - //---------------------------------------------- - // Create file mysqltestinstall.bat (always) - //---------------------------------------------- - - destFile := pathWithSlashes+'/mysqltestinstall.bat'; - srcFile := pathWithSlashes+'/mysqltestinstall.bat.install'; - - if FileExists (srcFile) then - begin - LoadStringFromFile (srcFile, srcContents); - - //version de apache et mysql - StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); - StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); - StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); - StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); - - SaveStringToFile(destFile,srcContents, False); - end; - - - //---------------------------------------------- - // Create file startdoliwamp_manual_donotuse.bat (always) - //---------------------------------------------- - - destFile := pathWithSlashes+'/startdoliwamp_manual_donotuse.bat'; - srcFile := pathWithSlashes+'/startdoliwamp_manual_donotuse.bat.install'; - - if FileExists (srcFile) then - begin - LoadStringFromFile (srcFile, srcContents); - - //version de apache et mysql - StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); - StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); - StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); - StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); - - SaveStringToFile(destFile,srcContents, False); - end; - - - //---------------------------------------------- - // Create file builddemosslfiles.bat (always) - //---------------------------------------------- - - destFile := pathWithSlashes+'/builddemosslfiles.bat'; - srcFile := pathWithSlashes+'/builddemosslfiles.bat.install'; - - if FileExists (srcFile) then - begin - LoadStringFromFile (srcFile, srcContents); - - //version de apache et mysql - StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); - StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); - + SaveStringToFile(destFile,srcContents, False); end; - + + + //---------------------------------------------- + // Create file install_services.bat (always) + //---------------------------------------------- + + destFile := pathWithSlashes+'/install_services.bat'; + srcFile := pathWithSlashes+'/install_services.bat.install'; + + if FileExists(srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); + StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); + StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); + StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); + + SaveStringToFile(destFile,srcContents, False); + end; + + + + //---------------------------------------------- + // Create file uninstall_services.bat (always) + //---------------------------------------------- + + destFile := pathWithSlashes+'/uninstall_services.bat'; + srcFile := pathWithSlashes+'/uninstall_services.bat.install'; + + if FileExists (srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); + StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); + StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); + + SaveStringToFile(destFile,srcContents, False); + end; + + + + //---------------------------------------------- + // Create file mysqlinitpassword.bat (always) + //---------------------------------------------- + + destFile := pathWithSlashes+'/mysqlinitpassword.bat'; + srcFile := pathWithSlashes+'/mysqlinitpassword.bat.install'; + + if FileExists (srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); + StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); + + SaveStringToFile(destFile,srcContents, False); + end; + + + //---------------------------------------------- + // Create file mysqltestinstall.bat (always) + //---------------------------------------------- + + destFile := pathWithSlashes+'/mysqltestinstall.bat'; + srcFile := pathWithSlashes+'/mysqltestinstall.bat.install'; + + if FileExists (srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); + StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); + + SaveStringToFile(destFile,srcContents, False); + end; + + + //---------------------------------------------- + // Create file startdoliwamp_manual_donotuse.bat (always) + //---------------------------------------------- + + destFile := pathWithSlashes+'/startdoliwamp_manual_donotuse.bat'; + srcFile := pathWithSlashes+'/startdoliwamp_manual_donotuse.bat.install'; + + if FileExists (srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); + StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); + + SaveStringToFile(destFile,srcContents, False); + end; + + + //---------------------------------------------- + // Create file builddemosslfiles.bat (always) + //---------------------------------------------- + + destFile := pathWithSlashes+'/builddemosslfiles.bat'; + srcFile := pathWithSlashes+'/builddemosslfiles.bat.install'; + + if FileExists (srcFile) then + begin + LoadStringFromFile (srcFile, srcContents); + + //version de apache et mysql + StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); + StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); + + SaveStringToFile(destFile,srcContents, False); + end; + + //---------------------------------------------- // Create file php.ini in php (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini'; srcFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini.install'; - + if not FileExists (destFile) and FileExists(srcFile) then begin LoadStringFromFile (srcFile, srcContents); @@ -904,14 +904,14 @@ begin StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True); SaveStringToFile(destFile,srcContents, False); end; - + //---------------------------------------------- // Create file php.ini in apache (if not exists) //---------------------------------------------- - + destFile := pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/php.ini'; srcFile := pathWithSlashes+'/bin/php/php'+phpVersion+'/php.ini.install'; - + if not FileExists (destFile) and FileExists(srcFile) then begin LoadStringFromFile (srcFile, srcContents); @@ -920,61 +920,61 @@ begin StringChangeEx (srcContents, 'WAMPPHPVERSION', phpVersion, True); SaveStringToFile(destFile,srcContents, False); end; - - - + + + // Uninstall services batFile := path+'\uninstall_services.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); - + // Install services batFile := path+'\install_services.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); - + // Start services batFile := path+'\startdoliwamp.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); //MsgBox(myResult,mbInformation,MB_OK); - + // Change mysql password (works only if not yet defined) batFile := path+'\mysqlinitpassword.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); - + // Remove dangerous files batFile := path+'\removefiles.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); - + // Save parameters to registry RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp', 'smtpServer', mysmtp); RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp', 'apachePort', myporta); RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp', 'apachePSSL', myportas); RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp', 'mysqlPort', myport); RegWriteStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp', 'newPassword', mypass); - - + + res := True; - + end else begin - + // MsgBox('Apache and Mysql installation has been canceled. Please select parameters to start their installation.',mbInformation,MB_OK) res := False; - + end; - + end else begin - + //MsgBox('Selected values seems to be already used. Please choose other values.',mbInformation,MB_OK); - + res := False; end; - + end; diff --git a/build/exe/doliwamp/doliwampoff.ico b/dev/build/exe/doliwamp/doliwampoff.ico similarity index 100% rename from build/exe/doliwamp/doliwampoff.ico rename to dev/build/exe/doliwamp/doliwampoff.ico diff --git a/build/exe/doliwamp/doliwampon.ico b/dev/build/exe/doliwamp/doliwampon.ico similarity index 100% rename from build/exe/doliwamp/doliwampon.ico rename to dev/build/exe/doliwamp/doliwampon.ico diff --git a/build/exe/doliwamp/doliwampsmall.bmp b/dev/build/exe/doliwamp/doliwampsmall.bmp similarity index 100% rename from build/exe/doliwamp/doliwampsmall.bmp rename to dev/build/exe/doliwamp/doliwampsmall.bmp diff --git a/build/exe/doliwamp/httpd.conf.install b/dev/build/exe/doliwamp/httpd.conf.install similarity index 99% rename from build/exe/doliwamp/httpd.conf.install rename to dev/build/exe/doliwamp/httpd.conf.install index 6a65e0833f9..6a90f70212b 100644 --- a/build/exe/doliwamp/httpd.conf.install +++ b/dev/build/exe/doliwamp/httpd.conf.install @@ -584,7 +584,7 @@ AddType application/x-pkcs7-crl .crl #SSLPassPhraseDialog builtin # Inter-Process Session Cache: -# Configure the SSL Session Cache: First the mechanism +# Configure the SSL Session Cache: First the mechanism # to use and second the expiring timeout (in seconds). #SSLSessionCache "dbm:C:/Program Files/Apache Software Foundation/Apache2.2/logs/ssl_scache" #SSLSessionCache "shmcb:C:/Program Files/Apache Software Foundation/Apache2.2/logs/ssl_scache(512000)" @@ -592,7 +592,7 @@ AddType application/x-pkcs7-crl .crl # Semaphore: # Configure the path to the mutual exclusion semaphore the -# SSL engine uses internally for inter-process synchronization. +# SSL engine uses internally for inter-process synchronization. #SSLMutex "file:C:/Program Files/Apache Software Foundation/Apache2.2/logs/ssl_mutex" ## @@ -712,7 +712,7 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key" # and no other module can change it. # o OptRenegotiate: # This enables optimized SSL connection renegotiation handling when SSL -# directives are used in per-directory context. +# directives are used in per-directory context. #SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire # # SSLOptions +StdEnvVars @@ -738,7 +738,7 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key" # alert of the client. This is 100% SSL/TLS standard compliant, but in # practice often causes hanging connections with brain-dead browsers. Use # this only for browsers where you know that their SSL implementation -# works correctly. +# works correctly. # Notice: Most problems of broken clients are also related to the HTTP # keep-alive facility, so you usually additionally want to disable # keep-alive for those clients, too. Use variable "nokeepalive" for this. @@ -749,8 +749,8 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key" # nokeepalive ssl-unclean-shutdown \ # downgrade-1.0 force-response-1.0 - + -Include "${INSTALL_DIR}/alias/*.conf" \ No newline at end of file +Include "${INSTALL_DIR}/alias/*.conf" diff --git a/build/exe/doliwamp/index.php.install b/dev/build/exe/doliwamp/index.php.install similarity index 100% rename from build/exe/doliwamp/index.php.install rename to dev/build/exe/doliwamp/index.php.install diff --git a/build/exe/doliwamp/install.forced.php.install b/dev/build/exe/doliwamp/install.forced.php.install similarity index 99% rename from build/exe/doliwamp/install.forced.php.install rename to dev/build/exe/doliwamp/install.forced.php.install index 8947154a57b..8e86efa7654 100644 --- a/build/exe/doliwamp/install.forced.php.install +++ b/dev/build/exe/doliwamp/install.forced.php.install @@ -25,4 +25,4 @@ $force_install_lockinstall='644'; $force_install_distrib='doliwamp'; $force_install_module=''; -?> \ No newline at end of file +?> diff --git a/build/exe/doliwamp/install_services.bat.install b/dev/build/exe/doliwamp/install_services.bat.install similarity index 97% rename from build/exe/doliwamp/install_services.bat.install rename to dev/build/exe/doliwamp/install_services.bat.install index 981c8b18b70..39318b5e6c6 100644 --- a/build/exe/doliwamp/install_services.bat.install +++ b/dev/build/exe/doliwamp/install_services.bat.install @@ -6,7 +6,7 @@ REM -------------------------------------------------------- echo ---- Execute install_services.bat >> doliwamp.log 2>>&1 REM NET STOP doliwampapache -REM NET STOP doliwampmysqld +REM NET STOP doliwampmysqld cd "WAMPROOT" diff --git a/build/exe/doliwamp/my.ini.install b/dev/build/exe/doliwamp/my.ini.install similarity index 99% rename from build/exe/doliwamp/my.ini.install rename to dev/build/exe/doliwamp/my.ini.install index 4d2037d8e97..cfe94ec2748 100644 --- a/build/exe/doliwamp/my.ini.install +++ b/dev/build/exe/doliwamp/my.ini.install @@ -11,16 +11,16 @@ # (@localstatedir@ for this installation) or to # ~/.my.cnf to set user-specific options. # -# On Windows you should keep this file in the installation directory +# On Windows you should keep this file in the installation directory # of your server (e.g. C:\Program Files\MySQL\MySQL Server 4.1). To -# make sure the server reads the config file use the startup option -# "--defaults-file". +# make sure the server reads the config file use the startup option +# "--defaults-file". # -# To run run the server from the command line, execute this in a +# To run run the server from the command line, execute this in a # command line shell, e.g. # mysqld --defaults-file="C:\Program Files\MySQL\MySQL Server 4.1\my.ini" # -# To install the server as a Windows service manually, execute this in a +# To install the server as a Windows service manually, execute this in a # command line shell, e.g. # mysqld --install MySQL41 --defaults-file="C:\Program Files\MySQL\MySQL Server 4.1\my.ini" # @@ -57,7 +57,7 @@ port=WAMPMYSQLPORT # ---------------------------------------------------------------------- # # The following options will be read by the MySQL Server. Make sure that -# you have installed the server correctly (see above) so it reads this +# you have installed the server correctly (see above) so it reads this # file. # diff --git a/build/exe/doliwamp/mysqlinitpassword.bat.install b/dev/build/exe/doliwamp/mysqlinitpassword.bat.install similarity index 89% rename from build/exe/doliwamp/mysqlinitpassword.bat.install rename to dev/build/exe/doliwamp/mysqlinitpassword.bat.install index 4b9e9ac4173..70f07e76168 100644 --- a/build/exe/doliwamp/mysqlinitpassword.bat.install +++ b/dev/build/exe/doliwamp/mysqlinitpassword.bat.install @@ -3,11 +3,11 @@ REM ----------------------------------- REM This script initialize Mysql root password WHEN PASSWORD IS EMPTY. REM An error is returned IF PASSWORD IS ALREADY SET. REM ----------------------------------- -REM To change password, run following SQL command: +REM To change password, run following SQL command: REM GRANT ALL ON *.* TO login@localhost IDENTIFIED BY "newpassword" REM echo ---- Show content of script mysqlinitpassword before running it >> doliwamp.log 2>>&1 -REM type .\mysqlinitpassword.bat >> doliwamp.log 2>>&1 +REM type .\mysqlinitpassword.bat >> doliwamp.log 2>>&1 REM Wait the mysql init by first startup is ok REM sleep is not a windows command @@ -20,4 +20,3 @@ echo For an update, you will get an "Access denied" error, ignore this error. >> .\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 echo ---- End script >> doliwamp.log 2>>&1 - diff --git a/build/exe/doliwamp/mysqltestinstall.bat.install b/dev/build/exe/doliwamp/mysqltestinstall.bat.install similarity index 89% rename from build/exe/doliwamp/mysqltestinstall.bat.install rename to dev/build/exe/doliwamp/mysqltestinstall.bat.install index b718cf94ac8..2736506ded2 100644 --- a/build/exe/doliwamp/mysqltestinstall.bat.install +++ b/dev/build/exe/doliwamp/mysqltestinstall.bat.install @@ -2,7 +2,7 @@ REM ------------------------------------------------------------ REM Launch a test to connect to mysql REM ------------------------------------------------------------ -REM To change password, run following SQL command: +REM To change password, run following SQL command: REM GRANT ALL ON *.* TO login@localhost IDENTIFIED BY "newpassword" echo ----------------------------------------------------------- @@ -16,7 +16,7 @@ echo ------------------------------------------------------------ SET SAVES= -SET /P SAVES=Enter password to test: +SET /P SAVES=Enter password to test: echo Try to connect to mysql with this password .\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES% diff --git a/build/exe/doliwamp/openssl.conf b/dev/build/exe/doliwamp/openssl.conf similarity index 98% rename from build/exe/doliwamp/openssl.conf rename to dev/build/exe/doliwamp/openssl.conf index c053b07c508..ff2d7562552 100644 --- a/build/exe/doliwamp/openssl.conf +++ b/dev/build/exe/doliwamp/openssl.conf @@ -48,7 +48,7 @@ string_mask = nombstr [ req_distinguished_name ] countryName = Country Name (2 letter code) -countryName_default = +countryName_default = countryName_min = 2 countryName_max = 2 stateOrProvinceName = State or Province Name (full name) @@ -87,4 +87,3 @@ basicConstraints = CA:true [ crl_ext ] authorityKeyIdentifier = keyid:always,issuer:always - diff --git a/build/exe/doliwamp/php.ini.install b/dev/build/exe/doliwamp/php.ini.install similarity index 99% rename from build/exe/doliwamp/php.ini.install rename to dev/build/exe/doliwamp/php.ini.install index cae5269f52e..1a82b065aed 100644 --- a/build/exe/doliwamp/php.ini.install +++ b/dev/build/exe/doliwamp/php.ini.install @@ -44,7 +44,7 @@ ; If you use constants in your value, and these constants belong to a ; dynamically loaded extension (either a PHP extension or a Zend extension), ; you may only use these constants *after* the line that loads the extension. -; +; ; ;;;;;;;;;;;;;;;;;;; ; About this file ; @@ -361,11 +361,11 @@ error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT ; ; possible values for display_errors: ; -; Off - Do not display any errors -; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) +; Off - Do not display any errors +; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) ; On or stdout - Display errors to STDOUT (default) -; -; To output errors to STDERR with CGI/CLI: +; +; To output errors to STDERR with CGI/CLI: ;display_errors = "stderr" ; ; Default @@ -714,9 +714,9 @@ date.timezone = UTC ;PCRE library backtracking limit. ;pcre.backtrack_limit=100000 -;PCRE library recursion limit. -;Please note that if you set this value to a high number you may consume all -;the available process stack and eventually crash PHP (due to reaching the +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). ;pcre.recursion_limit=100000 @@ -1047,7 +1047,7 @@ session.cookie_path = / session.cookie_domain = ; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -session.cookie_httponly = +session.cookie_httponly = ; Handler used to serialize data. php is the standard serializer of PHP. session.serialize_handler = php @@ -1174,7 +1174,7 @@ mssql.secure_connection = Off ; FreeTDS defaults to 4096 ;mssql.max_procs = -1 -; Specify client character set. +; Specify client character set. ; If empty or not set the client charset from freetds.comf is used ; This is only used when compiled with FreeTDS ;mssql.charset = "ISO-8859-1" @@ -1300,7 +1300,7 @@ tidy.clean_output = Off soap.wsdl_cache_enabled=1 ; Sets the directory name where SOAP extension will put cache files. soap.wsdl_cache_dir="/tmp" -; (time to live) Sets the number of second while cached file will be used +; (time to live) Sets the number of second while cached file will be used ; instead of original one. soap.wsdl_cache_ttl=86400 diff --git a/build/exe/doliwamp/phpmyadmin.conf.install b/dev/build/exe/doliwamp/phpmyadmin.conf.install similarity index 93% rename from build/exe/doliwamp/phpmyadmin.conf.install rename to dev/build/exe/doliwamp/phpmyadmin.conf.install index 5f0e806d47b..33a55ec8651 100644 --- a/build/exe/doliwamp/phpmyadmin.conf.install +++ b/dev/build/exe/doliwamp/phpmyadmin.conf.install @@ -1,9 +1,9 @@ -Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/" +Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/" # NOTE FOR APACHE 2.2: # To grant access to dolibarr from outside set lines # -# Order Allow,Deny +# Order Allow,Deny # Allow from all # # instead of @@ -26,4 +26,4 @@ Alias /phpmyadmin "WAMPROOT/apps/phpmyadminWAMPPHPMYADMINVERSION/" Options Indexes FollowSymLinks MultiViews AllowOverride all Require local - \ No newline at end of file + diff --git a/build/exe/doliwamp/removefiles.bat b/dev/build/exe/doliwamp/removefiles.bat similarity index 97% rename from build/exe/doliwamp/removefiles.bat rename to dev/build/exe/doliwamp/removefiles.bat index f00e46be7b9..06d9a9f8fa0 100644 --- a/build/exe/doliwamp/removefiles.bat +++ b/dev/build/exe/doliwamp/removefiles.bat @@ -1,3 +1,2 @@ @echo off del /F .\mysqlinitpassword.bat - diff --git a/build/exe/doliwamp/rundoliadmin.bat.install b/dev/build/exe/doliwamp/rundoliadmin.bat.install similarity index 97% rename from build/exe/doliwamp/rundoliadmin.bat.install rename to dev/build/exe/doliwamp/rundoliadmin.bat.install index c5186c7d1e7..a52ec3005f1 100644 --- a/build/exe/doliwamp/rundoliadmin.bat.install +++ b/dev/build/exe/doliwamp/rundoliadmin.bat.install @@ -4,4 +4,4 @@ REM ---------------------------- REM Go to admin center page start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/ -REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/" \ No newline at end of file +REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/" diff --git a/build/exe/doliwamp/rundolihelp.bat.install b/dev/build/exe/doliwamp/rundolihelp.bat.install similarity index 92% rename from build/exe/doliwamp/rundolihelp.bat.install rename to dev/build/exe/doliwamp/rundolihelp.bat.install index c1c4a7c3d27..3275636d554 100644 --- a/build/exe/doliwamp/rundolihelp.bat.install +++ b/dev/build/exe/doliwamp/rundolihelp.bat.install @@ -5,4 +5,4 @@ REM --------------------------- REM Go to help center page echo Please wait... start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/ -REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/support/" \ No newline at end of file +REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/support/" diff --git a/build/exe/doliwamp/rundoliwamp.bat.install b/dev/build/exe/doliwamp/rundoliwamp.bat.install similarity index 100% rename from build/exe/doliwamp/rundoliwamp.bat.install rename to dev/build/exe/doliwamp/rundoliwamp.bat.install diff --git a/build/exe/doliwamp/startdoliwamp.bat b/dev/build/exe/doliwamp/startdoliwamp.bat similarity index 100% rename from build/exe/doliwamp/startdoliwamp.bat rename to dev/build/exe/doliwamp/startdoliwamp.bat diff --git a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install b/dev/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install similarity index 98% rename from build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install rename to dev/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install index 675cfd4750e..12d0503f157 100644 --- a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install +++ b/dev/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install @@ -9,11 +9,11 @@ REM ----------------------------------------------------- echo Running Apache as user process (this process does not return so we use "start") start WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -f conf\httpd.conf -echo +echo echo Running Mysql as user process (this process does not return so we use "start") REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console start WAMPROOT\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mariadb\mariadbWAMPMYSQLVERSION\my.ini --console -pause \ No newline at end of file +pause diff --git a/build/exe/doliwamp/stopdoliwamp.bat b/dev/build/exe/doliwamp/stopdoliwamp.bat similarity index 95% rename from build/exe/doliwamp/stopdoliwamp.bat rename to dev/build/exe/doliwamp/stopdoliwamp.bat index e7f8caefb77..4de82daa007 100644 --- a/build/exe/doliwamp/stopdoliwamp.bat +++ b/dev/build/exe/doliwamp/stopdoliwamp.bat @@ -8,7 +8,7 @@ echo ---- Execute stopdoliwamp.bat >> doliwamp.log 2>>&1 echo NET STOP doliwampapache >> doliwamp.log 2>>&1 NET STOP doliwampapache echo NET STOP doliwampmysqld >> doliwamp.log 2>>&1 -NET STOP doliwampmysqld +NET STOP doliwampmysqld echo Please wait... echo ---- End script >> doliwamp.log 2>>&1 diff --git a/build/exe/doliwamp/uninstall_services.bat.install b/dev/build/exe/doliwamp/uninstall_services.bat.install similarity index 96% rename from build/exe/doliwamp/uninstall_services.bat.install rename to dev/build/exe/doliwamp/uninstall_services.bat.install index a7329ab1b8f..1a9db9438e7 100644 --- a/build/exe/doliwamp/uninstall_services.bat.install +++ b/dev/build/exe/doliwamp/uninstall_services.bat.install @@ -9,7 +9,7 @@ echo ---- Execute uninstall_services.bat >> doliwamp.log 2>>&1 NET STOP doliwampapache .\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k uninstall -n doliwampapache -NET STOP doliwampmysqld +NET STOP doliwampmysqld REM Mysql 5.0- REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld REM Mysql 5.1+ diff --git a/dev/build/flatpack/org.flatpak.Dolibarr.json b/dev/build/flatpack/org.flatpak.Dolibarr.json new file mode 100644 index 00000000000..effbff7a10a --- /dev/null +++ b/dev/build/flatpack/org.flatpak.Dolibarr.json @@ -0,0 +1 @@ +"Help wanted..." diff --git a/build/generate_filelist_xml.php b/dev/build/generate_filelist_xml.php similarity index 100% rename from build/generate_filelist_xml.php rename to dev/build/generate_filelist_xml.php diff --git a/build/gource/README.md b/dev/build/gource/README.md similarity index 100% rename from build/gource/README.md rename to dev/build/gource/README.md diff --git a/build/gource/avatars/.gitignore b/dev/build/gource/avatars/.gitignore similarity index 100% rename from build/gource/avatars/.gitignore rename to dev/build/gource/avatars/.gitignore diff --git a/build/gource/avatars/README.md b/dev/build/gource/avatars/README.md similarity index 85% rename from build/gource/avatars/README.md rename to dev/build/gource/avatars/README.md index c0b3c6d79af..89aefaea466 100644 --- a/build/gource/avatars/README.md +++ b/dev/build/gource/avatars/README.md @@ -1 +1 @@ -Directory that will be filled with avatars images of developers for gource \ No newline at end of file +Directory that will be filled with avatars images of developers for gource diff --git a/build/gource/getavatars.pl b/dev/build/gource/getavatars.pl similarity index 96% rename from build/gource/getavatars.pl rename to dev/build/gource/getavatars.pl index 1f73da34e91..1f9b2ceffd5 100755 --- a/build/gource/getavatars.pl +++ b/dev/build/gource/getavatars.pl @@ -31,7 +31,7 @@ while() { #try and fetch image - my $grav_url = "http://www.gravatar.com/avatar/".md5_hex(lc $email)."?d=404&size=".$size; + my $grav_url = "http://www.gravatar.com/avatar/".md5_hex(lc $email)."?d=404&size=".$size; warn "fetching image for '$author' $email ($grav_url)...\n"; @@ -46,4 +46,3 @@ while() { } close GITLOG; - diff --git a/build/launchpad/README b/dev/build/launchpad/README similarity index 95% rename from build/launchpad/README rename to dev/build/launchpad/README index b1ebcd25678..a787bf3f9ad 100644 --- a/build/launchpad/README +++ b/dev/build/launchpad/README @@ -21,13 +21,13 @@ a package onto LaunchPad - Link project to official SCM server - Upload SSH public key onto account - Upload you GPG sign key -- Run from command line: +- Run from command line: bzr launchpad-login yourlogin bzr whoami "Your Name " bzr whoami - Edit file ~/.bashrc to add -DEBFULLNAME="" -DEBEMAIL="" +DEBFULLNAME="" +DEBEMAIL="" - Create a Bazaar directory mkdir bzr @@ -40,15 +40,15 @@ If you want to build/test package locally: # Push/declare Dolibarr sources to Launchpad #---------------------------------- -- From Launchpad project (https://launchpad.net/dolibarr), register a series: +- From Launchpad project (https://launchpad.net/dolibarr), register a series: Call it 'trunk' or 'stable' Use branch (dev): https://launchpad.net/~eldy/dolibarr/develop https://launchpad.net/~eldy/dolibarr/stable - or + or Use URL pattern (stable): For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz - + - For Dev, you can also add link series to GIT HEAD. - For stable, you can init from command line cd bzr/dolibarr-stable @@ -131,7 +131,7 @@ List of recipes created https://code.launchpad.net/~eldy/+recipe/dolibarr-dev https://code.launchpad.net/~eldy/+recipe/dolibarr-stable - + # To get/download package from PPA: #---------------------------------- @@ -140,17 +140,15 @@ https://code.launchpad.net/~eldy/+recipe/dolibarr-stable > sudo apt-key add ~/.gnupg/pubring.gpg - Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list -For the development snapshot version: -deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main -deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main +For the development snapshot version: +deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main +deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main For the stable version: -deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main -deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main +deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main +deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main - Update your package cache: > apt-get update -- Install Dolibarr: +- Install Dolibarr: > apt-get install dolibarr - - diff --git a/build/makepack-dolibarr.pl b/dev/build/makepack-dolibarr.pl similarity index 99% rename from build/makepack-dolibarr.pl rename to dev/build/makepack-dolibarr.pl index e9e4f4b69b4..442466b128c 100755 --- a/build/makepack-dolibarr.pl +++ b/dev/build/makepack-dolibarr.pl @@ -63,7 +63,7 @@ $VERSION="4.0"; ($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1; $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; -$SOURCE="$DIR/.."; +$SOURCE="$DIR/../.."; $DESTI="$SOURCE/build"; if ($SOURCE !~ /^\// && $SOURCE !~ /^[a-z]:/i) { diff --git a/build/makepack-dolibarrmodule.conf b/dev/build/makepack-dolibarrmodule.conf similarity index 93% rename from build/makepack-dolibarrmodule.conf rename to dev/build/makepack-dolibarrmodule.conf index 33cd433ea98..caa17a9f851 100644 --- a/build/makepack-dolibarrmodule.conf +++ b/dev/build/makepack-dolibarrmodule.conf @@ -13,4 +13,4 @@ htdocs/mymodule/core/triggers/interface_mymodule.class.php htdocs/mymodule/page1.php htdocs/mymodule/page2.php htdocs/mymodule/sql/script1.sql -htdocs/mymodule/sql/script2.sql \ No newline at end of file +htdocs/mymodule/sql/script2.sql diff --git a/build/makepack-dolibarrmodule.pl b/dev/build/makepack-dolibarrmodule.pl similarity index 96% rename from build/makepack-dolibarrmodule.pl rename to dev/build/makepack-dolibarrmodule.pl index 8fbb28dc35f..5f51582a65b 100755 --- a/build/makepack-dolibarrmodule.pl +++ b/dev/build/makepack-dolibarrmodule.pl @@ -7,6 +7,8 @@ #---------------------------------------------------------------------------- use Cwd; +use Term::ANSIColor; + $OWNER="ldestailleur"; $GROUP="ldestailleur"; @@ -63,7 +65,7 @@ if (! $TEMP || ! -d $TEMP) { print "$PROG.$Extension aborted.\n"; sleep 2; exit 2; -} +} $BUILDROOT="$TEMP/dolibarr-buildroot"; @@ -74,11 +76,11 @@ for (0..@ARGV-1) { if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; } if ($ARGV[$_] =~ /^-*desti=(.+)/i) { $DESTI=$1; } if ($ARGV[$_] =~ /^-*prefix=(.+)/i) { - $PREFIX=$1; - $FILENAMESNAPSHOT.="-".$PREFIX; + $PREFIX=$1; + $FILENAMESNAPSHOT.="-".$PREFIX; } } -$SOURCE="$DIR/.."; +$SOURCE="$DIR/../.."; $DESTI="$SOURCE/build"; if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; } # Force output dir if env DESTIMODULES is defined $NEWDESTI=$DESTI; @@ -105,7 +107,7 @@ if ($PROJECTINPUT eq "all") closedir(DIR); foreach my $xxx (0..@rv-1) { if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/) - { + { @PROJECTLIST[$xxx]=$1; } } @@ -118,9 +120,9 @@ else # Loop on each projects foreach my $PROJECT (@PROJECTLIST) { - + $PROJECTLC=lc($PROJECT); - + if (! -f "makepack-".$PROJECT.".conf") { print "Error: can't open conf file makepack-".$PROJECT.".conf\n"; @@ -131,15 +133,15 @@ foreach my $PROJECT (@PROJECTLIST) { sleep 2; exit 2; } - + # Get version $MAJOR, $MINOR and $BUILD print "Version detected for module ".$PROJECT.": "; $result=open(IN,"<".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php"); $custom=false; - if (! $result) { + if (! $result) { $result=open(IN,"<".$SOURCE."/htdocs/custom/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php"); if (! $result) { - die "Error: Can't open descriptor file ".$SOURCE."/htdocs/(or /htdocs/custom/)".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; + die "Error: Can't open descriptor file ".$SOURCE."/htdocs/(or /htdocs/custom/)".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; }else{ $custom = true; } @@ -158,7 +160,7 @@ foreach my $PROJECT (@PROJECTLIST) { $MINOR=; chomp($MINOR); } - + $FILENAME="$PROJECTLC"; $FILENAMETGZ="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":""); $FILENAMEZIP="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":""); @@ -170,29 +172,29 @@ foreach my $PROJECT (@PROJECTLIST) { # mandrake $RPMDIR="/usr/src/RPM"; } - - + + # Choose package targets #----------------------- $target="ZIP"; # Dolibarr modules are this format $CHOOSEDTARGET{uc($target)}=1; - - + + # Test if requirement is ok #-------------------------- foreach my $target (keys %CHOOSEDTARGET) { foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) { - # Test + # Test print "Test requirement for target $target: Search '$req'... "; $ret=`"$req" 2>&1`; $coderetour=$?; $coderetour2=$coderetour>>8; - if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { + if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { # Not found error, we try in PROGPATH $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`; $coderetour=$?; $coderetour2=$coderetour>>8; $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req"; - } - + } + if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) { # Not found error print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n"; @@ -204,9 +206,9 @@ foreach my $PROJECT (@PROJECTLIST) { } } } - + print "\n"; - + # Check if there is at least on target to build #---------------------------------------------- $nboftargetok=0; @@ -214,7 +216,7 @@ foreach my $PROJECT (@PROJECTLIST) { $nboftargetneedcvs=0; foreach my $target (keys %CHOOSEDTARGET) { if ($CHOOSEDTARGET{$target} < 0) { next; } - if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') + if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') { $nboftargetneedbuildroot++; } @@ -224,9 +226,9 @@ foreach my $PROJECT (@PROJECTLIST) { } $nboftargetok++; } - + if ($nboftargetok) { - + # Update CVS if required #----------------------- if ($nboftargetneedcvs) @@ -238,7 +240,7 @@ foreach my $PROJECT (@PROJECTLIST) { $ret=`cvs update -P -d 2>&1`; chdir("$olddir"); } - + # Update buildroot if required #----------------------------- if ($nboftargetneedbuildroot) @@ -246,18 +248,18 @@ foreach my $PROJECT (@PROJECTLIST) { if (! $copyalreadydone) { print "Delete directory $BUILDROOT\n"; $ret=`rm -fr "$BUILDROOT"`; - + mkdir "$BUILDROOT"; mkdir "$BUILDROOT/$PROJECTLC"; - + $result=open(IN,") { $entry=$_; - + if ($entry =~ /^#/) { next; } # Do not process comments - + $entry =~ s/\n//; if ($entry =~ /^!(.*)$/) # Exclude so remove file/dir @@ -265,9 +267,9 @@ foreach my $PROJECT (@PROJECTLIST) { print "Remove $BUILDROOT/$PROJECTLC/$1\n"; $ret=`rm -fr "$BUILDROOT/$PROJECTLC/"$1`; if ($? != 0) { die "Failed to delete a file to exclude declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; } - next; + next; } - + $entry =~ /^(.*)\/[^\/]+/; print "Create directory $BUILDROOT/$PROJECTLC/$1\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECTLC/$1"`; @@ -275,16 +277,16 @@ foreach my $PROJECT (@PROJECTLIST) { { print "Copy $SOURCE/$entry into $BUILDROOT/$PROJECTLC/$entry\n"; $ret=`cp -pr "$SOURCE/$entry" "$BUILDROOT/$PROJECTLC/$entry"`; - if ($? != 0) { die "Failed to make copy of a file declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; } + if ($? != 0) { die "Failed to make copy of a file declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; } } - - } + + } close IN; - + @timearray=localtime(time()); $fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1]; open(VF,">$BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt"); - + print "Create version file $BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECTLC/build"`; print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n"; @@ -312,18 +314,18 @@ foreach my $PROJECT (@PROJECTLIST) { $ret=`rm -fr $BUILDROOT/$PROJECTLC/test`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/Thumbs.db $BUILDROOT/$PROJECTLC/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECTLC/CVS* $BUILDROOT/$PROJECTLC/*/CVS* $BUILDROOT/$PROJECTLC/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/*/CVS*`; - } - + } + # Build package for each target #------------------------------ foreach my $target (keys %CHOOSEDTARGET) { if ($CHOOSEDTARGET{$target} < 0) { next; } - + print "\nBuild package for target $target\n"; - + if ($target eq 'TGZ') { $NEWDESTI=$DESTI; - if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } + if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } print "Remove target $FILENAMETGZ.tgz...\n"; unlink("$NEWDESTI/$FILENAMETGZ.tgz"); @@ -340,15 +342,15 @@ foreach my $PROJECT (@PROJECTLIST) { } next; } - + if ($target eq 'ZIP') { $NEWDESTI=$DESTI; if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } - + print "Remove target $FILENAMEZIP.zip...\n"; unlink "$NEWDESTI/$FILENAMEZIP.zip"; print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n"; - + print "Go to directory $BUILDROOT/$PROJECTLC\n"; $olddir=getcwd(); chdir("$BUILDROOT/$PROJECTLC"); @@ -356,13 +358,13 @@ foreach my $PROJECT (@PROJECTLIST) { print $cmd."\n"; $ret= `$cmd`; chdir("$olddir"); - + print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n"; $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`; $ret=`chown $OWNER.$GROUP "$NEWDESTI/$FILENAMEZIP.zip"`; next; } - + if ($target eq 'EXE') { $NEWDESTI=$DESTI; if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } @@ -377,11 +379,11 @@ foreach my $PROJECT (@PROJECTLIST) { rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe"); next; } - + } - + } - + print "\n----- Summary -----\n"; foreach my $target (keys %CHOOSEDTARGET) { if ($CHOOSEDTARGET{$target} < 0) { diff --git a/build/makepack-dolibarrtheme.pl b/dev/build/makepack-dolibarrtheme.pl similarity index 97% rename from build/makepack-dolibarrtheme.pl rename to dev/build/makepack-dolibarrtheme.pl index 2171d87922e..6aeb32a5fcb 100755 --- a/build/makepack-dolibarrtheme.pl +++ b/dev/build/makepack-dolibarrtheme.pl @@ -6,6 +6,7 @@ #----------------------------------------------------------------------------- use Cwd; +use Term::ANSIColor; $PROJECT="dolibarr"; @@ -66,7 +67,7 @@ if (! $TEMP || ! -d $TEMP) { print "makepack-dolibarrtheme.pl aborted.\n"; sleep 2; exit 2; -} +} $BUILDROOT="$TEMP/dolibarr-buildroot"; @@ -108,7 +109,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } -$SOURCE="$DIR/.."; +$SOURCE="$DIR/../.."; $DESTI="$SOURCE/build"; @@ -128,13 +129,13 @@ else { $cpt++; printf(" %d - %3s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); } - + # Are asked to select the file to move print "Choose one package number or several separated with space: "; - $NUM_SCRIPT=; + $NUM_SCRIPT=; chomp($NUM_SCRIPT); if ($NUM_SCRIPT =~ s/-//g) { - # Do not do copy + # Do not do copy $copyalreadydone=1; } if ($NUM_SCRIPT !~ /^[0-$cpt\s]+$/) @@ -164,16 +165,16 @@ else { #-------------------------- foreach my $target (keys %CHOOSEDTARGET) { foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) { - # Test + # Test print "Test requirement for target $target: Search '$req'... "; $ret=`"$req" 2>&1`; $coderetour=$?; $coderetour2=$coderetour>>8; - if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { + if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { # Not found error, we try in PROGPATH $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`; $coderetour=$?; $coderetour2=$coderetour>>8; $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req"; - } + } if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) { # Not found error @@ -218,15 +219,15 @@ if ($nboftargetok) { print "Clean $BUILDROOT\n"; $ret=`rm -fr $BUILDROOT/htdocs/theme/$PROJECT/Thumbs.db $BUILDROOT/htdocs/theme/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/theme/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/theme/$PROJECT/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/htdocs/theme/$PROJECT/CVS* $BUILDROOT/htdocs/theme/$PROJECT/*/CVS* $BUILDROOT/htdocs/theme/$PROJECT/*/*/CVS* $BUILDROOT/htdocs/theme/$PROJECT/*/*/*/CVS* $BUILDROOT/htdocs/theme/$PROJECT/*/*/*/*/CVS* $BUILDROOT/htdocs/theme/$PROJECT/*/*/*/*/*/CVS*`; - - + + # Build package for each target #------------------------------ foreach my $target (keys %CHOOSEDTARGET) { if ($CHOOSEDTARGET{$target} < 0) { next; } - + print "\nBuild package for target $target\n"; - + if ($target eq 'TGZ') { unlink $FILENAMETGZ.tgz; print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n"; @@ -248,7 +249,7 @@ if ($nboftargetok) { $ret=`mv "$FILENAMEZIP.zip" "$DESTI/$FILENAMEZIP.zip"`; next; } - + } } diff --git a/build/makepack-howto.txt b/dev/build/makepack-howto.txt similarity index 100% rename from build/makepack-howto.txt rename to dev/build/makepack-howto.txt diff --git a/build/obs/README b/dev/build/obs/README similarity index 89% rename from build/obs/README rename to dev/build/obs/README index 6b047b42fcf..31be61db275 100644 --- a/build/obs/README +++ b/dev/build/obs/README @@ -1,19 +1,19 @@ README (English) ################################################## OBS Package tools -OBE - openSUSE Build Service +OBE - openSUSE Build Service ################################################## -This directory contains an instruction to explain +This directory contains an instruction to explain how to publish a package onto OBS. -# Create a project onto OBS ---------------------------- -https://build.opensuse.org +# Create a project onto OBS +--------------------------- +https://build.opensuse.org -# Packaging rules: +# Packaging rules: ------------------ https://en.opensuse.org/Portal:Packaging @@ -55,4 +55,4 @@ For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintene https://build.opensuse.org/project/show/Application:ERP - Once done, go into project, category, subproject and enter a subproject for your application. For example: Dolibarr -- Then go onto project into your home and ask a publish to the category/you project your created. +- Then go onto project into your home and ask a publish to the category/you project your created. diff --git a/build/pad/DoliWamp.pml b/dev/build/pad/DoliWamp.pml similarity index 99% rename from build/pad/DoliWamp.pml rename to dev/build/pad/DoliWamp.pml index cf3ed134961..05c87787ea5 100644 --- a/build/pad/DoliWamp.pml +++ b/dev/build/pad/DoliWamp.pml @@ -42,7 +42,7 @@ DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs. DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. - DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP & CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. + DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP & CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. diff --git a/build/pad/Dolibarr developpers.cml b/dev/build/pad/Dolibarr developpers.cml similarity index 100% rename from build/pad/Dolibarr developpers.cml rename to dev/build/pad/Dolibarr developpers.cml diff --git a/build/pad/Dolibarr.pml b/dev/build/pad/Dolibarr.pml similarity index 99% rename from build/pad/Dolibarr.pml rename to dev/build/pad/Dolibarr.pml index 7e83081975c..166a4bd8619 100644 --- a/build/pad/Dolibarr.pml +++ b/dev/build/pad/Dolibarr.pml @@ -45,7 +45,7 @@ Dolibarr ERP & CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install Simple to use -Simple to develop +Simple to develop Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian). @@ -65,7 +65,7 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt Dolibarr ERP/CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S): Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle) Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie) -Simple pour le développement (pas de frameworks lourds). +Simple pour le développement (pas de frameworks lourds). Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. diff --git a/build/pad/NLTechno.cml b/dev/build/pad/NLTechno.cml similarity index 100% rename from build/pad/NLTechno.cml rename to dev/build/pad/NLTechno.cml diff --git a/build/pad/README b/dev/build/pad/README similarity index 100% rename from build/pad/README rename to dev/build/pad/README diff --git a/build/pad/pad_dolibarr.xml b/dev/build/pad/pad_dolibarr.xml similarity index 99% rename from build/pad/pad_dolibarr.xml rename to dev/build/pad/pad_dolibarr.xml index 3ebda35f2fd..2660541a6c7 100644 --- a/build/pad/pad_dolibarr.xml +++ b/dev/build/pad/pad_dolibarr.xml @@ -75,7 +75,7 @@ Dolibarr ERP & CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, Odoo, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install Simple to use -Simple to develop +Simple to develop Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian). @@ -87,7 +87,7 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt Dolibarr ERP & CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S): Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle) Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie) -Simple pour le développement (pas de frameworks lourds). +Simple pour le développement (pas de frameworks lourds). Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. diff --git a/build/pad/pad_dolibarr_nos.xml b/dev/build/pad/pad_dolibarr_nos.xml similarity index 99% rename from build/pad/pad_dolibarr_nos.xml rename to dev/build/pad/pad_dolibarr_nos.xml index 64d1d56dd5a..27a4f4497f6 100644 --- a/build/pad/pad_dolibarr_nos.xml +++ b/dev/build/pad/pad_dolibarr_nos.xml @@ -75,7 +75,7 @@ Dolibarr ERP & CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install Simple to use -Simple to develop +Simple to develop Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian). @@ -87,7 +87,7 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt Dolibarr ERP & CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S): Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle) Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie) -Simple pour le développement (pas de frameworks lourds). +Simple pour le développement (pas de frameworks lourds). Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. diff --git a/build/pad/pad_doliwamp.xml b/dev/build/pad/pad_doliwamp.xml similarity index 99% rename from build/pad/pad_doliwamp.xml rename to dev/build/pad/pad_doliwamp.xml index d5d4a1d6703..24d20b918e7 100644 --- a/build/pad/pad_doliwamp.xml +++ b/dev/build/pad/pad_doliwamp.xml @@ -72,7 +72,7 @@ DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs. DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. - DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP & CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. + DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP & CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. diff --git a/build/pad/pad_doliwamp_nos.xml b/dev/build/pad/pad_doliwamp_nos.xml similarity index 99% rename from build/pad/pad_doliwamp_nos.xml rename to dev/build/pad/pad_doliwamp_nos.xml index 4360e92c3e4..f24d55ed950 100644 --- a/build/pad/pad_doliwamp_nos.xml +++ b/dev/build/pad/pad_doliwamp_nos.xml @@ -72,7 +72,7 @@ DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs. DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. - DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP & CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. + DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP & CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. diff --git a/build/patch/README b/dev/build/patch/README similarity index 89% rename from build/patch/README rename to dev/build/patch/README index 6b63713122f..5c2bb973d5d 100644 --- a/build/patch/README +++ b/dev/build/patch/README @@ -3,7 +3,7 @@ README (English) Building a Patch file ################################################## -This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree. +This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree. The output patch file can then be submitted on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch. Using this tool is now deprecated. You must use git pull requests to submit contributions. diff --git a/build/patch/buildpatch.sh b/dev/build/patch/buildpatch.sh similarity index 100% rename from build/patch/buildpatch.sh rename to dev/build/patch/buildpatch.sh diff --git a/build/pdf/README.txt b/dev/build/pdf/README.txt similarity index 80% rename from build/pdf/README.txt rename to dev/build/pdf/README.txt index 7a5424ca3d5..3a0f43ff2ea 100644 --- a/build/pdf/README.txt +++ b/dev/build/pdf/README.txt @@ -1,7 +1,7 @@ To make htmldoc working from wiki.dolibarr.org, the wiki must be modified to have -To disable part of content, add: -class="htmldoc-ignore" +To disable part of content, add: +class="htmldoc-ignore" with css .htmldoc-ignore { display: none; } diff --git a/build/pdf/htmldoc_en.book b/dev/build/pdf/htmldoc_en.book similarity index 100% rename from build/pdf/htmldoc_en.book rename to dev/build/pdf/htmldoc_en.book diff --git a/build/perl/virtualmin/README b/dev/build/perl/virtualmin/README similarity index 89% rename from build/perl/virtualmin/README rename to dev/build/perl/virtualmin/README index 6da04e5f0b8..cde6224c024 100644 --- a/build/perl/virtualmin/README +++ b/dev/build/perl/virtualmin/README @@ -7,4 +7,4 @@ This script will install automatically Dolibarr from Virtualmin. (Included in the professional version and can be added in the GPL version) https://www.virtualmin.com -http://www.webmin.com/virtualmin.html \ No newline at end of file +http://www.webmin.com/virtualmin.html diff --git a/build/perl/virtualmin/dolibarr.pl b/dev/build/perl/virtualmin/dolibarr.pl similarity index 99% rename from build/perl/virtualmin/dolibarr.pl rename to dev/build/perl/virtualmin/dolibarr.pl index b5bacf59356..6ac8b9449cb 100644 --- a/build/perl/virtualmin/dolibarr.pl +++ b/dev/build/perl/virtualmin/dolibarr.pl @@ -252,7 +252,7 @@ if ($upgrade) { ©_source_dest_as_domain_user($d, $oldcfile, $cfile); ©_source_dest_as_domain_user($d, $olddocdir, $docdir); ©_source_dest_as_domain_user($d, $oldaltdir, $altdir); - + # First page (Update database schema) local @params = ( [ "action", "upgrade" ], [ "versionfrom", $upgrade->{'version'} ], @@ -260,7 +260,7 @@ if ($upgrade) { ); local $err = &call_dolibarr_wizard_page(\@params, "upgrade", $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Second page (Migrate some data) local @params = ( [ "action", "upgrade" ], [ "versionfrom", $upgrade->{'version'} ], @@ -268,7 +268,7 @@ if ($upgrade) { ); local $err = &call_dolibarr_wizard_page(\@params, "upgrade2", $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Third page (Update version number) local @params = ( [ "action", "upgrade" ], [ "versionfrom", $upgrade->{'version'} ], @@ -278,12 +278,12 @@ if ($upgrade) { local $p = $ver >= 3.8 ? "step5" : "etape5"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Remove the installation directory. (deprecated) # local $dinstall = "$opts->{'dir'}/install"; # $dinstall =~ s/\/$//; # $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall)); - + } else { # First page (Db connection and config file creation) @@ -305,13 +305,13 @@ else { local $p = $ver >= 3.8 ? "step1" : "etape1"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Second page (Populate database) local @params = ( [ "action", "set" ] ); local $p = $ver >= 3.8 ? "step2" : "etape2"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Third page (Add administrator account) local @params = ( [ "action", "set" ], [ "login", "admin" ], @@ -322,17 +322,17 @@ else { local $p = $ver >= 3.8 ? "step5" : "etape5"; local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts); return (-1, "Dolibarr wizard failed : $err") if ($err); - + # Remove the installation directory (deprecated) # local $dinstall = "$opts->{'dir'}/install"; # $dinstall =~ s/\/$//; # $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall)); - + # Protect config file &set_permissions_as_domain_user($d, 0644, $cfile); &set_permissions_as_domain_user($d, 0755, $cfiledir); } - + # Return a URL for the user local $rp = $opts->{'dir'}; $rp =~ s/^$d->{'home'}\///; diff --git a/build/phpstan/README b/dev/build/phpstan/README similarity index 97% rename from build/phpstan/README rename to dev/build/phpstan/README index 30f7a20b24e..7f207283b61 100644 --- a/build/phpstan/README +++ b/dev/build/phpstan/README @@ -1,4 +1,4 @@ -PHPStan (https://phpstan.org) +PHPStan (https://phpstan.org) ----------------------------- PHPStan requires PHP >= 7.1 diff --git a/build/phpstan/bootstrap.php b/dev/build/phpstan/bootstrap.php similarity index 100% rename from build/phpstan/bootstrap.php rename to dev/build/phpstan/bootstrap.php diff --git a/build/phpstan/bootstrap_action.php b/dev/build/phpstan/bootstrap_action.php similarity index 100% rename from build/phpstan/bootstrap_action.php rename to dev/build/phpstan/bootstrap_action.php diff --git a/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon similarity index 100% rename from build/phpstan/phpstan-baseline.neon rename to dev/build/phpstan/phpstan-baseline.neon diff --git a/build/rpm/GURULABS-RPM-GUIDE-v1.0.PDF b/dev/build/rpm/GURULABS-RPM-GUIDE-v1.0.PDF similarity index 100% rename from build/rpm/GURULABS-RPM-GUIDE-v1.0.PDF rename to dev/build/rpm/GURULABS-RPM-GUIDE-v1.0.PDF diff --git a/build/rpm/README b/dev/build/rpm/README similarity index 95% rename from build/rpm/README rename to dev/build/rpm/README index ab7be252ccb..ef10378b20a 100644 --- a/build/rpm/README +++ b/dev/build/rpm/README @@ -3,7 +3,7 @@ README (English) RPM Package tools ################################################## -This directory contains files used by makepack-dolibarr.pl script to build a package, +This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed with format RPM (https://rpm.org) for Linux Distributions like Redhat, Fedora, CentOS, OpenSuse, OpenMandriva, Mageia ... @@ -20,11 +20,11 @@ for Linux Distributions like Redhat, Fedora, CentOS, OpenSuse, OpenMandriva, Mag # On Fedora # ========= -# rpm -i --test dolibarr-...rpm to list dependencies of RPM -# yum -v install dolibarr-...rpm to install package and dependencies -# yum -v erase dolibarr to remove package -# chcon -R -h -t httpd_sys_script_rw_t /file to add temporary context rw for httpd on /file -# restorecon -R -v /file to restore values into files (cancel chcon, validate semanage) +# rpm -i --test dolibarr-...rpm to list dependencies of RPM +# yum -v install dolibarr-...rpm to install package and dependencies +# yum -v erase dolibarr to remove package +# chcon -R -h -t httpd_sys_script_rw_t /file to add temporary context rw for httpd on /file +# restorecon -R -v /file to restore values into files (cancel chcon, validate semanage) # semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" to add persistent context rw for httpd on /dir (this add file_contexts.local) diff --git a/build/rpm/conf.php b/dev/build/rpm/conf.php similarity index 100% rename from build/rpm/conf.php rename to dev/build/rpm/conf.php diff --git a/build/rpm/dolibarr-forrpm.patch b/dev/build/rpm/dolibarr-forrpm.patch similarity index 97% rename from build/rpm/dolibarr-forrpm.patch rename to dev/build/rpm/dolibarr-forrpm.patch index 884d1a02e40..5ef30d39025 100644 --- a/build/rpm/dolibarr-forrpm.patch +++ b/dev/build/rpm/dolibarr-forrpm.patch @@ -1,7 +1,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php --- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200 +++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200 -@@ -63,8 +63,8 @@ +@@ -63,8 +63,8 @@ $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; // For debian/redhat like systems @@ -9,8 +9,8 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php -//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; - - + + // Include configuration diff -up htdocs/install/inc.php.patch htdocs/install/inc.php --- htdocs/install/inc.php.patch 2011-09-03 02:33:26.450952000 +0200 @@ -23,6 +23,6 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php -//$conffiletoshow = "/etc/dolibarr/conf.php"; +$conffile = "/etc/dolibarr/conf.php"; +$conffiletoshow = "/etc/dolibarr/conf.php"; - + $short_options = "c:h"; $long_options = array( diff --git a/build/rpm/dolibarr.desktop b/dev/build/rpm/dolibarr.desktop similarity index 97% rename from build/rpm/dolibarr.desktop rename to dev/build/rpm/dolibarr.desktop index 8a2d8adb99c..c574c6d3e88 100644 --- a/build/rpm/dolibarr.desktop +++ b/dev/build/rpm/dolibarr.desktop @@ -13,7 +13,7 @@ Comment[es]=Software para gestión de PYMES, profesionales independientes, auto Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL -# For Fedora: xdg-open +# For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) Exec=xdg-open http://localhost/dolibarr diff --git a/build/rpm/dolibarr_fedora.spec b/dev/build/rpm/dolibarr_fedora.spec similarity index 100% rename from build/rpm/dolibarr_fedora.spec rename to dev/build/rpm/dolibarr_fedora.spec diff --git a/build/rpm/dolibarr_generic.spec b/dev/build/rpm/dolibarr_generic.spec similarity index 100% rename from build/rpm/dolibarr_generic.spec rename to dev/build/rpm/dolibarr_generic.spec diff --git a/build/rpm/dolibarr_mandriva.spec b/dev/build/rpm/dolibarr_mandriva.spec similarity index 100% rename from build/rpm/dolibarr_mandriva.spec rename to dev/build/rpm/dolibarr_mandriva.spec diff --git a/build/rpm/dolibarr_opensuse.spec b/dev/build/rpm/dolibarr_opensuse.spec similarity index 100% rename from build/rpm/dolibarr_opensuse.spec rename to dev/build/rpm/dolibarr_opensuse.spec diff --git a/build/rpm/file_contexts.dolibarr b/dev/build/rpm/file_contexts.dolibarr similarity index 98% rename from build/rpm/file_contexts.dolibarr rename to dev/build/rpm/file_contexts.dolibarr index 9dbe838d2ad..38c51c9ed6d 100644 --- a/build/rpm/file_contexts.dolibarr +++ b/dev/build/rpm/file_contexts.dolibarr @@ -4,6 +4,6 @@ # # Note: To allow temporary write permission for httpd: # chcon -R -h -t httpd_sys_script_rw_t /dirtoallow -# +# /etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 diff --git a/build/rpm/httpd-dolibarr.conf b/dev/build/rpm/httpd-dolibarr.conf similarity index 98% rename from build/rpm/httpd-dolibarr.conf rename to dev/build/rpm/httpd-dolibarr.conf index ebda2b3ddfc..a33cf6db84b 100644 --- a/build/rpm/httpd-dolibarr.conf +++ b/dev/build/rpm/httpd-dolibarr.conf @@ -31,15 +31,15 @@ Alias /dolibarr /usr/share/dolibarr/htdocs # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files). - # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. + # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. #AddType text/javascript .jgz #AddEncoding gzip .jgz - + # OPTIMIZE: To use gzip compression (on the fly). # Note that you must also enable the module mod_deflate. - # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. + # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. #TODO - + # OPTIMIZE: To use cache on static pages (A259200 = 1 month). # Note that you must also enable the module mod_expires. #ExpiresActive On @@ -51,7 +51,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs #ExpiresByType text/javascript A2592000 #ExpiresByType application/x-javascript A2592000 #ExpiresByType application/javascript A2592000 - + # Directory for public pages @@ -103,4 +103,3 @@ Alias /dolibarr /usr/share/dolibarr/htdocs AllowOverride All - diff --git a/build/rpm/install.forced.php.fedora b/dev/build/rpm/install.forced.php.fedora similarity index 100% rename from build/rpm/install.forced.php.fedora rename to dev/build/rpm/install.forced.php.fedora diff --git a/build/rpm/install.forced.php.generic b/dev/build/rpm/install.forced.php.generic similarity index 100% rename from build/rpm/install.forced.php.generic rename to dev/build/rpm/install.forced.php.generic diff --git a/build/rpm/install.forced.php.mandriva b/dev/build/rpm/install.forced.php.mandriva similarity index 100% rename from build/rpm/install.forced.php.mandriva rename to dev/build/rpm/install.forced.php.mandriva diff --git a/build/rpm/install.forced.php.opensuse b/dev/build/rpm/install.forced.php.opensuse similarity index 100% rename from build/rpm/install.forced.php.opensuse rename to dev/build/rpm/install.forced.php.opensuse diff --git a/build/sitemap/README b/dev/build/sitemap/README similarity index 73% rename from build/sitemap/README rename to dev/build/sitemap/README index a06bd58f259..8f286ed7db7 100644 --- a/build/sitemap/README +++ b/dev/build/sitemap/README @@ -1,6 +1,5 @@ # Format of sitemap file is available at # https://www.sitemaps.org/protocol.html -# To build a sitemap from urllist-bing.txt, run +# To build a sitemap from urllist-bing.txt, run # google-sitemapgen --config=config-bing.xml --testing - diff --git a/build/sitemap/config-bing.xml b/dev/build/sitemap/config-bing.xml similarity index 99% rename from build/sitemap/config-bing.xml rename to dev/build/sitemap/config-bing.xml index c08d8bb7a5d..346c7b08b80 100644 --- a/build/sitemap/config-bing.xml +++ b/dev/build/sitemap/config-bing.xml @@ -57,7 +57,7 @@ changefreq - how often content at this URL is usually updated priority - value 0.0 to 1.0 of relative importance in your site --> - - - - diff --git a/build/sitemap/urllist-wiki.txt b/dev/build/sitemap/urllist-wiki.txt similarity index 100% rename from build/sitemap/urllist-wiki.txt rename to dev/build/sitemap/urllist-wiki.txt diff --git a/build/tgz/README b/dev/build/tgz/README similarity index 93% rename from build/tgz/README rename to dev/build/tgz/README index e556b78fd67..01d2defc68e 100644 --- a/build/tgz/README +++ b/dev/build/tgz/README @@ -5,4 +5,4 @@ TGZ Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format .tgz \ No newline at end of file +with format .tgz diff --git a/build/tgz/tar_exclude.txt b/dev/build/tgz/tar_exclude.txt similarity index 100% rename from build/tgz/tar_exclude.txt rename to dev/build/tgz/tar_exclude.txt diff --git a/build/travis-ci/apache.conf b/dev/build/travis-ci/apache.conf similarity index 99% rename from build/travis-ci/apache.conf rename to dev/build/travis-ci/apache.conf index 1d8b5d33923..7d9dadca124 100644 --- a/build/travis-ci/apache.conf +++ b/dev/build/travis-ci/apache.conf @@ -14,7 +14,7 @@ # Action php5-fcgi /php5-fcgi # Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi # FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization - # + # # # Require all granted # diff --git a/build/zip/README b/dev/build/zip/README similarity index 93% rename from build/zip/README rename to dev/build/zip/README index f96f373f964..ea103a6b95e 100644 --- a/build/zip/README +++ b/dev/build/zip/README @@ -5,4 +5,4 @@ ZIP Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format .zip \ No newline at end of file +with format .zip diff --git a/build/zip/zip_exclude.txt b/dev/build/zip/zip_exclude.txt similarity index 100% rename from build/zip/zip_exclude.txt rename to dev/build/zip/zip_exclude.txt