Skip to content

Commit

Permalink
COH-29534 Remove TDE setup from cfg scripts for code lines which no l…
Browse files Browse the repository at this point in the history
…onger have TDE

(auto-submit 107074 after successfully running remote remote.full)
Job ID: job.9.20240224071849.18191
(auto-submit integ 107077 main -> coherence-ce/main after successfully running remote remote.full)
Job ID: job.9.20240224161138.21388

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 107084]
  • Loading branch information
fryp committed Feb 24, 2024
1 parent c192178 commit 002a646
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 33 deletions.
20 changes: 1 addition & 19 deletions bin/cfgcommon.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
# Copyright (c) 2000, 2024, Oracle and/or its affiliates.
#
# Licensed under the Universal Permissive License v 1.0 as shown at
# https://oss.oracle.com/licenses/upl.
Expand All @@ -16,11 +16,9 @@
# JAVA_HOME e.g. /usr/java/jdk1.6
# MAVEN_HOME e.g. /dev/tools/maven
# P4IGNORE e.g. /dev/.p4ignore
# TDE_HOME e.g. /dev/tools/tde
# CLASSPATH e.g.
#
# _P4IGNORE saved P4IGNORE
# _TDE_HOME saved TDE_HOME
# _CLASSPATH saved CLASSPATH
# _PATH saved PATH
#
Expand Down Expand Up @@ -53,12 +51,6 @@ function reset
export P4IGNORE=$_P4IGNORE
fi

if [ -z $_TDE_HOME ]; then
unset TDE_HOME
else
export TDE_HOME=$_TDE_HOME
fi

if [ -z $_CLASSPATH ]; then
unset CLASSPATH
else
Expand All @@ -75,7 +67,6 @@ function reset
unset _JAVA_HOME
unset _MAVEN_HOME
unset _P4IGNORE
unset _TDE_HOME
unset _CLASSPATH
unset _PATH

Expand Down Expand Up @@ -173,15 +164,6 @@ function setup
echo P4IGNORE = $P4IGNORE
fi

#
# Set the TDE_HOME environment variable
#
_TDE_HOME=$TDE_HOME
TDE_HOME=$DEV_ROOT/tools/tde
PATH=$TDE_HOME/bin:$PATH
export TDE_HOME
echo TDE_HOME = $TDE_HOME

#
# Add the RQ executables to the PATH environment variable
#
Expand Down
16 changes: 2 additions & 14 deletions bin/cfgwindows.cmd
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@echo off
rem Copyright (c) 2000, 2020, Oracle and/or its affiliates.
rem Copyright (c) 2000, 2024, Oracle and/or its affiliates.

rem Licensed under the Universal Permissive License v 1.0 as shown at
rem http://oss.oracle.com/licenses/upl.
rem https://oss.oracle.com/licenses/upl.

rem
rem This script sets all environment variables necessary to build Coherence.
Expand All @@ -14,11 +14,9 @@ rem This script is responsible for the following environment variables:
rem
rem DEV_ROOT e.g. c:\dev
rem MAVEN_HOME e.g. c:\dev\tools\maven
rem TDE_HOME e.g. c:\dev\tools\tde
rem CLASSPATH e.g.
rem PATH e.g. %ANT_HOME%\bin;%MAVEN_HOME%\bin;%PATH%
rem
rem _TDE_HOME saved TDE_HOME
rem _CLASSPATH saved CLASSPATH
rem _PATH saved PATH
rem
Expand All @@ -33,13 +31,11 @@ if "%1"=="-reset" (
)

set MAVEN_HOME=%_MAVEN_HOME%
set TDE_HOME=%_TDE_HOME%
set CLASSPATH=%_CLASSPATH%
set PATH=%_PATH%

set DEV_ROOT=
set _MAVEN_HOME=
set _TDE_HOME=
set _CLASSPATH=
set _PATH=

Expand Down Expand Up @@ -79,13 +75,6 @@ if exist %DEV_ROOT%\tools\maven (
echo MAVEN_HOME = %MAVEN_HOME%
)

rem
rem Set the TDE_HOME environment variable
rem
set _TDE_HOME=%TDE_HOME%
set TDE_HOME=%DEV_ROOT%\tools\tde
echo TDE_HOME = %TDE_HOME%

rem
rem Set the CLASSPATH environment variable
rem
Expand All @@ -97,7 +86,6 @@ rem
rem Set the PATH environment variable
rem
set _PATH=%PATH%
set PATH=%TDE_HOME%\bin;%PATH%
echo PATH = %PATH%

echo Build environment set.
Expand Down

0 comments on commit 002a646

Please sign in to comment.