2013-10-28 sources upload

[sdk/tools/sbi-plugins.git] / xml / linux / llvm31p.armel.cpp.app.xml

diff --git a/xml/linux/llvm31p.armel.cpp.app.xml b/xml/linux/llvm31p.armel.cpp.app.xml
index 8f8b254..4f11f7f 100644 (file)
--- a/xml/linux/llvm31p.armel.cpp.app.xml
+++ b/xml/linux/llvm31p.armel.cpp.app.xml
@@ -103,7 +103,8 @@ fi
                 <input type="variable" value="ARCH"/>
                 <input type="variable" value="PKG_TYPE"/>
                 <input type="variable" value="PKG_NAME"/>
-                <input type="variable" value="PRJ_NAME"/>
+                               <input type="variable" value="PRJ_NAME"/>
+                               <input type="variable" value="ARTIFACT_NAME"/>
                 <input type="variable" value="PKG_VER"/>
                 <input type="tag" value="#{TOOLCHAIN}:tool:name:tpk_packager:path"/>
                 <input type="tag" value="#{TOOLCHAIN}:tool:name:native_signer:path"/>
@@ -124,21 +125,22 @@ BUILD_DIR="${1}"
 ARCH="${2}"
 PKG_NAME="${4}"
 PRJ_NAME="${5}"
-PKG_VER="${6}"
-TPK_PACKAGER="${7}"
-NATIVE_SIGNER="${8}"
-SIGN_CERT_DIR="${9}"
-SIGN_AUTHOR_KEY="${10}"
-SIGN_AUTHOR_PWD="${11}"
-SIGN_DIST1_KEY="${12}"
-SIGN_DIST1_PWD="${13}"
-SIGN_DIST1_CA="${14}"
-SIGN_DIST2_KEY="${15}"
-SIGN_DIST2_PWD="${16}"
-SIGN_DIST2_CA="${17}"
-SIGN_DIST2_ROOT="${18}"
-STRIPPER="${19}"
-LLVM_LINKER="${20}"
+ARTIFACT_NAME="${6}"
+PKG_VER="${7}"
+TPK_PACKAGER="${8}"
+NATIVE_SIGNER="${9}"
+SIGN_CERT_DIR="${10}"
+SIGN_AUTHOR_KEY="${11}"
+SIGN_AUTHOR_PWD="${12}"
+SIGN_DIST1_KEY="${13}"
+SIGN_DIST1_PWD="${14}"
+SIGN_DIST1_CA="${15}"
+SIGN_DIST2_KEY="${16}"
+SIGN_DIST2_PWD="${17}"
+SIGN_DIST2_CA="${18}"
+SIGN_DIST2_ROOT="${19}"
+STRIPPER="${20}"
+LLVM_LINKER="${21}"
 LLVM_IR="YES"
 
 # decide strip option
@@ -183,7 +185,7 @@ if [ -f "${BUILD_DIR}/bc_build_info.xml" ] ; then
 fi
 
 # generate package
-${TPK_PACKAGER} "${BUILD_DIR}" "${ARCH_TPK}" "${PKG_NAME}" "${PRJ_NAME}" "${PKG_VER}" "${STRIPPER}" "${STRIP}" "${LLVM_IR}" "${NATIVE_SIGNER}" "${SIGN_CERT_DIR}" "${SIGN_AUTHOR_KEY}" "${SIGN_AUTHOR_PWD}" "${SIGN_DIST1_KEY}" "${SIGN_DIST1_PWD}" "${SIGN_DIST1_CA}" "${SIGN_DIST2_KEY}" "${SIGN_DIST2_PWD}" "${SIGN_DIST2_CA}" "${SIGN_DIST2_ROOT}"
+${TPK_PACKAGER} "${BUILD_DIR}" "${ARCH_TPK}" "${PKG_NAME}" "${PRJ_NAME}" "${ARTIFACT_NAME}" "${PKG_VER}" "${STRIPPER}" "${STRIP}" "${LLVM_IR}" "${NATIVE_SIGNER}" "${SIGN_CERT_DIR}" "${SIGN_AUTHOR_KEY}" "${SIGN_AUTHOR_PWD}" "${SIGN_DIST1_KEY}" "${SIGN_DIST1_PWD}" "${SIGN_DIST1_CA}" "${SIGN_DIST2_KEY}" "${SIGN_DIST2_PWD}" "${SIGN_DIST2_CA}" "${SIGN_DIST2_ROOT}"
                 </script>
             </execute>
         </action>
@@ -191,8 +193,9 @@ ${TPK_PACKAGER} "${BUILD_DIR}" "${ARCH_TPK}" "${PKG_NAME}" "${PRJ_NAME}" "${PKG_
             <execute script="/bin/bash">
                 <input type="tag" value="#{TOOLCHAIN}:tool:name:debugger:path"/>
                 <input type="variable" value="gdb-options"/>
-                <input type="variable" value="sysroot"/>
-                <script>${1} ${2} --eval-command="set sysroot ${3}"</script>
+                               <input type="variable" value="sysroot"/>
+                               <input type="variable" value="debug-file-directory"/>
+                               <script>${1} ${2} --eval-command="set sysroot ${3}" --init-eval-command="set debug-file-directory ${4}"</script>
             </execute>
         </action>
         <action name="commandCC">