diff --git a/build/exe/doliwamp/doliwamp2.4.iss b/build/exe/doliwamp/doliwamp2.4.iss index 828c9ae1ce0..818ce4d96de 100644 --- a/build/exe/doliwamp/doliwamp2.4.iss +++ b/build/exe/doliwamp/doliwamp2.4.iss @@ -184,6 +184,7 @@ begin begin + //---------------------------------------------- // renommage du fichier c:/windows/php.ini //---------------------------------------------- @@ -346,10 +347,13 @@ begin if not FileExists (destFile) then begin + myport := Page.Values[2]; + LoadStringFromFile (srcFile, srcContents); //installDir et version de php StringChange (srcContents, 'WAMPROOT', pathWithSlashes); + StringChange (srcContents, 'WAMPMYSQLPORT', myport); SaveStringToFile(destFile,srcContents, False); end @@ -559,6 +563,11 @@ begin end + + + MsgBox('DoliWamp installer will now start Apache and Mysql, this may last from several seconds to one minute after this confirmation.',mbInformation,MB_OK) + + // Install services batFile := path+'\uninstall_services.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); diff --git a/build/exe/doliwamp/my.ini.install b/build/exe/doliwamp/my.ini.install index 4aee48fa8da..c2be94d5c00 100644 --- a/build/exe/doliwamp/my.ini.install +++ b/build/exe/doliwamp/my.ini.install @@ -1,219 +1,214 @@ -# MySQL Server Instance Configuration File -# ---------------------------------------------------------------------- -# Generated by the MySQL Server Instance Configuration Wizard -# -# -# Installation Instructions -# ---------------------------------------------------------------------- -# -# On Linux you can copy this file to /etc/my.cnf to set global options, -# mysql-data-dir/my.cnf to set server-specific options -# (@localstatedir@ for this installation) or to -# ~/.my.cnf to set user-specific options. -# -# 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". -# -# 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 -# command line shell, e.g. -# mysqld --install MySQL41 --defaults-file="C:\Program Files\MySQL\MySQL Server 4.1\my.ini" -# -# And then execute this in a command line shell to start the server, e.g. -# net start MySQL41 -# -# -# Guildlines for editing this file -# ---------------------------------------------------------------------- -# -# In this file, you can use all long options that the program supports. -# If you want to know the options a program supports, start the program -# with the "--help" option. -# -# More detailed information about the individual options can also be -# found in the manual. -# -# -# CLIENT SECTION -# ---------------------------------------------------------------------- -# -# The following options will be read by MySQL client applications. -# Note that only client applications shipped by MySQL are guaranteed -# to read this section. If you want your own MySQL client program to -# honor these values, you need to specify it as an option during the -# MySQL client library initialization. -# -[client] - -port=3307 - - -# SERVER SECTION -# ---------------------------------------------------------------------- -# -# 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 -# file. -# -[doliwampmysqld] - -# The TCP/IP Port the MySQL Server will listen on -port=3307 - - -#Path to installation directory. All paths are usually resolved relative to this. -basedir=WAMPROOT/bin/mysql/mysql5.0.45 - -#log file -log-error=WAMPROOT/logs/mysql.log - -#Path to the database root -datadir=WAMPROOT/bin/mysql/mysql5.0.45/data - -# The default character set that will be used when a new schema or table is -# created and no character set is defined -default-character-set=latin1 - -# The default storage engine that will be used when create new tables when -default-storage-engine=INNODB - -# The maximum amount of concurrent sessions the MySQL server will -# allow. One of these connections will be reserved for a user with -# SUPER privileges to allow the administrator to login even if the -# connection limit has been reached. -max_connections=255 - -# Query cache is used to cache SELECT results and later return them -# without actual executing the same query once again. Having the query -# cache enabled may result in significant speed improvements, if your -# have a lot of identical queries and rarely changing tables. See the -# "Qcache_lowmem_prunes" status variable to check if the current value -# is high enough for your load. -# Note: In case your tables change very often or if your queries are -# textually different every time, the query cache may result in a -# slowdown instead of a performance improvement. -query_cache_size=8M - -# The number of open tables for all threads. Increasing this value -# increases the number of file descriptors that mysqld requires. -# Therefore you have to make sure to set the amount of open files -# allowed to at least 4096 in the variable "open-files-limit" in -# section [mysqld_safe] -table_cache=510 - -# Maximum size for internal (in-memory) temporary tables. If a table -# grows larger than this value, it is automatically converted to disk -# based table This limitation is for a single table. There can be many -# of them. -tmp_table_size=13M - - -# How many threads we should keep in a cache for reuse. When a client -# disconnects, the client's threads are put in the cache if there aren't -# more than thread_cache_size threads from before. This greatly reduces -# the amount of thread creations needed if you have a lot of new -# connections. (Normally this doesn't give a notable performance -# improvement if you have a good thread implementation.) -thread_cache_size=12 - -#*** MyISAM Specific options - -# The maximum size of the temporary file MySQL is allowed to use while -# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE. -# If the file-size would be bigger than this, the index will be created -# through the key cache (which is slower). -myisam_max_sort_file_size=100G - -# If the temporary file used for fast index creation would be bigger -# than using the key cache by the amount specified here, then prefer the -# key cache method. This is mainly used to force long character keys in -# large tables to use the slower key cache method to create the index. -myisam_max_extra_sort_file_size=100G - -# If the temporary file used for fast index creation would be bigger -# than using the key cache by the amount specified here, then prefer the -# key cache method. This is mainly used to force long character keys in -# large tables to use the slower key cache method to create the index. -myisam_sort_buffer_size=8M - -# Size of the Key Buffer, used to cache index blocks for MyISAM tables. -# Do not set it larger than 30% of your available memory, as some memory -# is also required by the OS to cache rows. Even if you're not using -# MyISAM tables, you should still set it to 8-64M as it will also be -# used for internal temporary disk tables. -key_buffer_size=9M - -# Size of the buffer used for doing full table scans of MyISAM tables. -# Allocated per thread, if a full scan is needed. -read_buffer_size=64K -read_rnd_buffer_size=256K - -# This buffer is allocated when MySQL needs to rebuild the index in -# REPAIR, OPTIMZE, ALTER table statements as well as in LOAD DATA INFILE -# into an empty table. It is allocated per thread so be careful with -# large settings. -sort_buffer_size=203K - - -#*** INNODB Specific options *** - - -# Use this option if you have a MySQL server with InnoDB support enabled -# but you do not plan to use it. This will save memory and disk space -# and speed up some things. -#skip-innodb - -# Additional memory pool that is used by InnoDB to store metadata -# information. If InnoDB requires more memory for this purpose it will -# start to allocate it from the OS. As this is fast enough on most -# recent operating systems, you normally do not need to change this -# value. SHOW INNODB STATUS will display the current amount used. -innodb_additional_mem_pool_size=2M - -# If set to 1, InnoDB will flush (fsync) the transaction logs to the -# disk at each commit, which offers full ACID behavior. If you are -# willing to compromise this safety, and you are running small -# transactions, you may set this to 0 or 2 to reduce disk I/O to the -# logs. Value 0 means that the log is only written to the log file and -# the log file flushed to disk approximately once per second. Value 2 -# means the log is written to the log file at each commit, but the log -# file is only flushed to disk approximately once per second. -innodb_flush_log_at_trx_commit=1 - -# The size of the buffer InnoDB uses for buffering log data. As soon as -# it is full, InnoDB will have to flush it to disk. As it is flushed -# once per second anyway, it does not make sense to have it very large -# (even with long transactions). -innodb_log_buffer_size=1M - -# InnoDB, unlike MyISAM, uses a buffer pool to cache both indexes and -# row data. The bigger you set this the less disk I/O is needed to -# access data in tables. On a dedicated database server you may set this -# parameter up to 80% of the machine physical memory size. Do not set it -# too large, though, because competition of the physical memory may -# cause paging in the operating system. Note that on 32bit systems you -# might be limited to 2-3.5G of user level memory per process, so do not -# set it too high. -innodb_buffer_pool_size=15M - -# Size of each log file in a log group. You should set the combined size -# of log files to about 25%-100% of your buffer pool size to avoid -# unneeded buffer pool flush activity on log file overwrite. However, -# note that a larger logfile size will increase the time needed for the -# recovery process. -innodb_log_file_size=10M - -# Number of threads allowed inside the InnoDB kernel. The optimal value -# depends highly on the application, hardware as well as the OS -# scheduler properties. A too high value may lead to thread thrashing. -innodb_thread_concurrency=8 - - - -[mysqld] -port=3307 \ No newline at end of file +# MySQL Server Instance Configuration File +# ---------------------------------------------------------------------- +# Generated by the MySQL Server Instance Configuration Wizard +# +# +# Installation Instructions +# ---------------------------------------------------------------------- +# +# On Linux you can copy this file to /etc/my.cnf to set global options, +# mysql-data-dir/my.cnf to set server-specific options +# (@localstatedir@ for this installation) or to +# ~/.my.cnf to set user-specific options. +# +# 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". +# +# 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 +# command line shell, e.g. +# mysqld --install MySQL41 --defaults-file="C:\Program Files\MySQL\MySQL Server 4.1\my.ini" +# +# And then execute this in a command line shell to start the server, e.g. +# net start MySQL41 +# +# +# Guildlines for editing this file +# ---------------------------------------------------------------------- +# +# In this file, you can use all long options that the program supports. +# If you want to know the options a program supports, start the program +# with the "--help" option. +# +# More detailed information about the individual options can also be +# found in the manual. +# +# +# CLIENT SECTION +# ---------------------------------------------------------------------- +# +# The following options will be read by MySQL client applications. +# Note that only client applications shipped by MySQL are guaranteed +# to read this section. If you want your own MySQL client program to +# honor these values, you need to specify it as an option during the +# MySQL client library initialization. +# +[client] + +port=WAMPMYSQLPORT + + +# SERVER SECTION +# ---------------------------------------------------------------------- +# +# 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 +# file. +# +[doliwampmysqld] + +# The TCP/IP Port the MySQL Server will listen on +port=WAMPMYSQLPORT + + +#Path to installation directory. All paths are usually resolved relative to this. +basedir=WAMPROOT/bin/mysql/mysql5.0.45 + +#log file +log-error=WAMPROOT/logs/mysql.log + +#Path to the database root +datadir=WAMPROOT/bin/mysql/mysql5.0.45/data + +# The default character set that will be used when a new schema or table is +# created and no character set is defined +default-character-set=latin1 + +# The default storage engine that will be used when create new tables when +default-storage-engine=INNODB + +# The maximum amount of concurrent sessions the MySQL server will +# allow. One of these connections will be reserved for a user with +# SUPER privileges to allow the administrator to login even if the +# connection limit has been reached. +max_connections=255 + +# Query cache is used to cache SELECT results and later return them +# without actual executing the same query once again. Having the query +# cache enabled may result in significant speed improvements, if your +# have a lot of identical queries and rarely changing tables. See the +# "Qcache_lowmem_prunes" status variable to check if the current value +# is high enough for your load. +# Note: In case your tables change very often or if your queries are +# textually different every time, the query cache may result in a +# slowdown instead of a performance improvement. +query_cache_size=8M + +# The number of open tables for all threads. Increasing this value +# increases the number of file descriptors that mysqld requires. +# Therefore you have to make sure to set the amount of open files +# allowed to at least 4096 in the variable "open-files-limit" in +# section [mysqld_safe] +table_cache=510 + +# Maximum size for internal (in-memory) temporary tables. If a table +# grows larger than this value, it is automatically converted to disk +# based table This limitation is for a single table. There can be many +# of them. +tmp_table_size=13M + + +# How many threads we should keep in a cache for reuse. When a client +# disconnects, the client's threads are put in the cache if there aren't +# more than thread_cache_size threads from before. This greatly reduces +# the amount of thread creations needed if you have a lot of new +# connections. (Normally this doesn't give a notable performance +# improvement if you have a good thread implementation.) +thread_cache_size=12 + +#*** MyISAM Specific options + +# The maximum size of the temporary file MySQL is allowed to use while +# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE. +# If the file-size would be bigger than this, the index will be created +# through the key cache (which is slower). +myisam_max_sort_file_size=100G + +# If the temporary file used for fast index creation would be bigger +# than using the key cache by the amount specified here, then prefer the +# key cache method. This is mainly used to force long character keys in +# large tables to use the slower key cache method to create the index. +myisam_max_extra_sort_file_size=100G + +# If the temporary file used for fast index creation would be bigger +# than using the key cache by the amount specified here, then prefer the +# key cache method. This is mainly used to force long character keys in +# large tables to use the slower key cache method to create the index. +myisam_sort_buffer_size=8M + +# Size of the Key Buffer, used to cache index blocks for MyISAM tables. +# Do not set it larger than 30% of your available memory, as some memory +# is also required by the OS to cache rows. Even if you're not using +# MyISAM tables, you should still set it to 8-64M as it will also be +# used for internal temporary disk tables. +key_buffer_size=9M + +# Size of the buffer used for doing full table scans of MyISAM tables. +# Allocated per thread, if a full scan is needed. +read_buffer_size=64K +read_rnd_buffer_size=256K + +# This buffer is allocated when MySQL needs to rebuild the index in +# REPAIR, OPTIMZE, ALTER table statements as well as in LOAD DATA INFILE +# into an empty table. It is allocated per thread so be careful with +# large settings. +sort_buffer_size=203K + + +#*** INNODB Specific options *** + + +# Use this option if you have a MySQL server with InnoDB support enabled +# but you do not plan to use it. This will save memory and disk space +# and speed up some things. +#skip-innodb + +# Additional memory pool that is used by InnoDB to store metadata +# information. If InnoDB requires more memory for this purpose it will +# start to allocate it from the OS. As this is fast enough on most +# recent operating systems, you normally do not need to change this +# value. SHOW INNODB STATUS will display the current amount used. +innodb_additional_mem_pool_size=2M + +# If set to 1, InnoDB will flush (fsync) the transaction logs to the +# disk at each commit, which offers full ACID behavior. If you are +# willing to compromise this safety, and you are running small +# transactions, you may set this to 0 or 2 to reduce disk I/O to the +# logs. Value 0 means that the log is only written to the log file and +# the log file flushed to disk approximately once per second. Value 2 +# means the log is written to the log file at each commit, but the log +# file is only flushed to disk approximately once per second. +innodb_flush_log_at_trx_commit=1 + +# The size of the buffer InnoDB uses for buffering log data. As soon as +# it is full, InnoDB will have to flush it to disk. As it is flushed +# once per second anyway, it does not make sense to have it very large +# (even with long transactions). +innodb_log_buffer_size=1M + +# InnoDB, unlike MyISAM, uses a buffer pool to cache both indexes and +# row data. The bigger you set this the less disk I/O is needed to +# access data in tables. On a dedicated database server you may set this +# parameter up to 80% of the machine physical memory size. Do not set it +# too large, though, because competition of the physical memory may +# cause paging in the operating system. Note that on 32bit systems you +# might be limited to 2-3.5G of user level memory per process, so do not +# set it too high. +innodb_buffer_pool_size=15M + +# Size of each log file in a log group. You should set the combined size +# of log files to about 25%-100% of your buffer pool size to avoid +# unneeded buffer pool flush activity on log file overwrite. However, +# note that a larger logfile size will increase the time needed for the +# recovery process. +innodb_log_file_size=10M + +# Number of threads allowed inside the InnoDB kernel. The optimal value +# depends highly on the application, hardware as well as the OS +# scheduler properties. A too high value may lead to thread thrashing. +innodb_thread_concurrency=8 diff --git a/build/exe/doliwamp/mysqlinitpassword.bat.install b/build/exe/doliwamp/mysqlinitpassword.bat.install index c01e9473597..3c31c856dca 100644 --- a/build/exe/doliwamp/mysqlinitpassword.bat.install +++ b/build/exe/doliwamp/mysqlinitpassword.bat.install @@ -3,14 +3,14 @@ REM ----------------------------------- REM This script initialize Mysql root password when password is empty REM ----------------------------------- -REM echo ---- Show content of script mysqlinitpassword before running it >> doliwamp.log -REM type .\mysqlinitpassword.bat >> doliwamp.log +REM echo ---- Show content of script mysqlinitpassword before running it >> doliwamp.log 2>>&1 +REM type .\mysqlinitpassword.bat >> doliwamp.log 2>>&1 -sleep 5 +sleep 3 -echo ---- Execute script to init mysql password >> doliwamp.log -echo If an error is shown here, rerun this script manually +echo ---- Execute script to init mysql password >> doliwamp.log 2>>&1 +echo If an error is shown here, rerun this script manually >> doliwamp.log 2>>&1 .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >>doliwamp.log 2>>&1 -echo ---- End script >> doliwamp.log +echo ---- End script >> doliwamp.log 2>>&1