diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2012-11-23 17:19:37 +0100 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2013-01-18 15:10:37 +0100 |
commit | c71937fc0c2006c032948c564246822cb7344aa9 (patch) | |
tree | e811b2033874192dfa0b25479f23658d80976480 | |
parent | 5e90c9884977b07be8cd0d4f6377b633f29e4ad1 (diff) | |
download | freeipa.git-c71937fc0c2006c032948c564246822cb7344aa9.tar.gz freeipa.git-c71937fc0c2006c032948c564246822cb7344aa9.tar.xz freeipa.git-c71937fc0c2006c032948c564246822cb7344aa9.zip |
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
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | freeipa.spec.in | 7 | ||||
-rw-r--r-- | install/configure.ac | 5 | ||||
-rw-r--r-- | install/ui/Makefile.am | 45 | ||||
-rw-r--r-- | install/ui/build/Makefile.am | 16 | ||||
-rw-r--r-- | install/ui/build/dojo/Makefile.am | 14 | ||||
-rw-r--r-- | install/ui/build/freeipa/Makefile.am | 17 | ||||
-rw-r--r-- | install/ui/src/Makefile.am | 15 | ||||
-rw-r--r-- | install/ui/src/libs/Makefile.am | 19 |
9 files changed, 98 insertions, 42 deletions
@@ -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 0ce06cc8..41676883 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 05ec8579..27e88beb 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 1dc32160..e3276741 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 00000000..0787e7f2 --- /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 00000000..666a49af --- /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 00000000..4d80bdfe --- /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 00000000..c81f888d --- /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 00000000..20d90854 --- /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 |