Skip to content

Commit

Permalink
enact-framework=v3.2.5
Browse files Browse the repository at this point in the history
:Release Notes:
Enact 3.2.5 submission framework release

:Detailed Notes:
* Updated build framework Enact to 3.2.5
* Preserve package.json and shrinkwrap for repeat compiles

enact 3.2.4..3.2.5:
fc3f21ca Version value updating
0f64f066 Update changelogs for 3.2.5
e1ce7d34 PLAT-94532: Prevent double read of marqueeing text
906891ca ENYO-6352: Fix Notification to support 3 full-width buttons in
         one line

:Testing Performed:
Verf built and locally tested

:QA Notes:

:Issues Addressed:
[PLAT-97351] Create CCC for Enact 3.2.5 into RP
[PLAT-97190] Enact app recompile fails
[PLAT-97352] CCC: enact-framework=v3.2.5

Change-Id: I917e3313304976b809b896e1e33fe08f01b595df
  • Loading branch information
JayCanuck authored and Minjae Kim committed Jan 22, 2020
1 parent b3f9023 commit f454367
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions meta-webos/classes/webos_enactjs_app.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ do_compile() {
exit 1
fi

cp -f package.json package.json.bak
cp -f npm-shrinkwrap.json npm-shrinkwrap.json.bak

# apply shrinkwrap override, rerouting to shared enact framework tarballs as needed
if [ "${WEBOS_ENACTJS_SHRINKWRAP_OVERRIDE}" = "true" ] ; then
bbnote "Attempting to use submission enact framework"
Expand Down Expand Up @@ -187,6 +190,8 @@ do_compile() {
fi
fi

cp -f package.json.bak package.json
cp -f npm-shrinkwrap.json.bak npm-shrinkwrap.json
cd ${working}
}

Expand Down
4 changes: 2 additions & 2 deletions meta-webos/recipes-webos/enactjs-apps/enact-framework.bb
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ SRC_URI = "${ENACTJS_GIT_REPO}/enact.git;nobranch=1;destsuffix=git/enact"
# algorithm properly recognizes that a pre-release precedes the associated final
# release (e.g., 1.0-pre.1 < 1.0).

PV = "3.2.4"
SRCREV = "170e35cb472bb0ff73e9b5187dd653ced254438d"
PV = "3.2.5"
SRCREV = "5f5c308a08f279518c873c2272017583770829cc"

# Ordered dependency list for Enact; provides shrink-wrap style locking in of package versions
WEBOS_ENACT_DEPENDENCIES ??= "\
Expand Down

0 comments on commit f454367

Please sign in to comment.