aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/ts_lib.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-07-29 16:17:49 +0200
committerBjörn Gustavsson <[email protected]>2010-08-03 17:17:24 +0200
commit8f0799177b0707caad0e367ddc68aa8441eebf2b (patch)
treefa339c6a43d6729d5a6bad00f1c15baf843de266 /lib/test_server/src/ts_lib.erl
parent0d553b45b5c3ae8287340887f271bc70f1f1370c (diff)
downloadotp-8f0799177b0707caad0e367ddc68aa8441eebf2b.tar.gz
otp-8f0799177b0707caad0e367ddc68aa8441eebf2b.tar.bz2
otp-8f0799177b0707caad0e367ddc68aa8441eebf2b.zip
ts: Remove Clearcase detection
ts_lib:erlang_type/0 used to dectect whether the system was run in Clearcase, in an uninstalled source tree or in an installed system. There now only remain two cases: running in a source tree/git repository or in an installed system. Update ts_lib:erlang_type/0 and all callers accordingly.
Diffstat (limited to 'lib/test_server/src/ts_lib.erl')
-rw-r--r--lib/test_server/src/ts_lib.erl20
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index 082c9e0519..c90f4e511b 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
-module(ts_lib).
@@ -72,12 +72,10 @@ progress(Vars, Level, Format, Args) ->
erlang_type() ->
{_, Version} = init:script_id(),
- RelDir = filename:join([code:root_dir(), "releases"]), % Only in installed
- SysDir = filename:join([code:root_dir(), "system"]), % Nonexisting link/dir outside ClearCase
- case {filelib:is_file(RelDir),filelib:is_file(SysDir)} of
- {true,_} -> {otp, Version}; % installed OTP
- {_,true} -> {clearcase, Version};
- _ -> {srctree, Version}
+ RelDir = filename:join(code:root_dir(), "releases"), % Only in installed
+ case filelib:is_file(RelDir) of
+ true -> {otp,Version}; % installed OTP
+ false -> {srctree,Version} % source code tree
end.
%% Upcases the first letter in a string.