From 17c3c6876ec02db6d338dfaaea4520adc455c290 Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Thu, 21 Mar 2019 11:46:23 -0400 Subject: [PATCH 01/10] Added copying uninstall scripts to the install staging directory (#303) --- earth_enterprise/SConstruct | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/earth_enterprise/SConstruct b/earth_enterprise/SConstruct index d15ced170d..80442eb989 100644 --- a/earth_enterprise/SConstruct +++ b/earth_enterprise/SConstruct @@ -169,6 +169,10 @@ stage_bin = env.PhonyTargets(**stage_bin_cmds) stage_data = env.Alias('stage_data', installdirs['root']) env.Depends(stage_data, stage_bin) +# Copy the uninstall scripts to the install staging directory +uninstall_fusion = env.copyfile(installdirs['fusion_root'], './src/installer/uninstall_fusion.sh') +uninstall_server = env.copyfile(installdirs['server_root'], './src/installer/uninstall_server.sh') + # Copy the tutorial to the install staging directory if it exists. stage_tutorial_cmds = {'stage_tutorial': [ 'cd tutorial; if [ -d FusionTutorial ]; then scons -j%d installdir="%s"; else echo "Skipping tutorial; no tutorial files found."; fi' % (num_jobs, installdir) From 175c6524d4bb51b8343cf3e7ca77167aa0e5c71f Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Thu, 21 Mar 2019 15:22:32 -0400 Subject: [PATCH 02/10] Fixed bug causing SCons to have an InternalError (#303) --- earth_enterprise/SConstruct | 4 ++-- earth_enterprise/src/scons/khEnvironment.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/earth_enterprise/SConstruct b/earth_enterprise/SConstruct index 80442eb989..8fef87fddc 100644 --- a/earth_enterprise/SConstruct +++ b/earth_enterprise/SConstruct @@ -170,8 +170,8 @@ stage_data = env.Alias('stage_data', installdirs['root']) env.Depends(stage_data, stage_bin) # Copy the uninstall scripts to the install staging directory -uninstall_fusion = env.copyfile(installdirs['fusion_root'], './src/installer/uninstall_fusion.sh') -uninstall_server = env.copyfile(installdirs['server_root'], './src/installer/uninstall_server.sh') +env.copyfile(installdirs['fusion_root'], './src/installer/uninstall_fusion.sh') +env.copyfile(installdirs['server_root'], './src/installer/uninstall_server.sh') # Copy the tutorial to the install staging directory if it exists. stage_tutorial_cmds = {'stage_tutorial': [ diff --git a/earth_enterprise/src/scons/khEnvironment.py b/earth_enterprise/src/scons/khEnvironment.py index 90a00bad7c..15f25b6654 100755 --- a/earth_enterprise/src/scons/khEnvironment.py +++ b/earth_enterprise/src/scons/khEnvironment.py @@ -550,7 +550,7 @@ def alias(self, target, source=None): # Re-call all the target builders to add the sources to each target. result = [] for t in tlist: - bld = t.get_builder() or my_alias_builder + bld = t.get_builder() if t.has_builder() else my_alias_builder result.extend(bld(self, t, source)) return result From 62a4eb9c7604e82624b6e34a8effbfa7efc97676 Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Thu, 21 Mar 2019 16:15:32 -0400 Subject: [PATCH 03/10] Changed the temp staging area subdirectory for storing the uninstall scripts along with also copying over their dependency (#303) --- earth_enterprise/SConstruct | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/earth_enterprise/SConstruct b/earth_enterprise/SConstruct index 8fef87fddc..01f0726adb 100644 --- a/earth_enterprise/SConstruct +++ b/earth_enterprise/SConstruct @@ -170,8 +170,9 @@ stage_data = env.Alias('stage_data', installdirs['root']) env.Depends(stage_data, stage_bin) # Copy the uninstall scripts to the install staging directory -env.copyfile(installdirs['fusion_root'], './src/installer/uninstall_fusion.sh') -env.copyfile(installdirs['server_root'], './src/installer/uninstall_server.sh') +env.copyfile(inst_common_dir('.'), './src/installer/uninstall_fusion.sh') +env.copyfile(inst_common_dir('.'), './src/installer/uninstall_server.sh') +env.copyfile(inst_common_dir('.'), './src/installer/common.sh') # Copy the tutorial to the install staging directory if it exists. stage_tutorial_cmds = {'stage_tutorial': [ From a9813bc59b5952f19ef84e317e8f644d6225a31b Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Thu, 21 Mar 2019 16:47:01 -0400 Subject: [PATCH 04/10] Added the uninstall scripts being copied from the staging area to the install directory (#303) --- earth_enterprise/src/installer/install_fusion.sh | 6 ++++-- earth_enterprise/src/installer/install_server.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/earth_enterprise/src/installer/install_fusion.sh b/earth_enterprise/src/installer/install_fusion.sh index 2ae7f88e1a..6d0bc23d68 100755 --- a/earth_enterprise/src/installer/install_fusion.sh +++ b/earth_enterprise/src/installer/install_fusion.sh @@ -658,8 +658,10 @@ copy_files_to_target() cp -f $TMPOPENLDAPPATH/ldap.conf.default $BASEINSTALLDIR_ETC/openldap if [ $? -ne 0 ]; then error_on_copy=1; fi - # TODO: final step: copy uninstall script - # cp -f $TMPOPENLDAPPATH/<........> $INSTALL_LOG_DIR + cp -f $TMPINSTALLDIR/common/opt/google/uninstall_fusion.sh $INSTALL_LOG_DIR + if [ $? -ne 0 ]; then error_on_copy=1; fi + cp -f $TMPINSTALLDIR/common/opt/google/common.sh $INSTALL_LOG_DIR + if [ $? -ne 0 ]; then error_on_copy=1; fi if [ $error_on_copy -ne 0 ] then diff --git a/earth_enterprise/src/installer/install_server.sh b/earth_enterprise/src/installer/install_server.sh index 9d9e27619e..dac7500530 100755 --- a/earth_enterprise/src/installer/install_server.sh +++ b/earth_enterprise/src/installer/install_server.sh @@ -516,8 +516,10 @@ copy_files_to_target() cp -f "$TMPOPENLDAPPATH/ldap.conf.default" "$BASEINSTALLDIR_ETC/openldap" if [ $? -ne 0 ]; then error_on_copy=1; fi - # TODO: final step: copy uninstall script - # cp -f $TMPOPENLDAPPATH/<........> $INSTALL_LOG_DIR + cp -f $TMPINSTALLDIR/common/opt/google/uninstall_server.sh $INSTALL_LOG_DIR + if [ $? -ne 0 ]; then error_on_copy=1; fi + cp -f $TMPINSTALLDIR/common/opt/google/common.sh $INSTALL_LOG_DIR + if [ $? -ne 0 ]; then error_on_copy=1; fi if [ "$error_on_copy" -ne 0 ] then From b42affe05d5faba36ad527f0e013b842febc49ea Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Thu, 21 Mar 2019 18:20:03 -0400 Subject: [PATCH 05/10] Modified documentation to also reference the ability to uninstall from the installation directory (#303) --- docs/geedocs/5.3.0/answer/3499964.html | 5 ++--- docs/geedocs/5.3.0/answer/4492617.html | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/geedocs/5.3.0/answer/3499964.html b/docs/geedocs/5.3.0/answer/3499964.html index 88a7eab6bb..906636940a 100644 --- a/docs/geedocs/5.3.0/answer/3499964.html +++ b/docs/geedocs/5.3.0/answer/3499964.html @@ -23,8 +23,7 @@

Uninstalling

  • Stop the Google Earth Enterprise Server, if you have a previous version installed and it is running:

    /etc/init.d/geserver stop

    • -
  • Navigate to the location at which you initially cloned the GEE git repo.
    • -
  • Within the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer -and run the script uninstall_server.sh.
    • +
  • Navigate to the location at which you initially cloned the GEE git repo or to the installation location (/opt/google).
    • +
  • If you're uninstalling from the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer. If you're uninstalling from the installation location, navigate to install. Now run the script uninstall_server.sh.

    • Back to top

    ©2015 Google

    diff --git a/docs/geedocs/5.3.0/answer/4492617.html b/docs/geedocs/5.3.0/answer/4492617.html index c91a90ffb8..234c933033 100644 --- a/docs/geedocs/5.3.0/answer/4492617.html +++ b/docs/geedocs/5.3.0/answer/4492617.html @@ -31,9 +31,8 @@

    Uninstalling

    /etc/init.d/geserver stop

    -
  • Navigate to the location at which you initially cloned the GEE git repo.
    • -
  • Within the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer -and run the uninstall_fusion.sh and uninstall_server.sh scripts.
    • +
  • Navigate to the location at which you initially cloned the GEE git repo or to the installation location (/opt/google).
    • +
  • If you're uninstalling from the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer. If you're uninstalling from the installation location, navigate to install. Now run the uninstall_fusion.sh and uninstall_server.sh scripts.

    • Back to top

    From 034c8450b37281ae99af26ade78bf0e250bb7a01 Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Thu, 21 Mar 2019 18:44:34 -0400 Subject: [PATCH 06/10] Added version.txt to the set of files that need to be copied over on install so as to allow the uninstall scripts to state the version of the product (#303) --- earth_enterprise/SConstruct | 1 + earth_enterprise/src/installer/install_fusion.sh | 2 ++ earth_enterprise/src/installer/install_server.sh | 2 ++ 3 files changed, 5 insertions(+) diff --git a/earth_enterprise/SConstruct b/earth_enterprise/SConstruct index 01f0726adb..3f36bfb6fc 100644 --- a/earth_enterprise/SConstruct +++ b/earth_enterprise/SConstruct @@ -173,6 +173,7 @@ env.Depends(stage_data, stage_bin) env.copyfile(inst_common_dir('.'), './src/installer/uninstall_fusion.sh') env.copyfile(inst_common_dir('.'), './src/installer/uninstall_server.sh') env.copyfile(inst_common_dir('.'), './src/installer/common.sh') +env.copyfile(inst_common_dir('.'), './src/version.txt') # Copy the tutorial to the install staging directory if it exists. stage_tutorial_cmds = {'stage_tutorial': [ diff --git a/earth_enterprise/src/installer/install_fusion.sh b/earth_enterprise/src/installer/install_fusion.sh index 6d0bc23d68..69069b2368 100755 --- a/earth_enterprise/src/installer/install_fusion.sh +++ b/earth_enterprise/src/installer/install_fusion.sh @@ -662,6 +662,8 @@ copy_files_to_target() if [ $? -ne 0 ]; then error_on_copy=1; fi cp -f $TMPINSTALLDIR/common/opt/google/common.sh $INSTALL_LOG_DIR if [ $? -ne 0 ]; then error_on_copy=1; fi + cp -f $TMPINSTALLDIR/common/opt/google/version.txt $BASEINSTALLDIR_OPT + if [ $? -ne 0 ]; then error_on_copy=1; fi if [ $error_on_copy -ne 0 ] then diff --git a/earth_enterprise/src/installer/install_server.sh b/earth_enterprise/src/installer/install_server.sh index dac7500530..45f64751cf 100755 --- a/earth_enterprise/src/installer/install_server.sh +++ b/earth_enterprise/src/installer/install_server.sh @@ -520,6 +520,8 @@ copy_files_to_target() if [ $? -ne 0 ]; then error_on_copy=1; fi cp -f $TMPINSTALLDIR/common/opt/google/common.sh $INSTALL_LOG_DIR if [ $? -ne 0 ]; then error_on_copy=1; fi + cp -f $TMPINSTALLDIR/common/opt/google/version.txt $BASEINSTALLDIR_OPT + if [ $? -ne 0 ]; then error_on_copy=1; fi if [ "$error_on_copy" -ne 0 ] then From 9015ef998b4c6175c038aa69df7b34fbea2f5d5d Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Mon, 25 Mar 2019 00:04:52 -0400 Subject: [PATCH 07/10] Updated release documentation and copyright notices (#303) --- docs/geedocs/5.3.0/answer/3499964.html | 2 +- docs/geedocs/5.3.0/answer/4492617.html | 2 +- docs/geedocs/5.3.0/answer/7160007.html | 1 + earth_enterprise/SConstruct | 1 + earth_enterprise/src/installer/install_server.sh | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/geedocs/5.3.0/answer/3499964.html b/docs/geedocs/5.3.0/answer/3499964.html index 906636940a..8e57acf3a1 100644 --- a/docs/geedocs/5.3.0/answer/3499964.html +++ b/docs/geedocs/5.3.0/answer/3499964.html @@ -25,5 +25,5 @@

    Uninstalling

  • Navigate to the location at which you initially cloned the GEE git repo or to the installation location (/opt/google).
  • If you're uninstalling from the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer. If you're uninstalling from the installation location, navigate to install. Now run the script uninstall_server.sh.
    • -

    Back to top

    ©2015 Google

    +

    Back to top

    ©2015 Google, ©2019 Open GEE Contributors

    diff --git a/docs/geedocs/5.3.0/answer/4492617.html b/docs/geedocs/5.3.0/answer/4492617.html index 234c933033..469428ec2c 100644 --- a/docs/geedocs/5.3.0/answer/4492617.html +++ b/docs/geedocs/5.3.0/answer/4492617.html @@ -37,7 +37,7 @@

    Uninstalling

    Back to top

    -

    ©2015 Google

    +

    ©2015 Google, ©2019 Open GEE Contributors

    diff --git a/docs/geedocs/5.3.0/answer/7160007.html b/docs/geedocs/5.3.0/answer/7160007.html index 2268a8d05c..86ad2f842b 100644 --- a/docs/geedocs/5.3.0/answer/7160007.html +++ b/docs/geedocs/5.3.0/answer/7160007.html @@ -51,6 +51,7 @@
    This can be done by configuring the PURGE and PURGE_LEVEL settings in /etc/opt/google/XMLparams. This file must be created manually. View the Configure Fusion performance document for more details.

    Added a long_version parameter to the SCons build. This will allow the user to override the long version string.

    +

    Uninstallation scripts are now copied over to the installation at /opt/google/install. This will allow the user to uninstall from the installation instead of having to have a copy of the source code on hand.

    Supported Platforms

    diff --git a/earth_enterprise/SConstruct b/earth_enterprise/SConstruct index 3f36bfb6fc..aab88739e2 100644 --- a/earth_enterprise/SConstruct +++ b/earth_enterprise/SConstruct @@ -1,6 +1,7 @@ #-*- Python -*- # # Copyright 2017 Google Inc. +# Copyright 2019 Open GEE Contributors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/earth_enterprise/src/installer/install_server.sh b/earth_enterprise/src/installer/install_server.sh index 45f64751cf..79515ef04d 100755 --- a/earth_enterprise/src/installer/install_server.sh +++ b/earth_enterprise/src/installer/install_server.sh @@ -1,6 +1,7 @@ #!/bin/bash # # Copyright 2017 Google Inc. +# Copyright 2019 Open GEE Contributors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 7b7a1661d229f4e205932529afc12f66f533e3c2 Mon Sep 17 00:00:00 2001 From: Carissa Camp Date: Thu, 4 Apr 2019 12:43:43 -0600 Subject: [PATCH 08/10] Moving doc changes out of 5.3.0 in favor of 5.3.1 --- docs/geedocs/5.3.0/answer/3499964.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/geedocs/5.3.0/answer/3499964.html b/docs/geedocs/5.3.0/answer/3499964.html index 8e57acf3a1..88a7eab6bb 100644 --- a/docs/geedocs/5.3.0/answer/3499964.html +++ b/docs/geedocs/5.3.0/answer/3499964.html @@ -23,7 +23,8 @@

    Uninstalling

  • Stop the Google Earth Enterprise Server, if you have a previous version installed and it is running:

    /etc/init.d/geserver stop

    • -
  • Navigate to the location at which you initially cloned the GEE git repo or to the installation location (/opt/google).
    • -
  • If you're uninstalling from the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer. If you're uninstalling from the installation location, navigate to install. Now run the script uninstall_server.sh.
    • -

    Back to top

    ©2015 Google, ©2019 Open GEE Contributors

    +
  • Navigate to the location at which you initially cloned the GEE git repo.
    • +
  • Within the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer +and run the script uninstall_server.sh.
    • +

    Back to top

    ©2015 Google

    From 515fa61d9d4339a8ea500fccd522593ae4d4c18d Mon Sep 17 00:00:00 2001 From: Carissa Camp Date: Thu, 4 Apr 2019 12:44:59 -0600 Subject: [PATCH 09/10] Moving doc changes out of 5.3.0 in favor of 5.3.1 --- docs/geedocs/5.3.0/answer/4492617.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/geedocs/5.3.0/answer/4492617.html b/docs/geedocs/5.3.0/answer/4492617.html index 469428ec2c..c91a90ffb8 100644 --- a/docs/geedocs/5.3.0/answer/4492617.html +++ b/docs/geedocs/5.3.0/answer/4492617.html @@ -31,13 +31,14 @@

    Uninstalling

    /etc/init.d/geserver stop

    -
  • Navigate to the location at which you initially cloned the GEE git repo or to the installation location (/opt/google).
    • -
  • If you're uninstalling from the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer. If you're uninstalling from the installation location, navigate to install. Now run the uninstall_fusion.sh and uninstall_server.sh scripts.
    • +
  • Navigate to the location at which you initially cloned the GEE git repo.
    • +
  • Within the GEE git repo, navigate to earthenterprise/earth_enterprise/src/installer +and run the uninstall_fusion.sh and uninstall_server.sh scripts.

    • Back to top

    -

    ©2015 Google, ©2019 Open GEE Contributors

    +

    ©2015 Google

    From 32649af044cf38455dd120f823ad027e86fded60 Mon Sep 17 00:00:00 2001 From: Carissa Camp Date: Thu, 4 Apr 2019 12:45:42 -0600 Subject: [PATCH 10/10] Moving doc changes out of 5.3.0 in favor of 5.3.1 --- docs/geedocs/5.3.0/answer/7160007.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/geedocs/5.3.0/answer/7160007.html b/docs/geedocs/5.3.0/answer/7160007.html index a4e21a1738..68c4705f57 100644 --- a/docs/geedocs/5.3.0/answer/7160007.html +++ b/docs/geedocs/5.3.0/answer/7160007.html @@ -49,7 +49,6 @@
    This can be done by configuring the PURGE and PURGE_LEVEL settings in /etc/opt/google/XMLparams. This file must be created manually. View the Configure Fusion performance document for more details.

    Added a long_version parameter to the SCons build. This will allow the user to override the long version string.

    -

    Uninstallation scripts are now copied over to the installation at /opt/google/install. This will allow the user to uninstall from the installation instead of having to have a copy of the source code on hand.

    Supported Platforms