qtcreator-plugin-ubuntu

Merge lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/js-scope-template into lp://staging/qtcreator-plugin-ubuntu

js-scope-template
Merge into trunk

Proposed by Marcus Tomlinson on 2015-09-17

Status:	Work in progress
Proposed branch:	lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/js-scope-template
Merge into:	lp://staging/qtcreator-plugin-ubuntu
Diff against target:	583 lines (+509/-0) 12 files modified debian/control (+3/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/.bzrignore (+5/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/CMakeLists.txt (+57/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/displayName.apparmor (+6/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/manifest.json.in (+15/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/po/CMakeLists.txt (+14/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/po/POTFILES.in.in (+3/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/src/CMakeLists.txt (+56/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/src/data/displayName-settings.ini.in (+21/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/src/data/displayName.ini.in (+9/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/src/displayName.js (+224/-0) share/qtcreator/templates/wizards/ubuntu/scope-js/wizard.xml (+96/-0)
To merge this branch:	bzr merge lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/js-scope-template
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu SDK team		2015-09-17	Pending
Review via email: mp+271480@code.staging.launchpad.net

Commit message

Added JavaScript scope templates

lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/js-scope-template updated on 2015-10-21

417. By Marcus Tomlinson on 2015-09-17: The POTFILES.in.in should actaully be committed to bzr
418. By Marcus Tomlinson on 2015-09-17: Add unity-js-scopes-bindings and unity-js-scopes-launcher to control
419. By Marcus Tomlinson on 2015-09-17: Reverted changes to regular scope template
420. By Marcus Tomlinson on 2015-09-30: Updated rebuild_modules custom target to build npm modules for target arch
421. By Marcus Tomlinson on 2015-09-30: Add unity-js-scopes-tool to debian/control
422. By Marcus Tomlinson on 2015-09-30: Make installation of unity-js-scopes explicit in top CMakeLists.txt
423. By Marcus Tomlinson on 2015-10-01: Call build on node_modules as to not redundantly rebuild on every run in sdk
424. By Marcus Tomlinson on 2015-10-01: Shorted CLICK_ARCH CMake variable to ARCH
425. By Marcus Tomlinson on 2015-10-09: Install the source directory node_modules not the build directory one
426. By Marcus Tomlinson on 2015-10-09: Don't copy node_modules to build dir for local execution, make a symlink instead
427. By Marcus Tomlinson on 2015-10-13: Update template to use OpenWeatherMap
428. By Marcus Tomlinson on 2015-10-13: Added xml and empty code paths
429. By Marcus Tomlinson on 2015-10-13: Fixed xml template
430. By Marcus Tomlinson on 2015-10-13: Revert control file changes
431. By Marcus Tomlinson on 2015-10-13: Don't pass arch to unity-js-scopes-tool build
432. By Marcus Tomlinson on 2015-10-14: Update template to use new style contructors
433. By Marcus Tomlinson on 2015-10-14: OOPS!
434. By Marcus Tomlinson on 2015-10-21: Added unity-js-scopes deps

Unmerged revisions

434. By Marcus Tomlinson on 2015-10-21: Added unity-js-scopes deps
433. By Marcus Tomlinson on 2015-10-14: OOPS!
432. By Marcus Tomlinson on 2015-10-14: Update template to use new style contructors
431. By Marcus Tomlinson on 2015-10-13: Don't pass arch to unity-js-scopes-tool build
430. By Marcus Tomlinson on 2015-10-13: Revert control file changes
429. By Marcus Tomlinson on 2015-10-13: Fixed xml template
428. By Marcus Tomlinson on 2015-10-13: Added xml and empty code paths
427. By Marcus Tomlinson on 2015-10-13: Update template to use OpenWeatherMap
426. By Marcus Tomlinson on 2015-10-09: Don't copy node_modules to build dir for local execution, make a symlink instead
425. By Marcus Tomlinson on 2015-10-09: Install the source directory node_modules not the build directory one

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Marcus Tomlinson

Ubuntu SDK team