Skip to content

Commit 589e967

Browse files
author
Roger Stringer
committed
luna-service2 #149, luna-sysmgr #10, luna-sysmgr-common #6, keyboard-efigs #2, nodejs #35
luna-service2: 6a62161 Add support for external webkit process to secure list 8bbbfed libluna-service2: link explicitly with librt 837a076 Fix to build when WEBOS_TARGET_MACHINE_IMPL is "hardware" 8f4ddfc Change unit-tests to compile standalone 9a18f7b Add unit tests for libluna-service2 c40bfd9 Use mkstemp instead of mktemp in ls-hubd 962f0b9 Fix crash in possible error situation in _LSTransportClientNew luna-sysmgr: c22f1fc Allow carded applications to be dismissed in Qt5 luna-sysmgr-common: de6ff8a Include QGraphicsView when USE_MOUSE_FILTER in use 7a16070 Fix Qt5 migration of HostArmQtKeyFilter bc08d13 Update build instructions in README file 6078867 Use pkg config to find sysmgr-ipc headers keyboard-efigs: af9ae85 Fix parallel build nodejs: 94b747b Fix v8_extprj build errors when using icecc Open-webOS-DCO-1.0-Signed-off-by: Roger Stringer <roger.stringer@palm.com> Change-Id: I0dfcd7e3998801f0220517bd9be383a7f8940c6f Reviewed-on: http://g2g.palm.com/1560 Reviewed-by: Build Verification Reviewed-by: Eric Blade <eric.blade@palm.com> Reviewed-by: Roger Stringer <roger.stringer@palm.com> Tested-by: Roger Stringer <roger.stringer@palm.com>
1 parent 64b3f5f commit 589e967

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

build-webos-desktop.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,8 @@ function build_luna-sysservice
707707

708708
mkdir -p build
709709
cd build
710-
$CMAKE -D WEBOS_INSTALL_ROOT:PATH=${LUNA_STAGING} ..
710+
$CMAKE -DCMAKE_PREFIX_PATH=${LUNA_STAGING}/lib/cmake -DQT_QMAKE_EXECUTABLE=${QMAKE} -D WEBOS_INSTALL_ROOT:PATH=${LUNA_STAGING} ..
711+
711712
make $JOBS
712713
make install
713714

@@ -1210,7 +1211,13 @@ function build_BrowserServer
12101211
{
12111212
do_fetch isis-project/BrowserServer $1 BrowserServer
12121213

1213-
cd $BASE/BrowserServer
1214+
# Make sure alias to moc exists for BrowserServer build
1215+
# (Could also fix using sed on Makefile.Ubuntu)
1216+
cd ${LUNA_STAGING}/bin
1217+
[ -x moc ] || ln -sf moc-palm moc
1218+
1219+
set_source_dir $BASE/BrowserServer $BROWSERSERVER_DIR
1220+
12141221
export QT_INSTALL_PREFIX=$LUNA_STAGING
12151222
export STAGING_DIR=${LUNA_STAGING}
12161223
export STAGING_INCDIR="${LUNA_STAGING}/include"
@@ -1657,7 +1664,7 @@ set -x
16571664

16581665
pre_build
16591666

1660-
export LSM_TAG="9"
1667+
export LSM_TAG="10"
16611668
if [ ! -d "$BASE/luna-sysmgr" ] || [ ! -d "$BASE/tarballs" ] || [ ! -e "$BASE/tarballs/luna-sysmgr_${LSM_TAG}.zip" ] ; then
16621669
do_fetch openwebos/luna-sysmgr ${LSM_TAG} luna-sysmgr submissions/
16631670
fi
@@ -1678,7 +1685,7 @@ build cjson 35
16781685
build pbnjson 7
16791686
build pmloglib 21
16801687
build nyx-lib 58
1681-
build luna-service2 147
1688+
build luna-service2 149
16821689
#build qt4 4
16831690
build_qt5
16841691
build npapi-headers 0.4
@@ -1687,9 +1694,9 @@ build luna-webkit-api 1.01
16871694

16881695
build luna-sysmgr-ipc 2
16891696
build luna-sysmgr-ipc-messages 2
1690-
build luna-sysmgr-common 4
1697+
build luna-sysmgr-common 6
16911698
build luna-sysmgr $LSM_TAG
1692-
build keyboard-efigs 1.02
1699+
build keyboard-efigs 2
16931700

16941701
build webappmanager 5
16951702
build luna-init 1.03
@@ -1725,7 +1732,7 @@ build mojoservicelauncher 71
17251732
## BrowserAdapter 0.4.1 includes (only) desktop-specific changes to build with libpbnjson 7
17261733
#build BrowserAdapter 0.4.1
17271734

1728-
build nodejs 34
1735+
build nodejs 35
17291736
build node-addon sysbus 25
17301737
build node-addon pmlog 10
17311738
build node-addon dynaload 11

0 commit comments

Comments
 (0)