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

         -Platform)              PLATFORM=$val;;
         -Type)                  TYPE=$val;;
         -Arch)                  ARCH=$val;;
         -MachType)              MACHTYPE=$val;;
         -BuildRoot)             BUILD_ROOT=$val;;
+        -InterfaceDir)          INTERFACE_DIR=$val;;
+        -LocalDir)              LOCAL_DIR=$val;;
         -BinDir)                BIN_DIR=$val;;
         -LibDir)                LIB_DIR=$val;;
         -ObjDir)                OBJ_DIR=$val;;
         -PackageBinDir)         PKG_BIN_DIR=$val;;
         -PackageIncDir)         PKG_INC_DIR=$val;;
         -PackageToolBin)        PKG_TOOL_BIN_DIR=$val;;
         -PackageToolScript)     PKG_TOOL_SCRIPT_DIR=$val;;
         -PackageDir)            PKG_DIR=$val;;
         -CompilerPath)          COMPILER_DIR="$val";;
         -DownloadPkg)           DOWNLOAD_PKG="$val";;
-        -DebianPackage)         DEBIAN_PACKAGE=1;;
+        -DebianPackage)         DEBIAN_PACKAGE=$val;;
         -ApplyPatches)          APPLY_PATCHES=1;;
         -ApplyMods)             APPLY_MODS=1;;
         -ConfigVarient)         CONFIG_VARIENT=$val;;
         *)                      echo "Unknown tag: $tag=$val"
     esac
 echo " Platform       = ${PLATFORM}"
 echo " Type           = ${TYPE}"
 echo " Arch           = ${ARCH}"
 echo " MachType       = ${MACHTYPE}"
 echo " BuildRoot      = ${BUILD_ROOT}"
+#echo " InterfaceDir   = ${INTERFACE_DIR}"
+#echo " LocalDir       = ${LOCAL_DIR}"
 if [ ${DOWNLOAD_PKG} ]; then
     echo " DownloadPkg    = ${DOWNLOAD_PKG}"
 fi
 echo " BinDir         = ${BIN_DIR}"
 echo " LibDir         = ${LIB_DIR}"
 echo " ObjDir         = ${OBJ_DIR}"
+echo " PkgDir         = ${PKG_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}"
 echo "================================================================================"
 echo
 echo
 #------------------------------------------------------------------------------
 # Determine host and build environments
 #------------------------------------------------------------------------------
 case ${MACHTYPE} in
     linux_i386)
 # 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_DIR=`cleanup_dir ${CWD}/${PKG_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}`
 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}`
+INTERFACE_DIR=`cleanup_dir ${CWD}/${INTERFACE_DIR}`
+LOCAL_DIR=`cleanup_dir ${CWD}/${LOCAL_DIR}`
 LCL_SRC_DIR=${BASE_DIR}/src
 SHARE_SRC_DIR=${LCL_SRC_DIR}
 SHARE_BASE_DIR=${BASE_DIR}
 DEB_PKG_DIR=${LIB_DIR}
 AFC_DIR=${DEB_PKG_DIR}/afc
 AFC_BIN_DIR=${AFC_DIR}/bin
 AFC_LIB_DIR=${AFC_DIR}/lib
 AFC_SHARE_DIR=${AFC_DIR}/share
+DEB_DIR=`cleanup_dir ${CWD}/${DEBIAN_PACKAGE}`
 # Find the launch script
 LAUNCH_SCRIPT=`cleanup_dir ${LCL_SRC_DIR}/${SHELL_BUILD}`
 if [ ! -f ${LAUNCH_SCRIPT} ]; then
     WORK_DIR=${LCL_SRC_DIR}/${DOWNLOAD_PKG}
 else
     WORK_DIR=${LCL_SRC_DIR}/work
 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.
+#
+#   Only include paths that exist
+#
+INCLUDE=
+LIBPATH=
+DJOIN=""
+DLIST="
+${PKG_INC_DIR}
+${LOCAL_DIR}/inc
+${INTERFACE_DIR}/include/${PLATFORM}
+${INTERFACE_DIR}/include
+"
+for dtest in ${DLIST} ; do
+    if [ -d $dtest ] ; then
+        INCLUDE="${INCLUDE}${DJOIN}-I$dtest"
+        DJOIN=" "
+    fi
+done
+DJOIN=""
+DLIST="
+${PKG_LIB_DIR}
-INCLUDE="-I${PKG_INC_DIR} -I${BASE_DIR}/local/include -I${BASE_DIR}/interface/include"
+${LOCAL_DIR}/lib/${PLATFORM}
-LIBPATH="-L${PKG_LIB_DIR} -L${BASE_DIR}/local/lib/${PLATFORM} -L${BASE_DIR}/interface/lib/${PLATFORM}"
+${INTERFACE_DIR}/lib/${PLATFORM}
+"
+for dtest in ${DLIST} ; do
+    if [ -d $dtest ] ; then
+        LIBPATH="${LIBPATH}${DJOIN}-L$dtest"
+        DJOIN=" "
+    fi
+done
 # Dump configuration
 echo "================================================================================"
 echo "   BUILD CONFIGURATION"
 echo "================================================================================"
 if [ ${DOWNLOAD_PKG} ]; then
     echo " Tarball File   = ${TARBALL_FILE}"
     echo " Working Dir    = ${WORK_DIR}"
 fi
 unset AFTER_FIRST
-for INC in ${INCLDUE}; do
+for INC in ${INCLUDE}; do
     if [ ${AFTER_FIRST} ]; then
         echo "                  ${INC}"
     else
         echo " Includes       = ${INC}"
         AFTER_FIRST=1
 unset MAKE
 unset MAKEFLAGS
 unset MAKEOVERRIDES
 unset MAKELEVEL
 export CFLAGS="${CFLAGS} ${INCLUDE}"
+export CXXFLAGS="${CXXFLAGS} ${INCLUDE}"
 export CCFLAGS="${CCFLAGS} ${INCLUDE}"
 export LDFLAGS="${LDFLAGS} ${LIBPATH}"
 if [ ${XGCC_IN_PATH} ]; then
     export PATH="${XGCC_DIR}/bin:${PATH}"
 else
     export PATH="${XGCC_BASE_DIR}/bin:${PATH}"
 fi
+#
+#   Clean up request
+#   No building - just a clean of previous builds
+#
 if [ ${CLEAN} ]; then
     if [ ${DOWNLOAD_PKG} ]; then
         echo " --> Cleaning generated files"
         cd ${BASE_DIR}
         rm -fr ${WORK_DIR}
     echo " --> Deleting binary, object, and library directories"
     rm -fr ${BIN_DIR}
     rm -fr ${LIB_DIR}
     rm -fr ${OBJ_DIR}
+    if [ ${DEBIAN_PACKAGE} ]; then
+        echo " --> Deleting Debian Build Files "
+        rm -fr ${DEB_DIR}
+    fi
     exit 0
 fi
             cp -fr ${ERG_CONFIG} .config
         fi
     fi
     cd ${WORK_DIR}
-fi
+fi
+#
+#   Source the users script
+#   This is processed in the context of this script
+#
 source ${LAUNCH_SCRIPT}
 if [ ${DEBIAN_PACKAGE} ]; then
     echo " --> Creating Debian packaging scripts"
     done
     if [ ${TOOL_DIR} ]; then
         DEBBUILD_PL=${TOOL_DIR}/debbuild.pl
         echo "      - Found ${DEBBUILD_PL}"
-        DEB_DIR=${LCL_SRC_DIR}/.deb
         rm -fr ${DEB_DIR}
         mkdir -p ${DEB_DIR}
+        # Replace TAGS in the debbuild.pl file
         DEB_DESC="${BUILD_NAME} ${BUILD_VERSION} for ${PLATFORM}"
-        cat ${DEBBUILD_PL} | sed "s|Unknown Debian Package Description|${DEB_DESC}|" > ${DEB_DIR}/debbuild.pl
+        cat ${DEBBUILD_PL} | sed "-es|TAG_DESCRIPTION|${DEB_DESC}|" "-es|TAG_POSTINSTALL|${DEB_DIR}/postinstall|" > ${DEB_DIR}/debbuild.pl
         cp ${TOOL_DIR}/postinstall ${DEB_DIR}/postinstall
     else
         echo "ERROR: Cannot find debbuild.pl in the PATH"
         exit 1
     fi

Subversion Repositories DevTools

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