Changeset 11538

Timestamp:

02/24/12 18:31:39 (13 years ago)

Author:

Eric.Larour

Message:

Back to previous startup, with some windows flavor still

File:

• issm/trunk-jpl/startup.m (modified) (2 diffs)

issm/trunk-jpl/startup.m

@@ -26 +26 @@
 
 %ISSM path
-addpath(pwd); %add current path first
+addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath
+addpath([ISSM_TIER '/doc']);
+addpath([ISSM_TIER '/bin']);
+addpath(recursivepath([ISSM_TIER '/src/m']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/scotch']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/canos']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/kml']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/']));
+addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig']));
 
-if exist([ISSM_TIER '/src/m/utils/'],'dir'),
-        addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath
-end
-if exist([ISSM_TIER '/doc'],'dir'),
-        addpath([ISSM_TIER '/doc']);
-end
-if exist([ISSM_TIER '/bin'],'dir'),
-        addpath([ISSM_TIER '/bin']);
-end
-if exist([ISSM_TIER '/src/m'],'dir'),
-        addpath(recursivepath([ISSM_TIER '/src/m']));
-end
-if exist([ISSM_TIER '/externalpackages/scotch'],'dir'),
-        addpath(recursivepath([ISSM_TIER '/externalpackages/scotch']));
-end
-if exist([ISSM_TIER '/externalpackages/canos'],'dir'),
-        addpath(recursivepath([ISSM_TIER '/externalpackages/canos']));
-end
-if exist([ISSM_TIER '/externalpackages/kml'],'dir'),
-        addpath(recursivepath([ISSM_TIER '/externalpackages/kml']));
-end
-if exist([ISSM_TIER '/externalpackages/googleearthtoolbox/'],'dir'),
-        addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/']));
-end
-if exist([ISSM_TIER '/externalpackages/export_fig'],'dir'),
-        addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig']));
-end
 clear ISSM_TIER;
 
@@ -86 +67 @@
 % no warning if we try to plot while in nojvm (will not be supported in future releases)
 warning off MATLAB:HandleGraphics:noJVM
-
-%at the end, get to tests directory if ISSM_TESTS exists: 
-if ispc, 
-        addpath([pwd '\bin']);
-        ISSM_TESTS=getenv('ISSM_TESTS');
-        if ~isempty(ISSM_TESTS),
-                cd(ISSM_TESTS);
-        end
-end