From 441acf7797b2069e8d9a123aa11bb33fd42d9187 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Tue, 1 Nov 2016 17:07:22 +0100 Subject: 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 Reviewed-By: Christian Heimes --- install/ui/Makefile.am | 6 + install/ui/build/freeipa/Makefile.am | 2 +- install/ui/css/Makefile.am | 4 +- install/ui/src/Makefile.am | 5 +- install/ui/src/libs/Makefile.am | 4 +- ...-01-Make-dojo-builder-buildable-by-itself.patch | 169 --------------------- ...ecify-modules-for-which-builder-doesn-t-r.patch | 98 ------------ .../01-Make-dojo-builder-buildable-by-itself.patch | 169 +++++++++++++++++++++ ...Allow-to-specify-modules-which-dont-raise.patch | 98 ++++++++++++ ipatests/Makefile.am | 2 + 10 files changed, 286 insertions(+), 271 deletions(-) delete mode 100644 install/ui/util/build/patches/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch delete mode 100644 install/ui/util/build/patches/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch create mode 100644 install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch create mode 100644 install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch 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/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch deleted file mode 100644 index 69160cd86..000000000 --- a/install/ui/util/build/patches/001-dojo-build-pvoborni-01-Make-dojo-builder-buildable-by-itself.patch +++ /dev/null @@ -1,169 +0,0 @@ -From c0962cfb520d25c367689243b71e43af1dcc0601 Mon Sep 17 00:00:00 2001 -From: Petr Vobornik -Date: Thu, 8 Nov 2012 13:22:30 +0100 -Subject: [PATCH] Make dojo builder buildable by itself - -Dojo builder is now buildable by itself. It just needed a packackage information, -profile and separating of internal definition of commanLineArgs module to separate -file. - -It allows to use a builder as a single file in rhino with only one dependency -(_base/configRhino) copied from dojo/dojo. We would need an additional patch to -get rid of this dependency. ---- - build/argv.js | 2 +- - build/build.profile.js | 32 ++++++++++++++++++++++++++++++++ - build/commandLineArgs.js | 7 +++++++ - build/main.js | 26 ++++++++++---------------- - build/package.json | 23 +++++++++++++++++++++++ - 5 files changed, 73 insertions(+), 17 deletions(-) - create mode 100644 build/build.profile.js - create mode 100644 build/commandLineArgs.js - create mode 100644 build/package.json - -diff --git a/build/argv.js b/build/argv.js -index 18bda74b0eb80e37d9c83cb23a10f29f8ffe91d9..997576687eb74cbb6a6a293b3a855a6d15142368 100644 ---- a/build/argv.js -+++ b/build/argv.js -@@ -5,7 +5,7 @@ define([ - "./fs", - "./fileUtils", - "./process", -- "commandLineArgs", -+ "./commandLineArgs", - "./stringify", - "./version", - "./messages", -diff --git a/build/build.profile.js b/build/build.profile.js -new file mode 100644 -index 0000000000000000000000000000000000000000..507728c283c5703106fe029c0fd282cb864c994d ---- /dev/null -+++ b/build/build.profile.js -@@ -0,0 +1,32 @@ -+// -+// Dojo builder profile file -+// -+ -+ -+var profile = (function(){ -+ -+ var examples = /^build\/examples\//; -+ var ignore = { -+ 'build/transforms/dojoBoot':1, -+ 'build/optimizeRunner':1 -+ }; -+ -+ return { -+ resourceTags: { -+ -+ // all JavaScript files are AMD modules -+ amd: function(filename, mid) { -+ var amd = (!examples.test(mid) && -+ !(mid in ignore) && -+ /\.js$/.test(filename)); -+ //if (amd)print("'"+mid+"',"); -+ return amd; -+ }, -+ miniExclude: function(filename, mid) { -+ return (examples.test(mid) || -+ !/\.js$/.test(filename) || -+ (mid in ignore)); -+ } -+ } -+ }; -+})(); -\ No newline at end of file -diff --git a/build/commandLineArgs.js b/build/commandLineArgs.js -new file mode 100644 -index 0000000000000000000000000000000000000000..41df62e31a05ef2c00e1eb609c0fabe8641e2d03 ---- /dev/null -+++ b/build/commandLineArgs.js -@@ -0,0 +1,7 @@ -+ -+define([], function(){ -+ -+ var args = []; -+ -+ return args; -+}); -\ No newline at end of file -diff --git a/build/main.js b/build/main.js -index eeb329c91c0eb4df94178cdfc445e5235409401a..89ad7a9d639257ec99ca86be59abdb74d54939a3 100644 ---- a/build/main.js -+++ b/build/main.js -@@ -33,16 +33,14 @@ - // github: https://github.com/altoviso/bdBuild - // docs: http://bdframework.org/bdBuild/docs - --define(["require", "dojo/has"], function(require, has){ -+define(["require", "dojo/has", "./commandLineArgs"], function(require, has, commandLineArgs){ - - // host-dependent environment initialization - if(has("host-node")){ -- define("commandLineArgs", function(){ -- //arg[0] is node; argv[1] is dojo.js; therefore, start with argv[2] -- return process.argv.slice(2); -- }); -+ //arg[0] is node; argv[1] is dojo.js; therefore, start with argv[2] -+ commandLineArgs.push(process.argv.slice(2)); - -- // helps during dev or heavily async node... -+ // helps during dev or heavily async node - var util = require.nodeRequire("util"); - debug = function(it, depth, inspect){ - util.debug(inspect ? util.inspect(it, false, depth) : it); -@@ -50,16 +48,12 @@ define(["require", "dojo/has"], function(require, has){ - - has.add("is-windows", process.platform == "win32"); - }else if(has("host-rhino")){ -- define("commandLineArgs", [], function(){ -- var result = []; -- require.rawConfig.commandLineArgs.forEach(function(item){ -- var parts = item.split("="); -- if(parts[0]!="baseUrl"){ -- result.push(item); -- } -- }); -- return result; -- }); -+ require.rawConfig.commandLineArgs.forEach(function(item){ -+ var parts = item.split("="); -+ if(parts[0]!="baseUrl"){ -+ commandLineArgs.push(item); -+ } -+ }); - // TODO: make this real - has.add("is-windows", /indows/.test(environment["os.name"])); - }else{ -diff --git a/build/package.json b/build/package.json -new file mode 100644 -index 0000000000000000000000000000000000000000..568101cb1a182d3415c73d02e151359e1ce3e27d ---- /dev/null -+++ b/build/package.json -@@ -0,0 +1,23 @@ -+{ -+ "name": "build", -+ "version":"1.8.1", -+ "directories": { -+ "lib": "." -+ }, -+ "main": "main", -+ "description": "Dojo build system.", -+ "licenses": [ -+ { -+ "type": "AFLv2.1", -+ "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L43" -+ }, -+ { -+ "type": "BSD", -+ "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L13" -+ } -+ ], -+ "bugs": "http://bugs.dojotoolkit.org/", -+ "keywords": ["JavaScript", "Dojo", "Toolkit"], -+ "homepage": "http://dojotoolkit.org/", -+ "dojoBuild": "build.profile.js" -+} --- -1.7.11.7 - 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/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch deleted file mode 100644 index dfd57a82e..000000000 --- a/install/ui/util/build/patches/002-dojo-build-pvoborni-02-Allow-to-specify-modules-for-which-builder-doesn-t-r.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 711bfa2bda294cbaf36df28391c8e25361a82d63 Mon Sep 17 00:00:00 2001 -From: Petr Vobornik -Date: Tue, 22 Jan 2013 15:25:00 +0100 -Subject: [PATCH] Allow to specify modules for which builder doesn't raise - dependency error - -One can specify module ids provided by other means (already built layer file) to build profile file in package section providedMids array. Builder than ignores dependency errors for specified modules. This allows to build layers without source codes of their dependencies, with no expected errors raised. - -Example: - -packages:[ - { - name: "packageName", - location: "packageName", - providedMids: [ - 'dojo/_base/declare', - 'dojo/_base/lang', - 'dojo/_base/array', - 'dojo/Stateful' - //etc - ] - } -], ---- - build/buildControl.js | 10 +++++++++- - build/transforms/depsScan.js | 13 +++++++++++-- - 2 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/build/buildControl.js b/build/buildControl.js -index 08fa793a8e21068b9847ab82a45e442e00759323..1198b59e4f754f87409912dfe409cc4205f9b4e5 100644 ---- a/build/buildControl.js -+++ b/build/buildControl.js -@@ -1,5 +1,6 @@ - define([ - "require", -+ "dojo/_base/array", - "dojo/_base/lang", - "./argv", - "./fs", -@@ -10,7 +11,7 @@ define([ - "./process", - "./messages", - "dojo/text!./help.txt" --], function(require, lang, argv, fs, fileUtils, bc, v1xProfiles, stringify, process, messages, helpText){ -+], function(require, array, lang, argv, fs, fileUtils, bc, v1xProfiles, stringify, process, messages, helpText){ - // - // Process the arguments given on the command line to build up a profile object that is used to instruct and control - // the build process. -@@ -291,6 +292,13 @@ define([ - main:pack.destMain || pack.main, - location:computePath(pack.destLocation || ("./" + (pack.destName || packName)), bc.destBasePath) - }; -+ -+ var providedMids = pack.providedMids || []; -+ pack.providedMids = []; -+ array.forEach(providedMids, function(mid) { -+ pack.providedMids[mid] = true; -+ }); -+ - delete pack.destName; - delete pack.destMain; - delete pack.destLocation; -diff --git a/build/transforms/depsScan.js b/build/transforms/depsScan.js -index cd9c098ea5da30a148a82b2ff6cc1eaa593871d2..75186abc3fdce4135c426a6c64863fcd40a6342a 100644 ---- a/build/transforms/depsScan.js -+++ b/build/transforms/depsScan.js -@@ -604,6 +604,11 @@ define([ - aggregateDeps = names.concat(aggregateDeps); - // need to use extractResult[0] since it may delete the dojo.loadInit applications - resource.getText = function(){ return "// wrapped by build app" + newline + "define(" + json.stringify(aggregateDeps) + ", function(" + names.join(",") + "){" + newline + extractResult[0] + newline + "});" + newline; }; -+ }, -+ -+ isProvidedDependency = function(mid, dep) { -+ var packName = mid.split('/')[0]; -+ return bc.packages[packName].providedMids[dep] === true; - }; - - // scan the resource for dependencies -@@ -627,10 +632,14 @@ define([ - }else if(module){ - deps.push(module); - }else{ -- bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep]); -+ if (!isProvidedDependency(resource.mid, dep)) { -+ bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep]); -+ } - } - }catch(e){ -- bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep, "error", e]); -+ if (!isProvidedDependency(resource.mid, dep)) { -+ bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep, "error", e]); -+ } - } - } - }); --- -1.7.11.7 - diff --git a/install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch b/install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch new file mode 100644 index 000000000..69160cd86 --- /dev/null +++ b/install/ui/util/build/patches/01-Make-dojo-builder-buildable-by-itself.patch @@ -0,0 +1,169 @@ +From c0962cfb520d25c367689243b71e43af1dcc0601 Mon Sep 17 00:00:00 2001 +From: Petr Vobornik +Date: Thu, 8 Nov 2012 13:22:30 +0100 +Subject: [PATCH] Make dojo builder buildable by itself + +Dojo builder is now buildable by itself. It just needed a packackage information, +profile and separating of internal definition of commanLineArgs module to separate +file. + +It allows to use a builder as a single file in rhino with only one dependency +(_base/configRhino) copied from dojo/dojo. We would need an additional patch to +get rid of this dependency. +--- + build/argv.js | 2 +- + build/build.profile.js | 32 ++++++++++++++++++++++++++++++++ + build/commandLineArgs.js | 7 +++++++ + build/main.js | 26 ++++++++++---------------- + build/package.json | 23 +++++++++++++++++++++++ + 5 files changed, 73 insertions(+), 17 deletions(-) + create mode 100644 build/build.profile.js + create mode 100644 build/commandLineArgs.js + create mode 100644 build/package.json + +diff --git a/build/argv.js b/build/argv.js +index 18bda74b0eb80e37d9c83cb23a10f29f8ffe91d9..997576687eb74cbb6a6a293b3a855a6d15142368 100644 +--- a/build/argv.js ++++ b/build/argv.js +@@ -5,7 +5,7 @@ define([ + "./fs", + "./fileUtils", + "./process", +- "commandLineArgs", ++ "./commandLineArgs", + "./stringify", + "./version", + "./messages", +diff --git a/build/build.profile.js b/build/build.profile.js +new file mode 100644 +index 0000000000000000000000000000000000000000..507728c283c5703106fe029c0fd282cb864c994d +--- /dev/null ++++ b/build/build.profile.js +@@ -0,0 +1,32 @@ ++// ++// Dojo builder profile file ++// ++ ++ ++var profile = (function(){ ++ ++ var examples = /^build\/examples\//; ++ var ignore = { ++ 'build/transforms/dojoBoot':1, ++ 'build/optimizeRunner':1 ++ }; ++ ++ return { ++ resourceTags: { ++ ++ // all JavaScript files are AMD modules ++ amd: function(filename, mid) { ++ var amd = (!examples.test(mid) && ++ !(mid in ignore) && ++ /\.js$/.test(filename)); ++ //if (amd)print("'"+mid+"',"); ++ return amd; ++ }, ++ miniExclude: function(filename, mid) { ++ return (examples.test(mid) || ++ !/\.js$/.test(filename) || ++ (mid in ignore)); ++ } ++ } ++ }; ++})(); +\ No newline at end of file +diff --git a/build/commandLineArgs.js b/build/commandLineArgs.js +new file mode 100644 +index 0000000000000000000000000000000000000000..41df62e31a05ef2c00e1eb609c0fabe8641e2d03 +--- /dev/null ++++ b/build/commandLineArgs.js +@@ -0,0 +1,7 @@ ++ ++define([], function(){ ++ ++ var args = []; ++ ++ return args; ++}); +\ No newline at end of file +diff --git a/build/main.js b/build/main.js +index eeb329c91c0eb4df94178cdfc445e5235409401a..89ad7a9d639257ec99ca86be59abdb74d54939a3 100644 +--- a/build/main.js ++++ b/build/main.js +@@ -33,16 +33,14 @@ + // github: https://github.com/altoviso/bdBuild + // docs: http://bdframework.org/bdBuild/docs + +-define(["require", "dojo/has"], function(require, has){ ++define(["require", "dojo/has", "./commandLineArgs"], function(require, has, commandLineArgs){ + + // host-dependent environment initialization + if(has("host-node")){ +- define("commandLineArgs", function(){ +- //arg[0] is node; argv[1] is dojo.js; therefore, start with argv[2] +- return process.argv.slice(2); +- }); ++ //arg[0] is node; argv[1] is dojo.js; therefore, start with argv[2] ++ commandLineArgs.push(process.argv.slice(2)); + +- // helps during dev or heavily async node... ++ // helps during dev or heavily async node + var util = require.nodeRequire("util"); + debug = function(it, depth, inspect){ + util.debug(inspect ? util.inspect(it, false, depth) : it); +@@ -50,16 +48,12 @@ define(["require", "dojo/has"], function(require, has){ + + has.add("is-windows", process.platform == "win32"); + }else if(has("host-rhino")){ +- define("commandLineArgs", [], function(){ +- var result = []; +- require.rawConfig.commandLineArgs.forEach(function(item){ +- var parts = item.split("="); +- if(parts[0]!="baseUrl"){ +- result.push(item); +- } +- }); +- return result; +- }); ++ require.rawConfig.commandLineArgs.forEach(function(item){ ++ var parts = item.split("="); ++ if(parts[0]!="baseUrl"){ ++ commandLineArgs.push(item); ++ } ++ }); + // TODO: make this real + has.add("is-windows", /indows/.test(environment["os.name"])); + }else{ +diff --git a/build/package.json b/build/package.json +new file mode 100644 +index 0000000000000000000000000000000000000000..568101cb1a182d3415c73d02e151359e1ce3e27d +--- /dev/null ++++ b/build/package.json +@@ -0,0 +1,23 @@ ++{ ++ "name": "build", ++ "version":"1.8.1", ++ "directories": { ++ "lib": "." ++ }, ++ "main": "main", ++ "description": "Dojo build system.", ++ "licenses": [ ++ { ++ "type": "AFLv2.1", ++ "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L43" ++ }, ++ { ++ "type": "BSD", ++ "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L13" ++ } ++ ], ++ "bugs": "http://bugs.dojotoolkit.org/", ++ "keywords": ["JavaScript", "Dojo", "Toolkit"], ++ "homepage": "http://dojotoolkit.org/", ++ "dojoBuild": "build.profile.js" ++} +-- +1.7.11.7 + diff --git a/install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch b/install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch new file mode 100644 index 000000000..dfd57a82e --- /dev/null +++ b/install/ui/util/build/patches/02-Allow-to-specify-modules-which-dont-raise.patch @@ -0,0 +1,98 @@ +From 711bfa2bda294cbaf36df28391c8e25361a82d63 Mon Sep 17 00:00:00 2001 +From: Petr Vobornik +Date: Tue, 22 Jan 2013 15:25:00 +0100 +Subject: [PATCH] Allow to specify modules for which builder doesn't raise + dependency error + +One can specify module ids provided by other means (already built layer file) to build profile file in package section providedMids array. Builder than ignores dependency errors for specified modules. This allows to build layers without source codes of their dependencies, with no expected errors raised. + +Example: + +packages:[ + { + name: "packageName", + location: "packageName", + providedMids: [ + 'dojo/_base/declare', + 'dojo/_base/lang', + 'dojo/_base/array', + 'dojo/Stateful' + //etc + ] + } +], +--- + build/buildControl.js | 10 +++++++++- + build/transforms/depsScan.js | 13 +++++++++++-- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/build/buildControl.js b/build/buildControl.js +index 08fa793a8e21068b9847ab82a45e442e00759323..1198b59e4f754f87409912dfe409cc4205f9b4e5 100644 +--- a/build/buildControl.js ++++ b/build/buildControl.js +@@ -1,5 +1,6 @@ + define([ + "require", ++ "dojo/_base/array", + "dojo/_base/lang", + "./argv", + "./fs", +@@ -10,7 +11,7 @@ define([ + "./process", + "./messages", + "dojo/text!./help.txt" +-], function(require, lang, argv, fs, fileUtils, bc, v1xProfiles, stringify, process, messages, helpText){ ++], function(require, array, lang, argv, fs, fileUtils, bc, v1xProfiles, stringify, process, messages, helpText){ + // + // Process the arguments given on the command line to build up a profile object that is used to instruct and control + // the build process. +@@ -291,6 +292,13 @@ define([ + main:pack.destMain || pack.main, + location:computePath(pack.destLocation || ("./" + (pack.destName || packName)), bc.destBasePath) + }; ++ ++ var providedMids = pack.providedMids || []; ++ pack.providedMids = []; ++ array.forEach(providedMids, function(mid) { ++ pack.providedMids[mid] = true; ++ }); ++ + delete pack.destName; + delete pack.destMain; + delete pack.destLocation; +diff --git a/build/transforms/depsScan.js b/build/transforms/depsScan.js +index cd9c098ea5da30a148a82b2ff6cc1eaa593871d2..75186abc3fdce4135c426a6c64863fcd40a6342a 100644 +--- a/build/transforms/depsScan.js ++++ b/build/transforms/depsScan.js +@@ -604,6 +604,11 @@ define([ + aggregateDeps = names.concat(aggregateDeps); + // need to use extractResult[0] since it may delete the dojo.loadInit applications + resource.getText = function(){ return "// wrapped by build app" + newline + "define(" + json.stringify(aggregateDeps) + ", function(" + names.join(",") + "){" + newline + extractResult[0] + newline + "});" + newline; }; ++ }, ++ ++ isProvidedDependency = function(mid, dep) { ++ var packName = mid.split('/')[0]; ++ return bc.packages[packName].providedMids[dep] === true; + }; + + // scan the resource for dependencies +@@ -627,10 +632,14 @@ define([ + }else if(module){ + deps.push(module); + }else{ +- bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep]); ++ if (!isProvidedDependency(resource.mid, dep)) { ++ bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep]); ++ } + } + }catch(e){ +- bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep, "error", e]); ++ if (!isProvidedDependency(resource.mid, dep)) { ++ bc.log("amdMissingDependency", ["module", resource.mid, "dependency", dep, "error", e]); ++ } + } + } + }); +-- +1.7.11.7 + 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 -- cgit