diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-01 17:07:22 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
| commit | 441acf7797b2069e8d9a123aa11bb33fd42d9187 (patch) | |
| tree | dbc07d69dd4707a7af1b632bef9a5328937bf45f | |
| parent | f95098b2b645a62497dc6e1d66be2b7397567d25 (diff) | |
| download | freeipa-441acf7797b2069e8d9a123aa11bb33fd42d9187.tar.gz freeipa-441acf7797b2069e8d9a123aa11bb33fd42d9187.tar.xz freeipa-441acf7797b2069e8d9a123aa11bb33fd42d9187.zip | |
Build: fix distribution of static files for web UI
Static files from Git which are not touched by the build system
have to be explicitly listed in Makefile.am so they get into tarball.
EXTRA_DIST lists whole sub-directories with static files.
This is not ideal but we do not have enough time to fix it properly.
Dojo builder patch files were renames to shorten their name.
The original names were exceeding autotools length limit.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
| -rw-r--r-- | install/ui/Makefile.am | 6 | ||||
| -rw-r--r-- | install/ui/build/freeipa/Makefile.am | 2 | ||||
| -rw-r--r-- | install/ui/css/Makefile.am | 4 | ||||
| -rw-r--r-- | install/ui/src/Makefile.am | 5 | ||||
| -rw-r--r-- | install/ui/src/libs/Makefile.am | 4 | ||||
| -rw-r--r-- | install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch (renamed from install/ui/util/build/patches/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch) | 0 | ||||
| -rw-r--r-- | install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch (renamed from install/ui/util/build/patches/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch) | 0 | ||||
| -rw-r--r-- | ipatests/Makefile.am | 2 |
8 files changed, 19 insertions, 4 deletions
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 9e4867113..18fb9b40b 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -21,6 +21,12 @@ app_DATA = \ $(NULL) EXTRA_DIST = \ + doc \ + jsl.conf \ + less \ + README-LICENSE.txt \ + test \ + util \ $(app_DATA) \ $(NULL) diff --git a/install/ui/build/freeipa/Makefile.am b/install/ui/build/freeipa/Makefile.am index 932023ac5..0daaf1073 100644 --- a/install/ui/build/freeipa/Makefile.am +++ b/install/ui/build/freeipa/Makefile.am @@ -1,7 +1,7 @@ NULL = appdir = $(IPA_DATA_DIR)/ui/js/freeipa -app_DATA = \ +nodist_app_DATA = \ app.js \ core.js \ $(NULL) diff --git a/install/ui/css/Makefile.am b/install/ui/css/Makefile.am index 64cb3fc89..2562286bf 100644 --- a/install/ui/css/Makefile.am +++ b/install/ui/css/Makefile.am @@ -4,9 +4,11 @@ appdir = $(IPA_DATA_DIR)/ui/css app_DATA = \ bootstrap-datepicker3.min.css \ patternfly.css \ - ipa.css \ $(NULL) +nodist_app_DATA = \ + ipa.css + EXTRA_DIST = \ $(app_DATA) \ $(NULL) diff --git a/install/ui/src/Makefile.am b/install/ui/src/Makefile.am index c81f888d2..4c70ba113 100644 --- a/install/ui/src/Makefile.am +++ b/install/ui/src/Makefile.am @@ -7,7 +7,10 @@ SUBDIRS = \ $(NULL) EXTRA_DIST = \ - $(NULL) + build.profile.js \ + dojo.profile.js \ + freeipa \ + webui.profile.js MAINTAINERCLEANFILES = \ *~ \ diff --git a/install/ui/src/libs/Makefile.am b/install/ui/src/libs/Makefile.am index f3e230c38..1962c41eb 100644 --- a/install/ui/src/libs/Makefile.am +++ b/install/ui/src/libs/Makefile.am @@ -9,11 +9,13 @@ app_DATA = \ jquery.js \ jquery.ordered-map.js \ json2.js \ - loader.js \ patternfly.js \ qrcode.js \ $(NULL) +nodist_app_DATA = \ + loader.js + EXTRA_DIST = \ $(app_DATA) \ $(NULL) diff --git a/install/ui/util/build/patches/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch b/install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch index 69160cd86..69160cd86 100644 --- a/install/ui/util/build/patches/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch +++ b/install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch diff --git a/install/ui/util/build/patches/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch b/install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch index dfd57a82e..dfd57a82e 100644 --- a/install/ui/util/build/patches/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch +++ b/install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch diff --git a/ipatests/Makefile.am b/ipatests/Makefile.am index 4f3bca221..b5b467afd 100644 --- a/ipatests/Makefile.am +++ b/ipatests/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = man +EXTRA_DIST = test_webui/README + include $(top_srcdir)/Makefile.python.am |