SONAR-2493 Fix build-war.sh

Variable ANT_HOME should be exported in order to be available for child
processes.

diff --git a/sonar-application/src/main/assembly/war/build-war.bat b/sonar-application/src/main/assembly/war/build-war.bat
index 73cea1947edef5a524867bf50f455e993960115b..922d55320512f3390e86ab464a90015bb058940a 100644 (file)
--- a/sonar-application/src/main/assembly/war/build-war.bat
+++ b/sonar-application/src/main/assembly/war/build-war.bat
@@ -25,4 +25,4 @@ set ANT_HOME=%CD%\apache-ant-1.7.0
 call apache-ant-1.7.0\bin\ant
 
 set ANT_HOME=%ORIG_ANT_HOME%
-set ORIG_ANT_HOME=
\ No newline at end of file
+set ORIG_ANT_HOME=

diff --git a/sonar-application/src/main/assembly/war/build-war.sh b/sonar-application/src/main/assembly/war/build-war.sh
index 0155f378f2be33606a3269ec0790723dc54788b9..20e20bafe900740e4a92ef8308577c0aa9cf3af9 100644 (file)
--- a/sonar-application/src/main/assembly/war/build-war.sh
+++ b/sonar-application/src/main/assembly/war/build-war.sh
@@ -17,8 +17,8 @@
 # License along with Sonar; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
 # 
-# Use this DOS script to create a Sonar WAR archive.
+# Use this Shell script to create a Sonar WAR archive.
 
-ANT_HOME="./apache-ant-1.7.0"
+export ANT_HOME="./apache-ant-1.7.0"
 
-./apache-ant-1.7.0/bin/ant
\ No newline at end of file
+./apache-ant-1.7.0/bin/ant