From c71937fc0c2006c032948c564246822cb7344aa9 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Fri, 23 Nov 2012 17:19:37 +0100 Subject: Updated makefiles to build FreeIPA Web UI layer Updated makefiles to comply to new directory structure and also to use builder for building Web UI. FreeIPA package spec is modified to use the output of the builder. https://fedorahosted.org/freeipa/ticket/112 --- Makefile | 2 +- freeipa.spec.in | 7 ++++++ install/configure.ac | 5 ++++ install/ui/Makefile.am | 45 ++++-------------------------------- install/ui/build/Makefile.am | 16 +++++++++++++ install/ui/build/dojo/Makefile.am | 14 +++++++++++ install/ui/build/freeipa/Makefile.am | 17 ++++++++++++++ install/ui/src/Makefile.am | 15 ++++++++++++ install/ui/src/libs/Makefile.am | 19 +++++++++++++++ 9 files changed, 98 insertions(+), 42 deletions(-) create mode 100644 install/ui/build/Makefile.am create mode 100644 install/ui/build/dojo/Makefile.am create mode 100644 install/ui/build/freeipa/Makefile.am create mode 100644 install/ui/src/Makefile.am create mode 100644 install/ui/src/libs/Makefile.am diff --git a/Makefile b/Makefile index 63672b23a..903496967 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ archive: local-archive: -mkdir -p dist/$(TARBALL_PREFIX) - rsync -a --exclude=dist --exclude=.git --exclude=build --exclude=rpmbuild . dist/$(TARBALL_PREFIX) + rsync -a --exclude=dist --exclude=.git --exclude=/build --exclude=rpmbuild . dist/$(TARBALL_PREFIX) archive-cleanup: rm -fr dist/freeipa diff --git a/freeipa.spec.in b/freeipa.spec.in index 0ce06cc89..416768833 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -70,6 +70,7 @@ BuildRequires: python-dns BuildRequires: m2crypto BuildRequires: check BuildRequires: libsss_idmap-devel +BuildRequires: rhino >= 1.7R3 %description IPA is an integrated solution to provide centrally managed Identity (machine, @@ -622,6 +623,12 @@ fi %{_usr}/share/ipa/ui/*.woff %dir %{_usr}/share/ipa/ui/ext %config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js +%dir %{_usr}/share/ipa/ui/js/dojo +%{_usr}/share/ipa/ui/js/dojo/dojo.js +%dir %{_usr}/share/ipa/ui/js/libs +%{_usr}/share/ipa/ui/js/libs/*.js +%dir %{_usr}/share/ipa/ui/js/freeipa +%{_usr}/share/ipa/ui/js/freeipa/app.js %dir %{_usr}/share/ipa/ui/images %{_usr}/share/ipa/ui/images/*.png %{_usr}/share/ipa/ui/images/*.gif diff --git a/install/configure.ac b/install/configure.ac index 05ec85799..27e88beb4 100644 --- a/install/configure.ac +++ b/install/configure.ac @@ -87,7 +87,12 @@ AC_CONFIG_FILES([ share/Makefile ui/Makefile ui/ext/Makefile + ui/src/Makefile + ui/src/libs/Makefile ui/images/Makefile + ui/build/Makefile + ui/build/dojo/Makefile + ui/build/freeipa/Makefile tools/Makefile tools/man/Makefile updates/Makefile diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 1dc321602..e3276741f 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -3,48 +3,23 @@ AUTOMAKE_OPTIONS = 1.7 NULL = SUBDIRS = \ + build \ ext \ images \ + src \ $(NULL) appdir = $(IPA_DATA_DIR)/ui app_DATA = \ - aci.js \ - add.js \ - association.js \ - automember.js \ - automount.js \ - browser.js \ - certificate.js \ - details.js \ - dialog.js \ - dns.js \ - entitle.js \ - entity.js \ - facet.js \ + config.js \ favicon.ico \ - field.js \ - group.js \ - hbac.js \ - hbactest.js \ - host.js \ - hostgroup.js \ index.html \ + jquery-ui.css \ ie.css \ ipa.css \ - ipa.js \ - jquery-ui.css \ - jquery-ui.js \ - jquery.ba-bbq.js \ - jquery.js \ - jquery.ordered-map.js \ - json2.js \ login.html \ login.js \ logout.html \ - navigation.js \ - net.js \ - netgroup.js \ overpass_bold-web.eot \ overpass_bold-web.svg \ overpass_bold-web.ttf \ @@ -53,20 +28,8 @@ app_DATA = \ overpass_regular-web.svg \ overpass_regular-web.ttf \ overpass_regular-web.woff \ - policy.js \ - idrange.js \ reset_password.js \ reset_password.html \ - rule.js \ - search.js \ - selinux.js \ - serverconfig.js \ - service.js \ - sudo.js \ - trust.js \ - user.js \ - webui.js \ - widget.js \ $(NULL) EXTRA_DIST = \ diff --git a/install/ui/build/Makefile.am b/install/ui/build/Makefile.am new file mode 100644 index 000000000..0787e7f24 --- /dev/null +++ b/install/ui/build/Makefile.am @@ -0,0 +1,16 @@ +AUTOMAKE_OPTIONS = 1.7 + +NULL = + +SUBDIRS = \ + dojo \ + freeipa \ + $(NULL) + +EXTRA_DIST = \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in + $(NULL) diff --git a/install/ui/build/dojo/Makefile.am b/install/ui/build/dojo/Makefile.am new file mode 100644 index 000000000..666a49af5 --- /dev/null +++ b/install/ui/build/dojo/Makefile.am @@ -0,0 +1,14 @@ +NULL = + +appdir = $(IPA_DATA_DIR)/ui/js/dojo +app_DATA = \ + dojo.js \ + $(NULL) + +EXTRA_DIST = \ + $(app_DATA) \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am new file mode 100644 index 000000000..4d80bdfe6 --- /dev/null +++ b/install/ui/build/freeipa/Makefile.am @@ -0,0 +1,17 @@ +NULL = + +appdir = $(IPA_DATA_DIR)/ui/js/freeipa +app_DATA = \ + app.js \ + $(NULL) + +EXTRA_DIST = \ + $(app_DATA) \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in + +app.js: + ../../util/make-ui.sh diff --git a/install/ui/src/Makefile.am b/install/ui/src/Makefile.am new file mode 100644 index 000000000..c81f888d2 --- /dev/null +++ b/install/ui/src/Makefile.am @@ -0,0 +1,15 @@ +AUTOMAKE_OPTIONS = 1.7 + +NULL = + +SUBDIRS = \ + libs \ + $(NULL) + +EXTRA_DIST = \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in + $(NULL) diff --git a/install/ui/src/libs/Makefile.am b/install/ui/src/libs/Makefile.am new file mode 100644 index 000000000..20d908544 --- /dev/null +++ b/install/ui/src/libs/Makefile.am @@ -0,0 +1,19 @@ +NULL = + +appdir = $(IPA_DATA_DIR)/ui/js/libs +app_DATA = \ + browser.js \ + jquery.ba-bbq.js \ + jquery.js \ + jquery.ordered-map.js \ + jquery-ui.js \ + json2.js \ + $(NULL) + +EXTRA_DIST = \ + $(app_DATA) \ + $(NULL) + +MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in -- cgit