From: Jason Stephenson Date: Wed, 29 Jan 2020 14:37:28 +0000 (-0500) Subject: Lp 1850156: Add -git Makefile.install targets X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5ddddd2fd10ad6a60d8694d6be2ba2ffefbcbff1;p=working%2FEvergreen.git Lp 1850156: Add -git Makefile.install targets Add -git Makefile.install targets for Ubuntu and Debian so that one can build Evergreen from Git without needing to install Chromium, Firefox, and all of the dependencies that they bring with them. The -developer target depends on the -git target, so it can still be used as before to install from Git. It brings in the Chromium and Firefox dependencies. The -translator Makefile.install target depends on the -git target. Translators are not required to run tests. The -packager Makefile.install target still depends on the -developer target because packagers are expected to run tests. To test these changes, one pretty much has to set up a virtual machine for each support value of and run each Makefile.install target one at a time to see that the appropriate dependencies are brought in. It is recommended to refresh the VM after each test. Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index e380fd6e90..45616fc6d4 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -100,6 +100,17 @@ postgres-server-ubuntu-focal-10: postgres-server-fedora: @make -f $(DIR)/Makefile.fedora install_postgres_server +ubuntu-bionic-git: + @make -f $(DIR)/Makefile.ubuntu-bionic install_git +ubuntu-xenial-git: + @make -f $(DIR)/Makefile.ubuntu-xenial install_git +debian-buster-git: + @make -f $(DIR)/Makefile.debian-buster install_git +debian-stretch-git: + @make -f $(DIR)/Makefile.debian-stretch install_git +debian-jessie-git: + @make -f $(DIR)/Makefile.debian-jessie install_git + ubuntu-bionic-developer: @make -f $(DIR)/Makefile.ubuntu-bionic install_developer ubuntu-focal-developer: diff --git a/Open-ILS/src/extras/install/Makefile.debian-buster b/Open-ILS/src/extras/install/Makefile.debian-buster index 623e3a6708..12f024347f 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-buster +++ b/Open-ILS/src/extras/install/Makefile.debian-buster @@ -126,11 +126,12 @@ PGSQL_SERVER_DEBS_10 = \ # note: some prereqs are repeated in the developer/packager # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. - -DEVELOPER_DEBS = \ +GIT_DEBS = \ automake \ autoconf \ - libtool \ + libtool + +DEVELOPER_DEBS = \ chromium \ firefox-esr @@ -175,11 +176,14 @@ install_postgres_server_10: # note: if/when grunt-cli is available as a # package, use the packaged version instead. -install_developer: - make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" +install_git: + make -f $(DIR)/Makefile.debian DEBS="$(GIT_DEBS)" make -f $(DIR)/Makefile.common install_nodejs_from_source -install_translator: install_developer +install_developer: intall_git + make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" + +install_translator: install_git make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" install_packager: install_developer install_translator diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie index 545a1a516f..392a8ac95f 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-jessie +++ b/Open-ILS/src/extras/install/Makefile.debian-jessie @@ -128,10 +128,12 @@ PGSQL_SERVER_DEBS_10 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -DEVELOPER_DEBS = \ +GIT_DEBS = \ automake \ autoconf \ - libtool \ + libtool + +DEVELOPER_DEBS = \ chromium \ firefox-esr @@ -176,11 +178,14 @@ install_postgres_server_10: # note: if/when grunt-cli is available as a # package, use the packaged version instead. -install_developer: - make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" +install_git: + make -f $(DIR)/Makefile.debian DEBS="$(GIT_DEBS)" make -f $(DIR)/Makefile.common install_nodejs_from_source -install_translator: install_developer +install_developer: intall_git + make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" + +install_translator: install_git make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" install_packager: install_developer install_translator diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch index 93221e3cf2..2b45bcfdcd 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-stretch +++ b/Open-ILS/src/extras/install/Makefile.debian-stretch @@ -127,10 +127,12 @@ PGSQL_SERVER_DEBS_10 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -DEVELOPER_DEBS = \ +GIT_DEBS = \ automake \ autoconf \ - libtool \ + libtool + +DEVELOPER_DEBS = \ chromium \ firefox-esr @@ -175,11 +177,14 @@ install_postgres_server_10: # note: if/when grunt-cli is available as a # package, use the packaged version instead. -install_developer: - make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" +install_git: + make -f $(DIR)/Makefile.debian DEBS="$(GIT_DEBS)" make -f $(DIR)/Makefile.common install_nodejs_from_source -install_translator: install_developer +install_developer: intall_git + make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" + +install_translator: install_git make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" install_packager: install_developer install_translator diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic index a73428697f..0bb42cd55e 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic @@ -130,10 +130,12 @@ PGSQL_SERVER_DEBS_10 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -DEVELOPER_DEBS = \ +GIT_DEBS = \ automake \ autoconf \ - libtool \ + libtool + +DEVELOPER_DEBS = \ chromium-browser \ firefox @@ -179,11 +181,14 @@ install_postgres_server_10: # note: if/when grunt-cli is available as a # package, use the packaged version instead. -install_developer: - make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" +install_git: + make -f $(DIR)/Makefile.debian DEBS="$(GIT_DEBS)" make -f $(DIR)/Makefile.common install_nodejs_from_source -install_translator: install_developer +install_developer: intall_git + make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" + +install_translator: install_git make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" install_packager: install_developer install_translator diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-focal b/Open-ILS/src/extras/install/Makefile.ubuntu-focal index b00204281c..6c56fb9869 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-focal +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-focal @@ -131,10 +131,12 @@ PGSQL_SERVER_DEBS_10 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -DEVELOPER_DEBS = \ +GIT_DEBS = \ automake \ autoconf \ - libtool \ + libtool + +DEVELOPER_DEBS = \ chromium-browser \ firefox @@ -180,11 +182,14 @@ install_postgres_server_10: # note: if/when grunt-cli is available as a # package, use the packaged version instead. -install_developer: - make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" +install_git: + make -f $(DIR)/Makefile.debian DEBS="$(GIT_DEBS)" make -f $(DIR)/Makefile.common install_nodejs_from_source -install_translator: install_developer +install_developer: intall_git + make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" + +install_translator: install_git make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" install_packager: install_developer install_translator diff --git a/docs/modules/installation/pages/server_installation.adoc b/docs/modules/installation/pages/server_installation.adoc index 694dc0663d..ffad8f55ed 100644 --- a/docs/modules/installation/pages/server_installation.adoc +++ b/docs/modules/installation/pages/server_installation.adoc @@ -82,16 +82,23 @@ 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: + * To install packages needed for retrieving and managing web dependencies, - use the -developer Makefile.install target. Currently, + use the -git Makefile.install target. Currently, this is only needed for building and installing the web staff client. + [source, bash] ------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install -git +------------------------------------------------------------------------------ ++ + * To install packages needed for testing the Angular web client components, + use the -developer Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ make -f Open-ILS/src/extras/Makefile.install -developer ------------------------------------------------------------------------------ +