[Jboss-svn-commits] JBL Code SVN: r4327 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-05-19 11:58:33 -0400 (Fri, 19 May 2006)
New Revision: 4327

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Add build of libjpeg... And arrange java includes.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-05-19 12:20:23 UTC (rev 4326)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-05-19 15:58:33 UTC (rev 4327)
@@ -24,6 +24,9 @@
 LPNGVER="1.2.10"
 LPNGURL=http://kent.dl.sourceforge.net/sourceforge/libpng/libpng-${LPNGVER}.tar.gz
 
+JPEGVER="6b"
+JPEGURL=http://www.ijg.org/files/jpegsrc.v${JPEGVER}.tar.gz
+
 # Platfrom directory and cache
 TOOLS=$HOME/`uname -s`_`uname -p`_tools
 CACHE=`uname -s`_`uname -p`_cache
@@ -33,6 +36,7 @@
 BUILDPSQL=false
 BUILDOSSL=false
 BUILDLPNG=false
+BUILDJPEG=false
 CC=gcc
 COMPILER=""
 
@@ -67,12 +71,14 @@
 # configure and install
 # $1 : Source base directory
 # $2 : Install directory
-# $2 : Additional parameters for that machines/product.
+# $3 : Additional parameters for that machines/product.
+# $4 : Additional make command
 Build()
 {
 SRCDIR=$1
 INSDIR=$2
 ADDCON=$3
+ADDINS=$4
 (cd ${SRCDIR}
  if [ ${CC} = "cc" ]
  then
@@ -104,6 +110,15 @@
    echo "Make install in ${SRCDIR} failed"
    exit 1
  fi
+ if [ ! -z $ADDINS ]
+ then
+   make $ADDINS
+   if [ $? -ne 0 ]
+   then
+     echo "Make $ADDINS in ${SRCDIR} failed"
+     exit 1
+   fi
+ fi
 )
 }
 
@@ -222,13 +237,14 @@
     BUILDPSQL=true
     BUILDOSSL=true
     BUILDLPNG=true
+    BUILDJPEG=true
     CC=cc
     export CC
     COMPILER=solaris-x86-cc
     ADDCONF="\
             --with-iconv-dir=/usr/local \
             --with-libxml-dir=$TOOLS/LIBXML2 \
-            --with-jpeg-dir=no \
+            --with-jpeg-dir=$TOOLS/JPEG \
             --with-png-dir=$TOOLS/LPNG \
             --with-freetype-dir=/usr/sfw \
             --with-t1lib \
@@ -243,6 +259,7 @@
             --with-imap=no \
             --with-pspell=no \
             "
+    ADDFLAGS="-I $JAVA_HOME/include/solaris"
     ;;
   *)
     EXTTYPE=static
@@ -261,6 +278,14 @@
 
 #
 # build lib png if required
+if ${BUILDJPEG}
+then
+  Extract jpeg ${JPEGURL} ${JPEGVER}
+  Build jpeg-${JPEGVER} ${TOOLS}/JPEG "--enable-shared"
+fi
+
+#
+# build lib png if required
 if ${BUILDLPNG}
 then
   Extract libpng ${LPNGURL} ${LPNGVER}
@@ -438,7 +463,7 @@
 if [ ${CC} = "cc" ]
 then
    # Sun Studio
-   ADDFLAGS="$ADDFLAGS -I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val"
+   ADDFLAGS="${ADDFLAGS} -I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val"
 fi
 (cd ../php5servlet
  $CC -c $ADDFLAGS \