Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1245048 - in /incubator/ooo/trunk/main: configure.cmd
 configure.in set_soenv.in
Date: Thu, 16 Feb 2012 15:44:12 -0000
To: ooo-commits@incubator.apache.org
From: ydario@apache.org
Message-Id: <20120216154412.6AAC223889D7@eris.apache.org>

Author: ydario
Date: Thu Feb 16 15:44:11 2012
New Revision: 1245048

URL: http://svn.apache.org/viewvc?rev=1245048&view=rev
Log:
i118923 - OS/2 port: updates for configuration system.

Modified:
    incubator/ooo/trunk/main/configure.cmd
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/configure.cmd
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.cmd?rev=1245048&r1=1245047&r2=1245048&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.cmd (original)
+++ incubator/ooo/trunk/main/configure.cmd Thu Feb 16 15:44:11 2012
@@ -1,7 +1,13 @@
 @echo off
 setlocal
-SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
-SET JAVA_HOME=e:\java150
+SET JAVA_HOME=d:\os2\java160
+SET MY_ANT_HOME=d:/os2/java160/apache-ant-1.7.0
 SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
-sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
+rem set grep=grep.exe
+
+set config_shell=sh
+set perl_sh_dir=/usr/bin
+
+rem  --with-system-icu --disable-epm
+sh ./configure --disable-binfilter --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit | tee configure.log
 endlocal

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1245048&r1=1245047&r2=1245048&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Feb 16 15:44:11 2012
@@ -6867,12 +6867,12 @@ if test "$SOLAR_JAVA" != ""; then
 ANT_HOME=; export ANT_HOME
 WITH_ANT_HOME=; export WITH_ANT_HOME
 if test -z "$with_ant_home"; then
-   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
+   AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat])
 else
    if test "$_os" = "WINNT"; then
       with_ant_home=`cygpath -u "$with_ant_home"`
    fi
-   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
+   AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
    WITH_ANT_HOME=$with_ant_home
    ANT_HOME=$with_ant_home
 fi

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1245048&r1=1245047&r2=1245048&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Feb 16 15:44:11 2012
@@ -147,6 +147,9 @@ $GLIBC          = "";               # Wh
 $PROEXT         = "@PROEXT@";
 $EPM_FLAGS	= "";
 
+# Required for OS/2 macro expansion
+my @unixroot='@unixroot';
+
 #
 #--------------------------------------------------------------------
 # IV. Initialise the warning container and print a note to the user.
@@ -839,7 +842,14 @@ if ( $platform =~ m/cygwin|os2/ ) {
    $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
 }
 # 3. shell path.
+if ( $platform =~ m/os2/ )
+{
+$OOO_SHELL = 'sh';
+} 
+else
+{
 $OOO_SHELL = '@SHELLPATH@'."\/bash";
+}
 
 if ( '@STLPORT4@' eq $no_stl )
 {
@@ -1309,7 +1319,7 @@ elsif ($platform =~ m/os2/)
 
   if ( '@ANT_HOME@' ne '' )
   {
-     $PATH .= $ps.'@ANT_HOME@';
+     $PATH .= $ps.'@ANT_HOME@/bin';
   }
 
   # Append old PATH