Skip to content

Make JS dependency URLs configurable #92

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.

Sign up for GitHub

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

Closed
sandliu wants to merge 1 commit into from
+47 −6
Closed

Make JS dependency URLs configurable #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ config:
@echo " WEB_SERVER_PORT = $(WEB_SERVER_PORT)"
@echo " WEB_SERVER_DOCUMENT_ROOT= $(WEB_SERVER_DOCUMENT_ROOT)"
@echo ""
@echo "HTML5 Client JavaScript URLs:"
@echo " JQUERY_JS_URL = $(JQUERY_JS_URL)"
@echo " MUSTACHE_JS_URL = $(MUSTACHE_JS_URL)"
@echo " CBUFFER_JS_URL = $(CBUFFER_JS_URL)"
@echo " BOOTSTRAP_JS_URL = $(BOOTSTRAP_JS_URL)"
@echo " D3_JS_URL = $(D3_JS_URL)"
@echo " PAKO_JS_URL = $(PAKO_JS_URL)"
@echo ""
@echo "Performance:"
@echo " RT_CPU = $(RT_CPU) (CPU core for sampling thread)"
@echo " RT_CPU_TOPTALK = $(RT_CPU_TOPTALK) (CPU core for packet capture threads)"
Expand Down
6 changes: 6 additions & 0 deletions html5-client/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ assemble-html: createdirs
perl -pe 's|##PCAP-BUTTON##|`cat $(PCAP_BUTTON_PART)`|ge' -i ${TPL}
perl -pe 's|##PCAP-DISABLED-MODAL##|`cat $(PCAP_DISABLED_MODAL_PART)`|ge' -i ${TPL}
perl -pe 's|##PRODUCT-BRANDING##|${PRODUCT_BRANDING}|ge' -i ${TPL}
perl -pe 's|##JQUERY-JS-URL##|$(JQUERY_JS_URL)|g' -i ${TPL}
perl -pe 's|##MUSTACHE-JS-URL##|$(MUSTACHE_JS_URL)|g' -i ${TPL}
perl -pe 's|##CBUFFER-JS-URL##|$(CBUFFER_JS_URL)|g' -i ${TPL}
perl -pe 's|##BOOTSTRAP-JS-URL##|$(BOOTSTRAP_JS_URL)|g' -i ${TPL}
perl -pe 's|##D3-JS-URL##|$(D3_JS_URL)|g' -i ${TPL}
perl -pe 's|##PAKO-JS-URL##|$(PAKO_JS_URL)|g' -i ${TPL}

install:
install -d ${DESTDIR}/var/lib/jittertrap/
Expand Down
12 changes: 6 additions & 6 deletions html5-client/src/html/index.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

<link rel="icon" href="favicon.svg" type="image/svg+xml">

<script type="text/javascript" src="js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="js/mustache.min.js"></script>
<script type="text/javascript" src="js/cbuffer.js"></script>
<script type="text/javascript" src="js/bootstrap.bundle.min.js"></script>
<script type="text/javascript" src="js/d3.v7.min.js"></script>
<script type="text/javascript" src="js/pako.min.js"></script>
<script type="text/javascript" src="##JQUERY-JS-URL##"></script>
<script type="text/javascript" src="##MUSTACHE-JS-URL##"></script>
<script type="text/javascript" src="##CBUFFER-JS-URL##"></script>
<script type="text/javascript" src="##BOOTSTRAP-JS-URL##"></script>
<script type="text/javascript" src="##D3-JS-URL##"></script>
<script type="text/javascript" src="##PAKO-JS-URL##"></script>
<script type="text/javascript" src="js/jittertrap-concat.js"></script>

</head>
Expand Down
27 changes: 27 additions & 0 deletions make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,33 @@ ifndef WEB_SERVER_DOCUMENT_ROOT
WEB_SERVER_DOCUMENT_ROOT = /var/lib/jittertrap
endif

# Third-party JavaScript URLs used by the HTML5 client. Defaults match files
# copied into output/js by html5-client/Makefile. Override these for packaging
# systems that serve shared JavaScript dependencies from system paths or CDNs.
ifndef JQUERY_JS_URL
JQUERY_JS_URL = js/jquery-3.7.1.min.js
endif

ifndef MUSTACHE_JS_URL
MUSTACHE_JS_URL = js/mustache.min.js
endif

ifndef CBUFFER_JS_URL
CBUFFER_JS_URL = js/cbuffer.js
endif

ifndef BOOTSTRAP_JS_URL
BOOTSTRAP_JS_URL = js/bootstrap.bundle.min.js
endif

ifndef D3_JS_URL
D3_JS_URL = js/d3.v7.min.js
endif

ifndef PAKO_JS_URL
PAKO_JS_URL = js/pako.min.js
endif

# ------------------------------------------------------------------------------
# Performance Tuning
# ------------------------------------------------------------------------------
Expand Down