Skip to content

Commit c73333d

Browse files
author
Roger Stringer
committed
Update versions of SysMgr components
db8 to 62 keyboard-efigs to 1.02 luna-applauncher to 1.00 luna-prefs to 1.01 luna-service2 146 luna-sysmgr to 2 luna-sysmgr-common to 2 luna-sysservice to 1.04 luna-systemui to 1.02 luna-webkit-api to 1.01 qt4 3 webappmanager to 2 Remove obsolete workaround for db8 #61.1 Add a workaround for pbnjson #7 Open-webOS-DCO-1.0-Signed-off-by: Roger Stringer <roger.stringer@palm.com> Change-Id: Ie679d30d83fddcf68bfcf3347f1079c1bb60d5ca Reviewed-on: http://g2g.palm.com/1176 Reviewed-by: Build Verification Tested-by: Roger Stringer <roger.stringer@palm.com> Reviewed-by: Roger Stringer <roger.stringer@palm.com>
1 parent 5df3206 commit c73333d

1 file changed

Lines changed: 35 additions & 24 deletions

File tree

build-webos-desktop.sh

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# @@@LICENSE
33
#
4-
# Copyright (c) 2012 Hewlett-Packard Development Company, L.P.
4+
# Copyright (c) 2012 - 2013 Hewlett-Packard Development Company, L.P.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
1717
#
1818
# LICENSE@@@
1919

20-
VERSION=7.6
20+
VERSION=7.7
2121

2222
PROCS=`grep -c processor /proc/cpuinfo`
2323

@@ -232,6 +232,7 @@ function build_cjson
232232
{
233233
do_fetch openwebos/cjson $1 cjson submissions/
234234
cd $BASE/cjson
235+
235236
sh autogen.sh
236237
mkdir -p build
237238
cd build
@@ -247,11 +248,21 @@ function build_cjson
247248
function build_pbnjson
248249
{
249250
do_fetch openwebos/libpbnjson $1 pbnjson submissions/
250-
mkdir -p $BASE/pbnjson/build
251-
cd $BASE/pbnjson/build
251+
cd $BASE/pbnjson
252+
253+
mkdir -p build
254+
cd build
252255
$CMAKE -D WEBOS_INSTALL_ROOT:PATH=${LUNA_STAGING} ..
253256
make $JOBS
254257
make install
258+
259+
# remove lib files from old location
260+
cd ${LUNA_STAGING}
261+
rm -f lib/libpbnjson*.so
262+
# remove header files from old location
263+
cd include
264+
rm -rf pbnjson
265+
rm -f pbnjson*.h*
255266
}
256267

257268
###########################
@@ -260,8 +271,10 @@ function build_pbnjson
260271
function build_pmloglib
261272
{
262273
do_fetch openwebos/pmloglib $1 pmloglib submissions/
263-
mkdir -p $BASE/pmloglib/build
264-
cd $BASE/pmloglib/build
274+
cd $BASE/pmloglib
275+
276+
mkdir -p build
277+
cd build
265278
$CMAKE .. -DNO_TESTS=True -DNO_UTILS=True -DCMAKE_INSTALL_PREFIX=${LUNA_STAGING} -DCMAKE_BUILD_TYPE=Release
266279
make $JOBS
267280
make install
@@ -598,7 +611,7 @@ function build_core-apps
598611
###########################################
599612
function build_luna-applauncher
600613
{
601-
do_fetch openwebos/luna-applauncher $1 luna-applauncher
614+
do_fetch openwebos/luna-applauncher $1 luna-applauncher submissions/
602615

603616
##### To build from your local clone of luna-applauncher, change the following line to "cd" to your clone's location
604617
cd $BASE/luna-applauncher
@@ -1458,19 +1471,17 @@ set -x
14581471
# export SKIPSTUFF=0
14591472
#fi
14601473

1461-
export LSM_TAG="1.03"
1474+
export LSM_TAG="2"
14621475
if [ ! -d "$BASE/luna-sysmgr" ] || [ ! -d "$BASE/tarballs" ] || [ ! -e "$BASE/tarballs/luna-sysmgr_${LSM_TAG}.zip" ] ; then
14631476
do_fetch openwebos/luna-sysmgr ${LSM_TAG} luna-sysmgr submissions/
14641477
fi
14651478
if [ -d $BASE/luna-sysmgr ] ; then
14661479
rm -f $BASE/luna-sysmgr/luna-desktop-build*.stamp
14671480
fi
14681481

1469-
## TODO: Remove this temporary fix once db8 incremented past 61.1
1470-
if [ ! -d "$BASE/configurator" ] || [ ! -e "$BASE/configurator/luna-desktop-build-49.stamp" ] ; then
1471-
if [ -d "$BASE/db8" ] && [ -e "$BASE/db8/luna-desktop-build-61.1.stamp" ] ; then
1472-
rm -f $BASE/db8/luna-desktop-build-61.1.stamp
1473-
fi
1482+
## TODO: Remove this temporary fix once pbnjson incremented past 7
1483+
if [ -d "$BASE/pbnjson" ] && [ -e "$BASE/pbnjson/luna-desktop-build-7.stamp" ] ; then
1484+
rm -f $BASE/pbnjson/luna-desktop-build-7.stamp
14741485
fi
14751486

14761487
# Build a local version of cmake 2.8.7 so that cmake-modules-webos doesn't have to write to the OS-supplied CMake modules directory
@@ -1481,29 +1492,29 @@ build cjson 35
14811492
build pbnjson 7
14821493
build pmloglib 21
14831494
build nyx-lib 58
1484-
build luna-service2 145
1485-
build qt4 1.03
1495+
build luna-service2 146
1496+
build qt4 3
14861497
build npapi-headers 0.4
1487-
build luna-webkit-api 1.00
1498+
build luna-webkit-api 1.01
14881499
build webkit 0.54
14891500

14901501
build luna-sysmgr-ipc 1.01
14911502
build luna-sysmgr-ipc-messages 1.02
1492-
build luna-sysmgr-common 1.02
1503+
build luna-sysmgr-common 2
14931504
build luna-sysmgr $LSM_TAG
1494-
build keyboard-efigs 1.01
1505+
build keyboard-efigs 1.02
14951506

1496-
build webappmanager 1.02
1507+
build webappmanager 2
14971508

14981509
build luna-init 1.04
1499-
build luna-prefs 1.00
1500-
build luna-sysservice 1.03
1510+
build luna-prefs 1.01
1511+
build luna-sysservice 1.04
15011512
build librolegen 16
15021513
##build serviceinstaller 1.01
15031514
build luna-universalsearchmgr 1.00
15041515

1505-
build luna-applauncher 0.90
1506-
build luna-systemui 1.01
1516+
build luna-applauncher 1.00
1517+
build luna-systemui 1.02
15071518

15081519
build enyo-1.0 128.2
15091520
build core-apps 2
@@ -1533,7 +1544,7 @@ build node-addon sysbus 25
15331544
build node-addon pmlog 10
15341545
build node-addon dynaload 11
15351546

1536-
build db8 61.1
1547+
build db8 62
15371548
build configurator 49
15381549

15391550
build activitymanager 110

0 commit comments

Comments
 (0)