From cbed258094a85c9df670e3ec45f6de59d6ebd1a8 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Mon, 16 Aug 2021 13:59:28 -0400 Subject: [PATCH] LP1850156: Remove Browsers From *-developer Targets Because the developer targets are currently necessary for a from-git installation, both Firefox and Chrome are removed and the docs updated to note that you should install one or both if you want to run the tests. Signed-off-by: Jason Boyer Signed-off-by: Jason Stephenson Signed-off-by: Chris Sharp --- Open-ILS/src/extras/install/Makefile.debian-buster | 4 +--- Open-ILS/src/extras/install/Makefile.debian-jessie | 4 +--- Open-ILS/src/extras/install/Makefile.debian-stretch | 4 +--- Open-ILS/src/extras/install/Makefile.ubuntu-bionic | 4 +--- Open-ILS/src/extras/install/Makefile.ubuntu-focal | 4 +--- .../installation/pages/server_installation.adoc | 13 +++++++------ 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.debian-buster b/Open-ILS/src/extras/install/Makefile.debian-buster index 623e3a6708..ad20c9895e 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-buster +++ b/Open-ILS/src/extras/install/Makefile.debian-buster @@ -130,9 +130,7 @@ PGSQL_SERVER_DEBS_10 = \ DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - chromium \ - firefox-esr + libtool PACKAGER_DEBS = \ asciidoc \ diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie index 545a1a516f..703ece0297 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-jessie +++ b/Open-ILS/src/extras/install/Makefile.debian-jessie @@ -131,9 +131,7 @@ PGSQL_SERVER_DEBS_10 = \ DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - chromium \ - firefox-esr + libtool PACKAGER_DEBS = \ asciidoc \ diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch index 93221e3cf2..fb04c2066f 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-stretch +++ b/Open-ILS/src/extras/install/Makefile.debian-stretch @@ -130,9 +130,7 @@ PGSQL_SERVER_DEBS_10 = \ DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - chromium \ - firefox-esr + libtool PACKAGER_DEBS = \ asciidoc \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic index a73428697f..760d20fc6b 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic @@ -133,9 +133,7 @@ PGSQL_SERVER_DEBS_10 = \ DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - chromium-browser \ - firefox + libtool PACKAGER_DEBS = \ asciidoc \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-focal b/Open-ILS/src/extras/install/Makefile.ubuntu-focal index b00204281c..1db9acf794 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-focal +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-focal @@ -134,9 +134,7 @@ PGSQL_SERVER_DEBS_10 = \ DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - chromium-browser \ - firefox + libtool PACKAGER_DEBS = \ asciidoc \ diff --git a/docs/modules/installation/pages/server_installation.adoc b/docs/modules/installation/pages/server_installation.adoc index 694dc0663d..fcb40198ad 100644 --- a/docs/modules/installation/pages/server_installation.adoc +++ b/docs/modules/installation/pages/server_installation.adoc @@ -82,13 +82,14 @@ make -f Open-ILS/src/extras/Makefile.install 3. OPTIONAL: Developer additions + To perform certain developer tasks from a Git source code checkout, -including the testing of the Angular web client components, -additional packages may be required. As the *root* Linux account: +additional packages are required. As the *root* Linux account: + * To install packages needed for retrieving and managing web dependencies, use the -developer Makefile.install target. Currently, this is only needed for building and installing the web staff client. + * To optionally run Angular and AngularJS tests you will need to manually + install Firefox and your choice of Chromium or Chrome. + [source, bash] ------------------------------------------------------------------------------ @@ -141,11 +142,11 @@ npm install # fetch JS dependencies + [source,sh] ------------------------------------------------------------------------------ -# build, concat+minify npm run build-prod ------------------------------------------------------------------------------ + -4. OPTIONAL: Test web client code if the -developer packages were installed. +4. OPTIONAL: Test web client code if the -developer packages and + the necessary browsers are installed. CHROME_BIN should be set to the path to chrome or chromimum, e.g., `/usr/bin/chromium`: + @@ -177,11 +178,11 @@ npm install # fetch JS dependencies + [source,sh] ------------------------------------------------------------------------------ -# build and run tests ng build --prod ------------------------------------------------------------------------------ + -4. OPTIONAL: Test eg2 web client code if the -developer packages were installed: +4. OPTIONAL: Test eg2 web client code if the -developer packages and + the necessary browsers are installed: CHROME_BIN should be set to the path to chrome or chromimum, e.g., `/usr/bin/chromium`: + -- 2.43.2