On 08/02/2016 05:31 PM, Pavel Vomacka wrote:

On 08/02/2016 05:27 PM, Martin Basti wrote:

On 02.08.2016 17:12, Rob Crittenden wrote:
Pavel Vomacka wrote:

please review attached patches which Split make lint to more targets and
add jslint

What's the driver to split the checks out into separate targets?

It is called several times during build (makes build slower), and you cannot run `make clean` in case you have wrong API.txt, because it will explode
Yes, definitely.
So I removed moving the aci and api checks and just add jslint.

You are moving the makeapi and makeaci from version-update to lint. They were in version-update for a reason: downstream builds do not call lint. Downstream may patch code. API cannot break.
Can we update downstream spec then?

No ticket?
Pavel please file tickets.

Yes, I will file tickets for these changes.
Also ticket is now filed:




Pavel^3 Vomacka

From 5d993beeafb2283160dae4d86ed296e882bed920 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Tue, 2 Aug 2016 17:57:24 +0200
Subject: [PATCH] Add jslint into Makefile

Also put jsl into dependencies.

The patch also split lint target into more smaller targets.
The purpose of this change is to add possibility to run only
fast jslint by using make jslint and don't waste time with pylint,
which can take a lot of time.

 Makefile        | 8 +++++++-
 freeipa.spec.in | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d84927838cec9b8cf56cf2404c59f68808bce65f..6324308602a4bb7a3a79a8f09b0994482e0f8eef 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,7 @@ client-dirs:
 		echo "Without those directories ipa-client-install will fail" ; \
-lint: bootstrap-autogen
+pylint: bootstrap-autogen
 	# find all python modules and executable python files outside modules for pylint check
 	FILES=`find . \
 		-type d -exec test -e '{}/__init__.py' \; -print -prune -o \
@@ -146,8 +146,14 @@ lint: bootstrap-autogen
 		-type f -exec grep -qsm1 '^#!.*\bpython' '{}' \; -print`; \
 	echo "Pylint is running, please wait ..."; \
 	PYTHONPATH=. pylint --rcfile=pylintrc $(PYLINTFLAGS) $$FILES || $(LINT_IGNORE_FAIL)
 	$(MAKE) -C install/po validate-src-strings || $(LINT_IGNORE_FAIL)
+	cd install/ui; jsl -nologo -nosummary -nofilelisting -conf jsl.conf || $(LINT_IGNORE_FAIL)
+lint: pylint po-validate jslint
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 135e9c980011c6c2730c6c29a3c22098e48270d5..7fdea0d3133e99d581b05b6692637b3ec8ad1caf 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -87,6 +87,7 @@ BuildRequires:  python-dns >= 1.11.1
 BuildRequires:  libsss_idmap-devel
 BuildRequires:  libsss_nss_idmap-devel >= 1.14.0
 BuildRequires:  java-headless
+BuildRequires:  jsl
 BuildRequires:  rhino
 BuildRequires:  libverto-devel
 BuildRequires:  systemd

Manage your subscription for the Freeipa-devel mailing list:
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to