X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FMakefile;h=23f23601704564985d277d152732fec5ebc63f77;hb=0970ef7fb065f5d696179a1804352099901c7d8e;hp=2117da59dc172acc7baf76000b96e698645fa2d0;hpb=050c1684995aa3c686318f0f9ae31902595ebc17;p=proxmox-widget-toolkit.git

diff --git a/src/Makefile b/src/Makefile
index 2117da5..23f2360 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,10 +2,15 @@ include defines.mk
 
 SUBDIRS= css images
 
+# bundle it for now from the libjs-marked debian package to avoid touching our proxies file mapper,
+# we could also just ship a link to the packages file and load from same path as the widget-toolkit
+MARKEDJS=/usr/share/javascript/marked/marked.min.js
+
 JSSRC=					\
 	Utils.js			\
 	Toolkit.js			\
 	Logo.js				\
+	Parser.js			\
 	mixin/CBind.js			\
 	data/reader/JsonObject.js	\
 	data/ProxmoxProxy.js		\
@@ -15,6 +20,8 @@ JSSRC=					\
 	data/RRDStore.js		\
 	data/TimezoneStore.js		\
 	data/model/Realm.js		\
+	data/model/Certificates.js	\
+	data/model/ACME.js		\
 	form/DisplayEdit.js		\
 	form/ExpireDate.js		\
 	form/IntegerField.js		\
@@ -28,22 +35,30 @@ JSSRC=					\
 	form/BondModeSelector.js	\
 	form/NetworkSelector.js		\
 	form/RealmComboBox.js		\
+	form/PruneKeepField.js		\
 	form/RoleSelector.js		\
 	form/DiskSelector.js		\
 	form/MultiDiskSelector.js	\
 	form/TaskTypeSelector.js	\
+	form/ACME.js			\
 	button/Button.js		\
 	button/HelpButton.js		\
 	grid/ObjectGrid.js		\
 	grid/PendingObjectGrid.js	\
-	grid/DiskList.js		\
+	panel/DiskList.js		\
 	panel/InputPanel.js		\
 	panel/InfoWidget.js		\
 	panel/LogView.js		\
 	panel/JournalView.js		\
 	panel/PermissionView.js		\
+	panel/PruneKeepPanel.js		\
 	panel/RRDChart.js		\
 	panel/GaugeWidget.js		\
+	panel/Certificates.js		\
+	panel/ACMEAccount.js		\
+	panel/ACMEPlugin.js		\
+	panel/ACMEDomains.js		\
+	panel/StatusView.js		\
 	window/Edit.js			\
 	window/PasswordEdit.js		\
 	window/SafeDestroy.js		\
@@ -51,7 +66,13 @@ JSSRC=					\
 	window/LanguageEdit.js		\
 	window/DiskSmart.js		\
 	window/ZFSDetail.js		\
+	window/Certificates.js		\
+	window/ACMEAccount.js		\
+	window/ACMEPluginEdit.js	\
+	window/ACMEDomains.js		\
+	window/FileBrowser.js		\
 	node/APT.js			\
+	node/APTRepositories.js		\
 	node/NetworkEdit.js		\
 	node/NetworkView.js		\
 	node/DNSEdit.js			\
@@ -65,18 +86,28 @@ JSSRC=					\
 all: ${SUBDIRS}
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
+.lint-incremental: ${JSSRC}
+	eslint $?
+	touch "$@"
+
 .PHONY: lint
 check: lint
+	eslint --strict api-viewer/APIViewer.js
 lint: ${JSSRC}
-	eslint ${JSSRC}
+	eslint --strict ${JSSRC}
+	touch ".lint-incremental"
 
-proxmoxlib.js: ${JSSRC}
+proxmoxlib.js: .lint-incremental ${JSSRC}
 	# add the version as comment in the file
 	echo "// ${DEB_VERSION_UPSTREAM_REVISION}" > $@.tmp
-	cat ${JSSRC} >> $@.tmp
+	cat ${JSSRC} ${MARKEDJS}  >> $@.tmp
 	mv $@.tmp $@
 
 install: proxmoxlib.js
 	install -d -m 755 ${WWWBASEDIR}
 	install -m 0644 proxmoxlib.js ${WWWBASEDIR}
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+
+.PHONY: clean
+clean:
+	rm -f proxmoxlib.js