diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-03-23 14:07:55 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-03-23 14:10:17 +0300 |
| commit | e84a8e553cdc5ef10c9dae127ef5a6db8cea3b2b (patch) | |
| tree | b901c1949b54d3b263ea8b8fe8f2b6ba440ac883 /build.xml | |
| parent | f150700125dd911d10f61f3e9b35be2ed6e9d679 (diff) | |
.......... [ZBXNEXT-686] buiuld.xml: added "quiet" option for "psql" commands; added "-j4" option for "make" commands
(cherry picked from commit 22bcdbcaac9e5952eca4167354ca254aa1dec8f7)
(cherry picked from commit e6da1f7937b0f90a65b2a878943519b608b9ebf9)
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/build.xml b/build.xml index 5466ebb5880..8e47ef4940c 100644 --- a/build.xml +++ b/build.xml @@ -61,6 +61,7 @@ <arg line="--quiet"/> </exec> <exec executable="make" failonerror="on"> + <arg line="-j4"/> <arg line="-s"/> <arg line="dbschema"/> </exec> @@ -79,10 +80,12 @@ <arg line="--prefix=${basedir}"/> </exec> <exec executable="make" failonerror="on"> + <arg line="-j4"/> <arg line="-s"/> <arg line="dbschema"/> </exec> <exec executable="make" failonerror="on"> + <arg line="-j4"/> <arg line="-s"/> <arg line="install"/> </exec> @@ -92,6 +95,7 @@ <!-- Create PostgreSQL database --> <exec executable="psql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="--set ON_ERROR_STOP=1"/> @@ -99,6 +103,7 @@ </exec> <exec executable="psql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="--set ON_ERROR_STOP=1"/> @@ -106,6 +111,7 @@ </exec> <exec executable="psql" input="database/postgresql/schema.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -114,6 +120,7 @@ </exec> <exec executable="psql" input="database/postgresql/images.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -122,6 +129,7 @@ </exec> <exec executable="psql" input="database/postgresql/data.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -134,6 +142,7 @@ <!-- Create PostgreSQL database --> <exec executable="psql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="--set ON_ERROR_STOP=1"/> @@ -141,6 +150,7 @@ </exec> <exec executable="psql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="--set ON_ERROR_STOP=1"/> @@ -148,6 +158,7 @@ </exec> <exec executable="psql" input="database/postgresql/schema.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -159,6 +170,7 @@ <target name="init-frontend-postgresql" depends="create-configs,make-dbschema,init-server-postgresql"> <exec executable="psql" input="frontends/php/tests/selenium/data/data_test.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -170,6 +182,7 @@ <target name="init-api-postgresql" depends="create-configs,make-dbschema,init-server-postgresql"> <exec executable="psql" input="frontends/php/tests/api_json/data/data_test.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -181,6 +194,7 @@ <target name="init-integration-postgresql" depends="create-configs,init-integration,make-binaries-postgresql,init-server-postgresql,init-proxy-postgresql"> <exec executable="psql" input="frontends/php/tests/integration/data/data_test.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-q"/> <arg line="-h '${dbhost}'"/> <arg line="-U '${dbuser}'"/> <arg line="-1"/> @@ -202,10 +216,12 @@ <arg line="--prefix=${basedir}"/> </exec> <exec executable="make" failonerror="on"> + <arg line="-j4"/> <arg line="-s"/> <arg line="dbschema"/> </exec> <exec executable="make" failonerror="on"> + <arg line="-j4"/> <arg line="-s"/> <arg line="install"/> </exec> |