Anonymous avatar Anonymous committed d41483e

setsolar01: wrap usages of the new LOCAL_SOURCE_ROOT into (), at least for the windows platforms, and the shared 'finish' block (where it is a no-op). This allows to specify the -local_source command line argument in the syntax of the shell you live in

Comments (0)

Files changed (1)

solenv/config/sdev300.ini

     {
         cap
         {
-            SOLARSRC %LOCAL_SOURCE_ROOT%/ooo%UPDMINOREXT%
+            SOLARSRC $dp(%LOCAL_SOURCE_ROOT%)/ooo%UPDMINOREXT%
             SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
         }
         cax
         {
-            SOLARSRC %LOCAL_SOURCE_ROOT%/ooo%UPDMINOREXT%
+            SOLARSRC $dp(%LOCAL_SOURCE_ROOT%)/ooo%UPDMINOREXT%
             SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
         }
         common_0:0 IF %OS% == MACOSX
             PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
             PSDK %SOL_TMP%$/r$/MinGW$/w32api
             SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%$/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
             PSDK %SOL_TMP%$/r$/MinGW$/w32api
             SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%$/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
             PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
             SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%$/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
             PSDK %COMPATH%$/PlatformSDK
             SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%$/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/%PERLDIR%
             PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
             SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/%PERLDIR%
             PSDK %COMPATH%$/PlatformSDK$/v6.1
             SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%/solenv 
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%/solenv 
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/%PERLDIR%
             PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
             SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%$/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             PERL %SOL_TMP%$/r$/%PERLDIR%
             PSDK %COMPATH%$/PlatformSDK$/v6.1
             SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-            SOLARENV %LOCAL_SOURCE_ROOT%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV $dp(%LOCAL_SOURCE_ROOT%)$/ooo%UPDMINOREXT%$/solenv
             SOLARROOT %SOL_TMP%$/r
             SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
             SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.