@@ -34,8 +34,8 @@ VOO_QT_DIR=/home/jenkins/jobs/BUILD_MVM_All/workspace/build/TAMIAS/WEBKITQT48/ci
34
34
35
35
ARMV7_TOOLCHAIN_DIR=/opt/softs/compilers/st/arm/LINUX_4.6.3_112/armv7
36
36
37
- GNUARM_TOOLCHAIN_DIR =/opt/softs/toolchains/ARM
38
- GNUARM_QT_DIR =/opt/android/Qt5.1/5.1.0/android_armv7
37
+ ARM_GNU_TOOLCHAIN_DIR =/opt/softs/toolchains/ARM_GNU
38
+ ARM_GNU_QT_DIR =/opt/android/Qt5.1/5.1.0/android_armv7
39
39
40
40
ARM_ANGSTROM_TOOLCHAIN_DIR=/opt/softs/compilers/st/arm/LINUX_4.6.3_112/arm-angstrom
41
41
ARM_ANGSTROM_QT_DIR=/opt/android/Qt5.1/5.1.0/android_armv7
@@ -125,11 +125,11 @@ function SetPlatformVariable
125
125
export QT_DIR=${ARM_ANGSTROM_QT_DIR}
126
126
;;
127
127
128
- GNUARM )
129
- export CC=${GNUARM_TOOLCHAIN_DIR } /bin/arm-none-linux-gnueabi-gcc
130
- export CXX=${GNUARM_TOOLCHAIN_DIR } /bin/arm-none-linux-gnueabi-g++
131
- export LINK=${GNUARM_TOOLCHAIN_DIR } /bin/arm-none-linux-gnueabi-g++
132
- export QT_DIR=${GNUARM_QT_DIR }
128
+ ARM_GNU )
129
+ export CC=${ARM_GNU_TOOLCHAIN_DIR } /bin/arm-none-linux-gnueabi-gcc
130
+ export CXX=${ARM_GNU_TOOLCHAIN_DIR } /bin/arm-none-linux-gnueabi-g++
131
+ export LINK=${ARM_GNU_TOOLCHAIN_DIR } /bin/arm-none-linux-gnueabi-g++
132
+ export QT_DIR=${ARM_GNU_QT_DIR }
133
133
;;
134
134
135
135
esac
149
149
if [ " $TARGET_LIST " = " all" ]
150
150
then
151
151
echo " TARGET = all"
152
- TARGET_LIST=" desktop BCM CHANALD NEWCO REF ST40_CC14_0_1 ST40_CC15_0_0 UPCH VOO ARMV7 ARM_ANGSTROM GNUARM "
152
+ TARGET_LIST=" desktop BCM CHANALD NEWCO REF ST40_CC14_0_1 ST40_CC15_0_0 UPCH VOO ARMV7 ARM_ANGSTROM ARM_GNU "
153
153
fi
154
154
155
155
if [ -z " $MODE_LIST " ]
163
163
OUTDIR=` pwd`
164
164
fi
165
165
166
- SUPPORTED_TARGETS=" desktop,BCM,CHANALD,NEWCO,REF,ST40_CC14_0_1,ST40_CC15_0_0,UPCH,VOO,ARMV7,ARM_ANGSTROM,GNUARM "
166
+ SUPPORTED_TARGETS=" desktop,BCM,CHANALD,NEWCO,REF,ST40_CC14_0_1,ST40_CC15_0_0,UPCH,VOO,ARMV7,ARM_ANGSTROM,ARM_GNU "
167
167
SUPPORTED_MODES=" release_dbg,release"
168
168
169
169
for TmpTarget in $TARGET_LIST
187
187
echo " *************************************************"
188
188
SetPlatformVariable $TmpTarget
189
189
rm -f wd.gypi
190
- cp wd.gypi.${TmpTarget} wd.gypi
190
+ cp platform/ wd.gypi.${TmpTarget} wd.gypi
191
191
if [ ! -f wd.gypi ]
192
192
then
193
193
echo " Create default wd.gypi"
0 commit comments