Repository navigation
[jsroot] use as builtin in ROOT #23877
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
linev
wants to merge
10
commits into
root-project:master
Choose a base branch
from
linev:jsroot_as_builtin
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+97
−405,166
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fac454e
[jsroot] Provide builtin_jsroot option
linev e46a248
[mathjax] add builtin_jsroot as dependency
linev d9fae0e
[jsroot] switch to URL download
linev 0b347ae
[jsroot] let use jsroot from web when builtin_jsroot not installed
linev 601f263
[openui5] let use external openui5 when builtin is not installed
linev c5b24b2
[openui5] use as external https://sdk.openui5.org/1.152.0/
linev 1932665
[jsroot] move install instruction to builtin_jsroot cmake
linev 4fea6e3
[openui5] add dir permissions to openui5 installation
linev 07adee6
[mathjax] remove install instruction
linev 3c5e33d
[jsroot] remove JSROOTSYSand OPENUI5DIR workaround during cmake
linev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Copyright (C) 1995-2026, Rene Brun and Fons Rademakers. | ||
| # All rights reserved. | ||
| # | ||
| # For the licensing terms see $ROOTSYS/LICENSE. | ||
| # For the list of contributors see $ROOTSYS/README/CREDITS. | ||
|
|
||
| ExternalProject_Add(BUILTIN_JSROOT | ||
| URL https://github.com/root-project/jsroot/releases/download/7.12.0/JsRoot7120.tar.gz | ||
| URL_HASH SHA256=e5d82888750bda70090ac4bff355734000372c983a3eff11d67efa09f30d4b06 | ||
|
|
||
| # GIT_REPOSITORY https://github.com/root-project/jsroot.git | ||
| # GIT_TAG 7.12.0 | ||
| # GIT_SHALLOW TRUE # only works with tags/branches, comment out when commit hashes used | ||
| # UPDATE_COMMAND "" | ||
| # PATCH_COMMAND ${CMAKE_COMMAND} -E rm -rf <SOURCE_DIR>/demo | ||
| # <SOURCE_DIR>/fonts | ||
| # <SOURCE_DIR>/docs | ||
| # <SOURCE_DIR>/libs | ||
| # <SOURCE_DIR>/server | ||
| # <SOURCE_DIR>/.git | ||
| # <SOURCE_DIR>/.github | ||
| # <SOURCE_DIR>/api.htm | ||
| # <SOURCE_DIR>/examples.htm | ||
|
|
||
| SOURCE_DIR ${CMAKE_BINARY_DIR}/js/ | ||
| TIMEOUT 600 | ||
| CONFIGURE_COMMAND "" | ||
| BUILD_COMMAND "" | ||
| INSTALL_COMMAND "" | ||
| ) | ||
|
guitargeek marked this conversation as resolved.
Resolved
|
||
|
|
||
| install(DIRECTORY ${CMAKE_BINARY_DIR}/js/ DESTINATION ${CMAKE_INSTALL_JSROOTDIR} COMPONENT libraries ${DIR_PERMISSIONS}) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,14 @@ | ||
| ExternalProject_Add( | ||
| MATHJAX | ||
| BUILTIN_MATHJAX | ||
| URL ${lcgpackages}/mathjax-3.2.0.tar.gz | ||
| URL_HASH SHA256=6847f1cfdd980afbe31b466474da301a56ab859a67d8035442b052dd4ac2fa03 | ||
| CONFIGURE_COMMAND "" | ||
| BUILD_COMMAND "" | ||
| INSTALL_COMMAND "" | ||
| SOURCE_DIR ${CMAKE_BINARY_DIR}/js/mathjax/ | ||
| TIMEOUT 600 | ||
| DEPENDS BUILTIN_JSROOT | ||
| ) | ||
|
|
||
| install(DIRECTORY ${CMAKE_BINARY_DIR}/js/mathjax/ DESTINATION ${CMAKE_INSTALL_JSROOTDIR}/mathjax ${DIR_PERMISSIONS}) | ||
| # install no longer necessary - will be performed together with jsroot | ||
| # install(DIRECTORY ${CMAKE_BINARY_DIR}/js/mathjax/ DESTINATION ${CMAKE_INSTALL_JSROOTDIR}/mathjax ${DIR_PERMISSIONS}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do not usually rely on GitHub for downloading tarballs. Can this become, also in another PR, an LCG provided tarball?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Of course.
If you put JSROOT release on LCG, I will directly modify this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
request filed https://its.cern.ch/jira/browse/SPI-3098