mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Move dir build into dev/build
This commit is contained in:
Laurent Destailleur (aka Eldy)
parent
4253fa54ec
commit
c9519a1a5a
|
|
@ -1 +0,0 @@
|
|||
10
|
||||
|
|
@ -1 +0,0 @@
|
|||
[type: gettext/rfc822deb] dolibarr.templates
|
||||
|
|
@ -1 +0,0 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -1 +0,0 @@
|
|||
"Help wanted..."
|
||||
0
build/.gitignore → dev/build/.gitignore
vendored
0
build/.gitignore → dev/build/.gitignore
vendored
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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.
|
||||
|
|
@ -2,5 +2,5 @@ dolibarr (__VERSION__) UNRELEASED; urgency=low
|
|||
|
||||
[ Laurent Destailleur (eldy) ]
|
||||
* New upstream release.
|
||||
|
||||
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 12 May 2015 12:00:00 +0100
|
||||
|
||||
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 12 May 2015 12:00:00 +0100
|
||||
1
dev/build/debian/compat
Normal file
1
dev/build/debian/compat
Normal file
|
|
@ -0,0 +1 @@
|
|||
10
|
||||
|
|
@ -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';
|
||||
|
||||
|
|
@ -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.
|
||||
.
|
||||
|
|
@ -38,7 +38,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
|||
2011, Herve Prot <herve.prot@symeos.com>
|
||||
2011, Remy Younes <ryounes@gmail.com>
|
||||
2012-2013, Christophe Battarel <christophe.battarel@altairis.fr>
|
||||
|
||||
|
||||
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 <eldy@users.sourceforge.net>
|
||||
License: GPL-2+
|
||||
This program is free software; you can redistribute it
|
||||
0
build/debian/dolibarr.config → dev/build/debian/dolibarr.config
Normal file → Executable file
0
build/debian/dolibarr.config → dev/build/debian/dolibarr.config
Normal file → Executable file
|
|
@ -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
|
||||
|
|
@ -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/
|
||||
doc/index.html usr/share/doc/dolibarr/
|
||||
|
|
@ -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
|
||||
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
|
||||
0
build/debian/dolibarr.postinst → dev/build/debian/dolibarr.postinst
Normal file → Executable file
0
build/debian/dolibarr.postinst → dev/build/debian/dolibarr.postinst
Normal file → Executable file
0
build/debian/dolibarr.postrm → dev/build/debian/dolibarr.postrm
Normal file → Executable file
0
build/debian/dolibarr.postrm → dev/build/debian/dolibarr.postrm
Normal file → Executable file
|
|
@ -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) ?
|
||||
|
||||
|
|
@ -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='';
|
||||
|
|
@ -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
|
||||
|
|
@ -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(
|
||||
1
dev/build/debian/po/POTFILES.in
Normal file
1
dev/build/debian/po/POTFILES.in
Normal file
|
|
@ -0,0 +1 @@
|
|||
[type: gettext/rfc822deb] dolibarr.templates
|
||||
|
|
@ -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
|
||||
|
||||
1
dev/build/debian/source/format
Normal file
1
dev/build/debian/source/format
Normal file
|
|
@ -0,0 +1 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -4,4 +4,4 @@ DOLIMAMP Package tools
|
|||
##################################################
|
||||
|
||||
This directory contains files and docs used to build
|
||||
a DoliMamp package for Mac OS X.
|
||||
a DoliMamp package for Mac OS X.
|
||||
|
|
@ -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=".";
|
||||
|
|
@ -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;
|
||||
|
|
@ -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
|
||||
# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
|
||||
# Qt Help Project / Custom Filters</a>.
|
||||
|
||||
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 =
|
|||
# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
|
||||
# Qt Help Project / Filter Attributes</a>.
|
||||
|
||||
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
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<!--
|
||||
<!--
|
||||
File added into doxygen generated documentation
|
||||
-->
|
||||
|
||||
|
|
@ -23,4 +23,4 @@ File added into doxygen generated documentation
|
|||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
@ -48,5 +48,3 @@
|
|||
</div>
|
||||
|
||||
<!-- End doxygen_header.html -->
|
||||
|
||||
|
||||
|
|
@ -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?
|
||||
|
|
@ -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...
|
||||
AssocingFileExtension=Associazione dell'estensione %2 a %1 in corso...
|
||||
|
|
@ -5,7 +5,7 @@ AdditionalIcons=
|
|||
CreateDesktopIcon=Vytvori<72> zástupcu na &ploche
|
||||
CreateQuickLaunchIcon=Vytvori<72> zástupcu na paneli &Rýchle spustenie
|
||||
ProgramOnTheWeb=Aplikácia %1 na internete
|
||||
UninstallProgram=Odinštalovať aplikáciu %1
|
||||
UninstallProgram=Odinštalovať aplikáciu %1
|
||||
LaunchProgram=Spusti<74> aplikáciu %1
|
||||
AssocFileExtension=Vytvori<72> &asociáciu medzi súbormi typu %2 a aplikáciou %1
|
||||
AssocingFileExtension=Vytvára sa asociácia medzi súbormi typu %2 a aplikáciou %1...
|
||||
|
|
@ -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)
|
||||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
|
|
@ -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;
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
|
@ -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
|
||||
#<FilesMatch "\.(cgi|shtml|phtml|php)$">
|
||||
# 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
|
||||
|
||||
</VirtualHost>
|
||||
</VirtualHost>
|
||||
|
||||
</IfModule>
|
||||
|
||||
Include "${INSTALL_DIR}/alias/*.conf"
|
||||
Include "${INSTALL_DIR}/alias/*.conf"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user