Commits

Anonymous committed c660d15

setsolar01: #164399# allow specifying a local source root, outside g:/dev/o_setsolar01/DEV300, when setting up a local environment

Comments (0)

Files changed (1)

solenv/config/sdev300.ini

         common:3 IF %UPDATER% != YES
         {
         }
+        common:4 if x%LOCAL_SOURCE_ROOT%x == xx
+        {
+            LOCAL_SOURCE_ROOT %SOL_TMP%/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+        }
         crashdump
         {
             ENABLE_CRASHDUMP TRUE
         {
             LU_NOSOURCE no_source
         }
+        local_source
+        {
+            LU_NOSOURCE no_source
+        }
         pro:0 IF %UPDATER% == YES
         {
             product full
         PATH
         SRC_ROOT
         UPDATER
+        SOL_TMP
     }
-    order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
+    order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource local_source common:4
     reset
     {
         ALT_L10N_MODULE
         crashdump
         cwsname CWS_WORK_STAMP
         envroot
+        local_source LOCAL_SOURCE_ROOT
         hg
         minorext
         nosource
     {
         cap
         {
-            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            SOLARSRC %LOCAL_SOURCE_ROOT%/ooo%UPDMINOREXT%
             SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
         }
         cax
         {
-            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            SOLARSRC %LOCAL_SOURCE_ROOT%/ooo%UPDMINOREXT%
             SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
         }
         common_0:0 IF %OS% == MACOSX
         }
         common_1
         {
-        BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
-        BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
+            BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
+            BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
             DPKG %BUILD_TOOLS%$/dpkg
             OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
             PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
             COPY_PACKED TRUE
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             COPYALL FALSE
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
             PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
             PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
             PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
             PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
             PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
             PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
             PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
             PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
             PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
             PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOLARROOT%/etools
             PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%
             DEVROOT %SOL_TMP%$/r
             PCLEAN_PATH %SOL_TMP%$/r/etools
             PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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 %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARENV %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%