replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses

4 files changed, 46 insertions, 46 deletions

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 760642d20574..a641ca31f41f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1335,7 +1335,7 @@ sub usage {
     print STDERR "        --help       - print help info\n";
     print STDERR "        --ignore     - force tool to ignore errors\n";
     print STDERR "        --html       - generate html page with build status\n";
-    print STDERR "                       file named $ENV{INPATH}.build.html will be generated in $ENV{SOLARSRC}\n";
+    print STDERR "                       file named $ENV{INPATH}.build.html will be generated in $ENV{SRC_ROOT}\n";
     print STDERR "          --html_path      - set html page path\n";
     print STDERR "        --stoponerror      - stop build when error occurs (for mp builds)\n";
     print STDERR "        --interactive      - start interactive build process (process can be managed via html page)\n";
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 9c583fc86a0d..78e2422c8725 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -12,11 +12,11 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -48,11 +48,11 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -84,11 +84,11 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -120,11 +120,11 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -156,11 +156,11 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -192,11 +192,11 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -228,11 +228,11 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -264,11 +264,11 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -300,11 +300,11 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -336,11 +336,11 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC10HEADER) $(RESLIB10SRSFILES) \
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 3c5cf32b1ace..2ddedb6af3d2 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -55,7 +55,7 @@ my_instsets = $(shell ls -dt \
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
+    $(SRC_ROOT)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
 .IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES"
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 9d3ed1557660..71a88b2347dc 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -40,11 +40,11 @@ $(RSC_MULTI$(TNR)) : \
     $(foreach,i,$(alllangiso) -lg$i \
     $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
     -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+    $(foreach,j,$(subst,$(PRJ),$(SRC_ROOT)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
     -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
+    -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
+    -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
+    -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
     -oil=$(BIN) \
     -ft=$@ \
     $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \