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

 unset XGCC_IN_PATH
 unset DEBIAN_PACKAGE
 unset APPLY_PATCHES
 unset APPLY_MODS
 unset CONFIG_VARIENT
+unset WORK_DIR_NAME
 for arg in "$@" ; do
     val=${arg##*=}
     tag=${arg%%=*}
     case $tag in
         -clean)                 CLEAN=1;;
         -Arch)                  ARCH=$val;;
         -MachType)              MACHTYPE=$val;;
         -BuildRoot)             BUILD_ROOT=$val;;
         -InterfaceDir)          INTERFACE_DIR=$val;;
         -LocalDir)              LOCAL_DIR=$val;;
+        -LocalIncDir)           LOCAL_INC_DIR=$val;;
+        -LocalBinDir)           LOCAL_BIN_DIR=$val;;
+        -LocalLibDir)           LOCAL_LIB_DIR=$val;;
         -BinDir)                BIN_DIR=$val;;
         -LibDir)                LIB_DIR=$val;;
         -ObjDir)                OBJ_DIR=$val;;
         -PackageBinDir)         PKG_BIN_DIR=$val;;
         -PackageIncDir)         PKG_INC_DIR=$val;;
         -DownloadPkg)           DOWNLOAD_PKG="$val";;
         -DebianPackage)         DEBIAN_PACKAGE=$val;;
         -ApplyPatches)          APPLY_PATCHES=1;;
         -ApplyMods)             APPLY_MODS=1;;
         -ConfigVarient)         CONFIG_VARIENT=$val;;
+        -WorkDir)               WORK_DIR_NAME=$val;;
         *)                      echo "Unknown tag: $tag=$val"
     esac
 done
 if [ "${DOWNLOAD_PKG}" == "-DownloadPkg" ]; then
             COMPILE_HOST="i586-unknown-linux-gnu"
         fi
         LINUX_HOST_ARCH=x86
         ;;
     *)
         echo "Unknown ARCH=${ARCH}"
         exit 1
         ;;
 esac
 PKG_TOOL_SCRIPT_DIR=`cleanup_dir ${CWD}/${PKG_TOOL_SCRIPT_DIR}`
 BASE_DIR=`cleanup_dir ${CWD}/${BUILD_ROOT}`
 INTERFACE_DIR=`cleanup_dir ${CWD}/${INTERFACE_DIR}`
 LOCAL_DIR=`cleanup_dir ${CWD}/${LOCAL_DIR}`
+LOCAL_INC_DIR=`cleanup_dir ${CWD}/${LOCAL_INC_DIR}`
+LOCAL_BIN_DIR=`cleanup_dir ${CWD}/${LOCAL_BIN_DIR}`
+LOCAL_LIB_DIR=`cleanup_dir ${CWD}/${LOCAL_LIB_DIR}`
 LCL_SRC_DIR=${BASE_DIR}/src
 SHARE_SRC_DIR=${LCL_SRC_DIR}
 SHARE_BASE_DIR=${BASE_DIR}
 DEB_PKG_DIR=${LIB_DIR}
 else
     WORK_DIR=${LCL_SRC_DIR}/work
 fi
+#
+#   Setup WORK_DIR
+#   This can be deduced from the tar-file, but in some cases the name
+#   must be specified
+#
+if [ ${WORK_DIR_NAME} ]; then
+    WORK_DIR=${LCL_SRC_DIR}/${WORK_DIR_NAME}
+fi
+#
 #   Extend compiler and linker search paths to access data within
 #   packages imported via BuildPkgArchive
+#
 #   Include the packageing directory - its used for builds that
 #   build multiple packages.
 echo " Compile Build  = ${COMPILE_BUILD}"
 echo " XGCC Base Dir  = ${XGCC_BASE_DIR}"
 echo " XGCC Dir       = ${XGCC_DIR}"
 echo " XGCC           = ${XGCC}"
 echo " Base Dir       = ${BASE_DIR}"
+if [ ${WORK_DIR_NAME} ]; then
+    echo " Work Dir Name  = ${WORK_DIR_NAME}"
+fi
 if [ ${DOWNLOAD_PKG} ]; then
     echo " Tarball File   = ${TARBALL_FILE}"
     echo " Working Dir    = ${WORK_DIR}"
 fi
-unset AFTER_FIRST
+TITLE="Includes       ="
 for INC in ${INCLUDE}; do
-    if [ ${AFTER_FIRST} ]; then
-        echo "                  ${INC}"
+        echo " ${TITLE} ${INC}"
-    else
-        echo " Includes       = ${INC}"
+        TITLE="                "
-        AFTER_FIRST=1
-    fi
 done
-unset AFTER_FIRST
+TITLE="Library Path   ="
-for LIB in ${LIBPATH}; do
+for INC in ${LIBPATH}; do
-    if [ ${AFTER_FIRST} ]; then
+        echo " ${TITLE} ${LIB}"
-        echo "                  ${LIB}"
+        TITLE="                "
-    else
-        echo " Library Path   = ${LIB}"
-        AFTER_FIRST=1
-    fi
 done
+if [ ${DEBIAN_PACKAGE} ]; then
-echo " Debian Package = ${DEB_PKG_DIR}"
+    echo " Debian Package = ${DEB_PKG_DIR}"
+fi
 echo " Launch Script  = ${LAUNCH_SCRIPT}"
 echo "================================================================================"
 echo
 echo
 # Prepare the environment
 echo " --> Preparing environment"
 LIBTOOL=libtool
 export LIBTOOL
 unset CC
 unset CXX
         echo "ERROR: Cannot find debbuild.pl in the PATH"
         exit 1
     fi
 fi
 echo " --> Removing unnecesary files resulting from the make install"
+if [ -d ${PKG_LIB_DIR} ] ; then
-DEL_FILES=`find ${PKG_LIB_DIR} -type f -name '*.la'`
+    DEL_FILES=`find ${PKG_LIB_DIR} -type f -name '*.la'`
-for FILE in ${DEL_FILES}; do
+    for FILE in ${DEL_FILES}; do
-        echo "      - Deleting ${FILE}"
+            echo "      - Deleting ${FILE}"
-        rm -f ${FILE}
+            rm -f ${FILE}
-done
+    done
+fi
 echo " --> Cleaning up empty directories"
 # Deletes directory $1 if it does not contain any other files or directories
 function rmdir_empty()
+{
+    if [ -d "$1" ] ; then
-    # -A = do not list . and ..
+        # -A = do not list . and ..
-    # -Q = enclose entry names in double quotes
+        # -Q = enclose entry names in double quotes
-    # -l = list one file per line
+        # -l = list one file per line
-    # -F = appends each directory with a '/'
+        # -F = appends each directory with a '/'
-    DIRS=`ls -A -Q -l -F "$1" | grep "\".*\"\/" | sed "s|.* \"||" | sed "s|\"\/||"`
+        DIRS=`ls -A -Q -l -F "$1" | grep "\".*\"\/" | sed "s|.* \"||" | sed "s|\"\/||"`
-    for DIR in ${DIRS}; do
+        for DIR in ${DIRS}; do
-        rmdir_empty $1/${DIR}
+            rmdir_empty $1/${DIR}
-    done
+        done
-    LS=`ls -A -Q -l -F "$1" | grep "\"" | sed "s|^.* \"||" | sed "s|\".*||"`
+        LS=`ls -A -Q -l -F "$1" | grep "\"" | sed "s|^.* \"||" | sed "s|\".*||"`
-    if [ "${LS}" == "" ]; then
+        if [ "${LS}" == "" ]; then
-        rmdir $1
+            rmdir $1
+        fi
     fi
+}
 rmdir_empty ${DEB_PKG_DIR}
 rmdir_empty ${BASE_DIR}/pkg
 echo " --> End of ShellBuild"

Subversion Repositories DevTools

(root)/shellbuild/trunk/src/shellbuild.sh @ 1477 – Rev 1475 → 1477