WebSVN – DevTools – Diff – /shellbuild/trunk/src/shellbuild.sh

 unset DOWNLOAD_PKG_AUTO
 unset XGCC_IN_PATH
 unset DEBIAN_PACKAGE
 unset APPLY_PATCHES
 unset APPLY_MODS
+unset CONFIG_VARIENT
 for arg in "$@" ; do
     val=${arg##*=}
     tag=${arg%%=*}
     case $tag in
         -clean)                 CLEAN=1;;
         -Platform)              PLATFORM=$val;;
         -Type)                  TYPE=$val;;
         -Arch)                  ARCH=$val;;
         -MachType)              MACHTYPE=$val;;
         -BuildRoot)             BUILD_ROOT=$val;;
+        -BinDir)                BIN_DIR=$val;;
+        -LibDir)                LIB_DIR=$val;;
+        -ObjDir)                OBJ_DIR=$val;;
         -PackageBinDir)         PKG_BIN_DIR=$val;;
         -PackageIncDir)         PKG_INC_DIR=$val;;
         -PackageLibDir)         PKG_LIB_DIR=$val;;
         -PackagePkgDir)         PKG_PKG_DIR=$val;;
         -PackageToolDir)        PKG_TOOL_DIR=$val;;
         -CompilerPath)          COMPILER_DIR="$val";;
         -DownloadPkg)           DOWNLOAD_PKG="$val";;
         -DebianPackage)         DEBIAN_PACKAGE=1;;
         -ApplyPatches)          APPLY_PATCHES=1;;
         -ApplyMods)             APPLY_MODS=1;;
+        -ConfigVarient)         CONFIG_VARIENT=$val;;
         *)                      echo "Unknown tag: $tag=$val"
     esac
 done
 if [ "${DOWNLOAD_PKG}" == "-DownloadPkg" ]; then
 echo " MachType       = ${MACHTYPE}"
 echo " BuildRoot      = ${BUILD_ROOT}"
 if [ ${DOWNLOAD_PKG} ]; then
     echo " DownloadPkg    = ${DOWNLOAD_PKG}"
 fi
+echo " BinDir         = ${BIN_DIR}"
+echo " LibDir         = ${LIB_DIR}"
+echo " ObjDir         = ${OBJ_DIR}"
 echo " PackageBinDir  = ${PKG_BIN_DIR}"
 echo " PackageIncDir  = ${PKG_INC_DIR}"
 echo " PackageLibDir  = ${PKG_LIB_DIR}"
 echo " PackagePkgDir  = ${PKG_PKG_DIR}"
 echo " CompilerDir    = ${COMPILER_DIR}"
     *603E*|*powerpc*)
         COMPILE_HOST="powerpc-603e-linux-gnu"
         LINUX_HOST_ARCH=powerpc
         ;;
+    ARMV9*)
+        COMPILE_HOST="arm-9tdmi-linux-gnu"
+        ;;
     *I386*)
+        if [ "${PLATFORM}" == "LINUX_I386" ]; then
-        COMPILE_HOST="i386-redhat-linux"
+            COMPILE_HOST="i386-cross-linux-gnu"
+        else
+            COMPILE_HOST="i586-unknown-linux-gnu"
+        fi
         LINUX_HOST_ARCH=x86
         ;;
     *)
         echo "Unknown ARCH=${ARCH}"
         exit 1
         ;;
 esac
 # Setup the location of the cross compiler
-if [ "${COMPILE_HOST}" == "i386-redhat-linux" ]; then
+if [ "${COMPILE_HOST}" == "i386-redhat-linux" ] || [ "${COMPILER_DIR}" == "gcc" ]; then
     XGCC_BASE_DIR=
     XGCC_DIR=
     XGCC=gcc
 else
     XGCC_BASE_DIR=`echo ${COMPILER_DIR} | sed 's|/[^/]*/[^/]*$||'`
     XGCC=${XGCC_DIR}/bin/gcc
 fi
 # Determine the location of the generated files
 CWD=`pwd`
+BIN_DIR=`cleanup_dir ${CWD}/${BIN_DIR}`
+LIB_DIR=`cleanup_dir ${CWD}/${LIB_DIR}`
+OBJ_DIR=`cleanup_dir ${CWD}/${OBJ_DIR}`
 PKG_BIN_DIR=`cleanup_dir ${CWD}/${PKG_BIN_DIR}`
 PKG_INC_DIR=`cleanup_dir ${CWD}/${PKG_INC_DIR}`
 PKG_LIB_DIR=`cleanup_dir ${CWD}/${PKG_LIB_DIR}`
 PKG_PKG_DIR=`cleanup_dir ${CWD}/${PKG_PKG_DIR}`
-AFC_DIR=${PKG_PKG_DIR}/afc
-AFC_BIN_DIR=${AFC_DIR}/bin
-AFC_LIB_DIR=${AFC_DIR}/lib
-AFC_SHARE_DIR=${AFC_DIR}/share
 PKG_TOOL_DIR=`cleanup_dir ${CWD}/${PKG_TOOL_DIR}`
 PKG_TOOL_BIN_DIR=`cleanup_dir ${CWD}/${PKG_TOOL_BIN_DIR}`
 PKG_TOOL_SCRIPT_DIR=`cleanup_dir ${CWD}/${PKG_TOOL_SCRIPT_DIR}`
 BASE_DIR=`cleanup_dir ${CWD}/${BUILD_ROOT}`
-DOWNLOADS_DIR=${BASE_DIR}/downloads
+LCL_SRC_DIR=${BASE_DIR}/src
+SHARE_SRC_DIR=${LCL_SRC_DIR}
+SHARE_BASE_DIR=${BASE_DIR}
+DEB_PKG_DIR=${LIB_DIR}
-SRC_DIR=${BASE_DIR}/src
+AFC_DIR=${DEB_PKG_DIR}/afc
+AFC_BIN_DIR=${AFC_DIR}/bin
+AFC_LIB_DIR=${AFC_DIR}/lib
+AFC_SHARE_DIR=${AFC_DIR}/share
 # Find the launch script
-LAUNCH_SCRIPT=`cleanup_dir ${SRC_DIR}/${SHELL_BUILD}`
+LAUNCH_SCRIPT=`cleanup_dir ${LCL_SRC_DIR}/${SHELL_BUILD}`
 if [ ! -f ${LAUNCH_SCRIPT} ]; then
     echo "Specified shell build script ${LAUNCH_SCRIPT} does not exist."
     exit 1
 fi
 if [ ${DOWNLOAD_PKG} ]; then
+    # This is the set of available download directories, consisting of downloads/
-    TARBALL_FILE=${DOWNLOADS_DIR}/${DOWNLOAD_PKG}.tar.bz2
+    # and a download directory that is offset from the location of the build
-    if [ -e ${TARBALL_FILE} ]; then
+    # script src directory.
-        TAR_DECOMP_ARG=j
+    unset TAR_DECOMP_ARG
+    TMP=`echo ${SHELL_BUILD} | sed "s|/src/.*||"`
-    else
+    TMP=`cleanup_dir ${CWD}/${TMP}`
+    DOWNLOAD_DIRS="${TMP} ${BASE_DIR}"
+    for DDIR in ${DOWNLOAD_DIRS}; do
-        TARBALL_FILE=${DOWNLOADS_DIR}/${DOWNLOAD_PKG}.tar.gz
+        TMP=${DDIR}/downloads/${DOWNLOAD_PKG}.tar.bz2
-        if [ -e ${TARBALL_FILE} ]; then
+        if [ -e ${TMP} ]; then
+            TARBALL_FILE=${TMP}
+            SHARE_SRC_DIR=${DDIR}/src
+            SHARE_BASE_DIR=${DDIR}
-            TAR_DECOMP_ARG=z
+            TAR_DECOMP_ARG=j
         else
-            TARBALL_FILE=${DOWNLOADS_DIR}/${DOWNLOAD_PKG}.tgz
+            TMP=${DDIR}/downloads/${DOWNLOAD_PKG}.tar.gz
-            if [ -e ${TARBALL_FILE} ]; then
+            if [ -e ${TMP} ]; then
+                TARBALL_FILE=${TMP}
+                SHARE_SRC_DIR=${DDIR}/src
+                SHARE_BASE_DIR=${DDIR}
                 TAR_DECOMP_ARG=z
             else
-                echo "Could not find download file ${DOWNLOADS_DIR}/${DOWNLOAD_PKG}.<tar.gz|tar.bz2|tgz>"
+                TMP=${DDIR}/downloads/${DOWNLOAD_PKG}.tgz
+                if [ -e ${TMP} ]; then
+                    TARBALL_FILE=${TMP}
+                    SHARE_SRC_DIR=${DDIR}/src
+                    SHARE_BASE_DIR=${DDIR}
+                    TAR_DECOMP_ARG=z
-                exit 1
+                fi
             fi
         fi
+    done
+    if [ "${TAR_DECOMP_ARG}" == "" ]; then
+        echo "Could not find download file ${DOWNLOAD_PKG}.<tar.gz|tar.bz2|tgz> in any of { ${DOWNLOAD_DIRS} }"
+        exit 1
     fi
-    WORK_DIR=${SRC_DIR}/${DOWNLOAD_PKG}
+    WORK_DIR=${LCL_SRC_DIR}/${DOWNLOAD_PKG}
 else
-    WORK_DIR=${SRC_DIR}/work
+    WORK_DIR=${LCL_SRC_DIR}/work
 fi
 INCLUDE="-I${PKG_INC_DIR} -I${BASE_DIR}/local/include -I${BASE_DIR}/interface/include"
-LIBPATH="-L${PKG_LIB_DIR} -L${BASE_DIR}/local/lib/${PLATFORM}  -L${BASE_DIR}/interface/lib/${PLATFORM}"
+LIBPATH="-L${PKG_LIB_DIR} -L${BASE_DIR}/local/lib/${PLATFORM} -L${BASE_DIR}/interface/lib/${PLATFORM}"
 # Dump configuration
 echo "================================================================================"
 echo "   BUILD CONFIGURATION"
 echo " XGCC           = ${XGCC}"
 echo " Base Dir       = ${BASE_DIR}"
 if [ ${DOWNLOAD_PKG} ]; then
     echo " Tarball File   = ${TARBALL_FILE}"
     echo " Working Dir    = ${WORK_DIR}"
 fi
+unset AFTER_FIRST
+for INC in ${INCLDUE}; do
+    if [ ${AFTER_FIRST} ]; then
+        echo "                  ${INC}"
+    else
-echo " Includes       = ${INCLUDE}"
+        echo " Includes       = ${INC}"
+        AFTER_FIRST=1
+    fi
+done
+unset AFTER_FIRST
+for LIB in ${LIBPATH}; do
+    if [ ${AFTER_FIRST} ]; then
+        echo "                  ${LIB}"
+    else
-echo " Library Path   = ${LIBPATH}"
+        echo " Library Path   = ${LIB}"
+        AFTER_FIRST=1
+    fi
+done
+echo " Debian Package = ${DEB_PKG_DIR}"
 echo " Launch Script  = ${LAUNCH_SCRIPT}"
 echo "================================================================================"
 echo
 echo
 ORIG_LDFLAGS=${LDFLAGS}
 export LDFLAGS="${LDFLAGS} ${LIBPATH}"
 ORIG_PATH=${PATH}
-export PATH="${XGCC_BASE_DIR}/bin:${PATH}"
 if [ ${XGCC_IN_PATH} ]; then
     export PATH="${XGCC_DIR}/bin:${PATH}"
+else
+    export PATH="${XGCC_BASE_DIR}/bin:${PATH}"
 fi
 if [ ${CLEAN} ]; then
     if [ ${DOWNLOAD_PKG} ]; then
         echo " --> Cleaning generated files"
         cd ${BASE_DIR}
         rm -fr ${WORK_DIR}
     fi
+    echo " --> Deleting binary, object, and library directories"
+    rm -fr ${BIN_DIR}
+    rm -fr ${LIB_DIR}
+    rm -fr ${OBJ_DIR}
     exit 0
 fi
 if [ ${DOWNLOAD_PKG} ]; then
 mkdir -p ${PKG_TOOL_SCRIPT_DIR}
 if [ ${DOWNLOAD_PKG} ]; then
     echo " --> Extracting ${DOWNLOAD_PKG}"
-    cd ${SRC_DIR}
+    cd ${LCL_SRC_DIR}
     tar -x${TAR_DECOMP_ARG}pf ${TARBALL_FILE}
     cd ${WORK_DIR}
-    PATCHES_DIR=${BASE_DIR}/patches
+    PATCHES_DIR=${SHARE_BASE_DIR}/patches
     if [ -d ${PATCHES_DIR} ]; then
         PATCHES=`cd ${PATCHES_DIR} && ls `
         if [ "${PATCHES}" != "" ]; then
             echo " --> Apply external patches"
             for PATCH in ${PATCHES}; do
             done
         fi
     fi
     cd ${WORK_DIR}
-    MODS_DIR=${BASE_DIR}/${DOWNLOAD_PKG_NAME}_${DOWNLOAD_PKG_VER}_mods
+    MODS_DIR=${SHARE_BASE_DIR}/${DOWNLOAD_PKG_NAME}_${DOWNLOAD_PKG_VER}_mods
     if [ -d ${MODS_DIR} ]; then
         echo " --> Applying modifications"
         cp -fr ${MODS_DIR}/* .
         ERG_CONFIG=${MODS_DIR}/ERG.config
         if [ -f ${ERG_CONFIG} ]; then
             TOOL_DIR=`cleanup_dir ${DIR}`
         fi
     done
     if [ ${TOOL_DIR} ]; then
         DEBBUILD_PL=${TOOL_DIR}/debbuild.pl
-        echo " - Found ${DEBBUILD_PL}"
+        echo "      - Found ${DEBBUILD_PL}"
-        DEB_DIR=${SRC_DIR}/.deb
+        DEB_DIR=${LCL_SRC_DIR}/.deb
         rm -fr ${DEB_DIR}
         mkdir -p ${DEB_DIR}
         DEB_DESC="${BUILD_NAME} ${BUILD_VERSION} for ${PLATFORM}"
         cat ${DEBBUILD_PL} | sed "s|Unknown Debian Package Description|${DEB_DESC}|" > ${DEB_DIR}/debbuild.pl
         exit 1
     fi
 fi
+echo " --> Removing unnecesary files resulting from the make install"
+DEL_FILES=`find ${PKG_LIB_DIR} -type f -name '*.la'`
+for FILE in ${DEL_FILES}; do
+        echo "      - Deleting ${FILE}"
+        rm -f ${FILE}
+done
+echo " --> Cleaning up empty directories"
+# Deletes directory $1 if it does not contain any other files or directories
+function rmdir_empty()
+{
+    # -A = do not list . and ..
+    # -Q = enclose entry names in double quotes
+    # -l = list one file per line
+    # -F = appends each directory with a '/'
+    DIRS=`ls -A -Q -l -F "$1" | grep "\".*\"\/" | sed "s|.* \"||" | sed "s|\"\/||"`
+    for DIR in ${DIRS}; do
+        rmdir_empty $1/${DIR}
+    done
+    LS=`ls -A -Q -l -F "$1" | grep "\"" | sed "s|^.* \"||" | sed "s|\".*||"`
+    if [ "${LS}" == "" ]; then
+        rmdir $1
+    fi
+}
+rmdir_empty ${DEB_PKG_DIR}
+rmdir_empty ${BASE_DIR}/pkg
 echo " --> Cleaning up installation environment"
 export MAKE=${ORIG_MAKE}
 export MAKEFLAGS=${ORIG_MAKEFLAGS}
 export MAKEOVERRIDES=${ORIG_MAKEOVERRIDES}
 export MAKELEVEL=${ORIG_MAKELEVEL}

Subversion Repositories DevTools

(root)/shellbuild/trunk/src/shellbuild.sh @ 1469 – Rev 1467 → 1469