From 76bd910ec4f893e33415cd3a82cffcd87d8f1007 Mon Sep 17 00:00:00 2001 From: Sungho Park Date: Mon, 30 Apr 2012 18:06:19 +0900 Subject: [PATCH] upload tizen1.0 source Change-Id: Iceaa79eaff9eded56ec7caf87259b39097ea7f04 --- build-armel-windows.sh | 1 - build-i386-windows.sh | 1 - package/build.linux | 29 +++++++++++++++++++++++++---- package/cross-arm-gcc-45.remove.linux | 3 --- package/cross-arm-gcc-45.remove.windows | 4 ---- package/cross-i386-gcc-45.remove.linux | 3 --- package/cross-i386-gcc-45.remove.windows | 4 ---- package/pkginfo.manifest | 12 ++++++------ 8 files changed, 31 insertions(+), 26 deletions(-) delete mode 100644 package/cross-arm-gcc-45.remove.linux delete mode 100644 package/cross-arm-gcc-45.remove.windows delete mode 100644 package/cross-i386-gcc-45.remove.linux delete mode 100644 package/cross-i386-gcc-45.remove.windows diff --git a/build-armel-windows.sh b/build-armel-windows.sh index a6b7dbe..1f1d881 100755 --- a/build-armel-windows.sh +++ b/build-armel-windows.sh @@ -129,7 +129,6 @@ cd ${CURDIR} # Configure/Build/Install GCC log "[Configuring GCC...]" -export PATH=${ARM_LINUX_GCC_DIR}/bin:${PATH} cd ${GCC_SOURCE_DIR} mkdir tmp_build cd tmp_build diff --git a/build-i386-windows.sh b/build-i386-windows.sh index af88343..aa7c7ab 100755 --- a/build-i386-windows.sh +++ b/build-i386-windows.sh @@ -129,7 +129,6 @@ cd ${CURDIR} # Configure/Build/Install GCC log "[Configuring GCC...]" -export PATH=${I386_LINUX_GCC_DIR}/bin:${PATH} cd ${GCC_SOURCE_DIR} mkdir tmp_build cd tmp_build diff --git a/package/build.linux b/package/build.linux index e7f613a..16edaeb 100755 --- a/package/build.linux +++ b/package/build.linux @@ -1,5 +1,6 @@ #!/bin/sh -xe # clean +SCRIPT_DIR=${SRCDIR}/scripts clean() { rm -rf $SRCDIR/*.zip @@ -9,6 +10,7 @@ clean() rm -rf $SRCDIR/gcc-linaro-4.5-2012.01 rm -rf $SRCDIR/tizen-device-1.0.base rm -rf $SRCDIR/tizen-emulator-1.0.base + rm -rf ${SCRIPT_DIR} } @@ -17,6 +19,7 @@ build() { # prepare source files SOURCE_TAR_DIR=${SRCDIR}/sources + rm -rf ${SOURCE_TAR_DIR} mkdir ${SOURCE_TAR_DIR} cp $ROOTDIR/gcc-linaro-4.5-2012.01.tar.bz2 $SOURCE_TAR_DIR/ cp $ROOTDIR/binutils-2.22.tar.gz $SOURCE_TAR_DIR/ @@ -27,13 +30,31 @@ build() # prepare if [ ${BUILD_TARGET_OS} = "windows" ] ; then - export ARM_LINUX_GCC_DIR=${ROOTDIR}/SDK/build-system/toolchains/arm-linux-gnueabi-gcc-4.5 - export I386_LINUX_GCC_DIR=${ROOTDIR}/SDK/build-system/toolchains/i386-linux-gnueabi-gcc-4.5 + # copy sysroot for applying patch cp -rf ${ROOTDIR}/SDK/build-system/rootstraps/tizen-device-1.0.base ${SRCDIR}/ cp -rf ${ROOTDIR}/SDK/build-system/rootstraps/tizen-emulator-1.0.base ${SRCDIR}/ - export SYSROOT_DIR=${SRCDIR}/tizen-device-1.0.base + + # Generate scripts for call cross compiler + rm -rf ${SCRIPT_DIR} + mkdir -p ${SCRIPT_DIR} + export ARM_LINUX_GCC_DIR=${ROOTDIR}/SDK/build-system/toolchains/arm-linux-gnueabi-gcc-4.5 + export I386_LINUX_GCC_DIR=${ROOTDIR}/SDK/build-system/toolchains/i386-linux-gnueabi-gcc-4.5 + export ARM_SYSROOT_DIR=${SRCDIR}/tizen-device-1.0.base + export I386_SYSROOT_DIR=${SRCDIR}/tizen-emulator-1.0.base + echo "${ARM_LINUX_GCC_DIR}/bin/arm-linux-gnueabi-gcc --sysroot=${ARM_SYSROOT_DIR} \$@" > ${SCRIPT_DIR}/arm-linux-gnueabi-gcc + echo "${ARM_LINUX_GCC_DIR}/bin/arm-linux-gnueabi-g++ --sysroot=${ARM_SYSROOT_DIR} \$@" > ${SCRIPT_DIR}/arm-linux-gnueabi-g++ + echo "${I386_LINUX_GCC_DIR}/bin/i386-linux-gnueabi-gcc --sysroot=${I386_SYSROOT_DIR} \$@" > ${SCRIPT_DIR}/i386-linux-gnueabi-gcc + echo "${I386_LINUX_GCC_DIR}/bin/i386-linux-gnueabi-g++ --sysroot=${I386_SYSROOT_DIR} \$@" > ${SCRIPT_DIR}/i386-linux-gnueabi-g++ + chmod +x ${SCRIPT_DIR}/arm-linux-gnueabi-gcc + chmod +x ${SCRIPT_DIR}/arm-linux-gnueabi-g++ + chmod +x ${SCRIPT_DIR}/i386-linux-gnueabi-gcc + chmod +x ${SCRIPT_DIR}/i386-linux-gnueabi-g++ + export PATH=${SCRIPT_DIR}:${PATH} + + # build + export SYSROOT_DIR=${ARM_SYSROOT_DIR} ./build-armel-${BUILD_TARGET_OS}.sh - export SYSROOT_DIR=${SRCDIR}/tizen-emulator-1.0.base + export SYSROOT_DIR=${I386_SYSROOT_DIR} ./build-i386-${BUILD_TARGET_OS}.sh else export SYSROOT_DIR=${ROOTDIR}/SDK/build-system/rootstraps/tizen-device-1.0.base diff --git a/package/cross-arm-gcc-45.remove.linux b/package/cross-arm-gcc-45.remove.linux deleted file mode 100644 index 9d9f481..0000000 --- a/package/cross-arm-gcc-45.remove.linux +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rm -f ${INSTALLED_PATH}/SDK/build-system/plugins/*_* diff --git a/package/cross-arm-gcc-45.remove.windows b/package/cross-arm-gcc-45.remove.windows deleted file mode 100644 index e044d80..0000000 --- a/package/cross-arm-gcc-45.remove.windows +++ /dev/null @@ -1,4 +0,0 @@ -:: delims is a TAB followed by a space - -SET installed_path=%INSTALLED_PATH% -DEL %installed_path%\SDK\build-system\plguins\*_* diff --git a/package/cross-i386-gcc-45.remove.linux b/package/cross-i386-gcc-45.remove.linux deleted file mode 100644 index 9d9f481..0000000 --- a/package/cross-i386-gcc-45.remove.linux +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rm -f ${INSTALLED_PATH}/SDK/build-system/plugins/*_* diff --git a/package/cross-i386-gcc-45.remove.windows b/package/cross-i386-gcc-45.remove.windows deleted file mode 100644 index e044d80..0000000 --- a/package/cross-i386-gcc-45.remove.windows +++ /dev/null @@ -1,4 +0,0 @@ -:: delims is a TAB followed by a space - -SET installed_path=%INSTALLED_PATH% -DEL %installed_path%\SDK\build-system\plguins\*_* diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 73310d9..522abdf 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package : cross-arm-gcc-4.5 -Version : 0.20.13 +Version : 0.20.16 OS : linux Build-host-os : linux Install-dependency : @@ -10,18 +10,18 @@ Maintainer : Taejun Ha , Jiil Hyoun , Jiil Hyoun , Donghyuk Yang , Donghee Yang Description : gnu compiler 4.5 for Tizen SDK Package : cross-i386-gcc-4.5 -Version : 0.20.13 +Version : 0.20.16 OS : linux Build-host-os : linux Install-dependency : @@ -32,11 +32,11 @@ Maintainer : Taejun Ha , Jiil Hyoun , Jiil Hyoun , Donghyuk Yang , Donghee Yang -- 2.7.4