From 43b987e43f9ab5d6e27b2ccd67fc6833a0ac5a12 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 19 Jan 2012 01:28:32 -0600 Subject: replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses --- config_host.mk.in | 1 + connectivity/source/drivers/hsqldb/makefile.mk | 4 +- mysqlc/source/makefile.mk | 2 +- packimages/pack/makefile.mk | 10 ++-- reportbuilder/util/makefile.mk | 2 +- scp2/macros/makefile.mk | 2 +- sdext/source/minimizer/makefile.mk | 4 +- sdext/source/pdfimport/makefile.mk | 2 +- sdext/source/presenter/makefile.mk | 2 +- set_soenv.in | 6 -- smoketest/data/Global.xml | 4 +- smoketest/data/Test_10er.xml | 2 +- solenv/bin/build.pl | 2 +- solenv/inc/_tg_rslb.mk | 80 +++++++++++++------------- solenv/inc/installationtest.mk | 2 +- solenv/inc/tg_rslb.mk | 8 +-- 16 files changed, 64 insertions(+), 69 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index 3f0d58b5c4cf..f423dec0e185 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -311,6 +311,7 @@ export SIZEOF_POINTER="@SIZEOF_POINTER@" export SIZEOF_SHORT="@SIZEOF_SHORT@" export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@" export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@" +export SRCDIR="@SRC_ROOT@" export STARTCENTER_LEFT_BITMAP="@STARTCENTER_LEFT_BITMAP@" export STARTCENTER_RIGHT_BITMAP="@STARTCENTER_RIGHT_BITMAP@" export STARTCENTER_RTL_LEFT_BITMAP="@STARTCENTER_RTL_LEFT_BITMAP@" diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index 6da440d81918..be34caf94bd7 100755 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -51,12 +51,12 @@ CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" SRS1NAME=$(TARGET) SRC1FILES = \ hsqlui.src - + RES1FILELIST=\ $(SRS)$/$(TARGET).srs RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(SOLARDEFIMG)$/database +RESLIB1IMAGES=$(SRC_ROOT)/$(RSCDEFIMG)/database RESLIB1SRSFILES=$(RES1FILELIST) # Note that the resource file built here is currently *not* included diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 97207ffe543d..8f8eb408d465 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -220,7 +220,7 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE) .INCLUDE : target.mk .INCLUDE : extension_post.mk -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) +$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index c8ae0f817877..ebc6f81d9b08 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -40,8 +40,8 @@ SORTED_LIST=$(RES)$/img$/sorted.lst # (Tango fallbacks to Industrial for the missing icons) CUSTOM_IMAGE_SETS=$(WITH_THEMES) CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) -CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/icon-themes$/tango -CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/icon-themes$/industrial +CUSTOM_PREFERRED_FALLBACK_1*=-c $(SRC_ROOT)/icon-themes$/tango +CUSTOM_PREFERRED_FALLBACK_2*=-c $(SRC_ROOT)/icon-themes$/industrial ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -54,14 +54,14 @@ $(SORTED_LIST) : image-sort.lst $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) @@-$(MKDIR) $(RES)$/img #+-$(RM) $@ $@.$(INPATH) - $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) + $(FIND) $(SRC_ROOT)/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SRC_ROOT)/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ images_% : $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/icon-themes$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SRC_ROOT)/icon-themes$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip # make sure to have one to keep packing happy $(COMMONBIN)$/images_brand.zip: diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index a559957208cb..78672bb216f3 100644 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -134,7 +134,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) +$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk index 790a27385f34..249cccbdd833 100644 --- a/scp2/macros/makefile.mk +++ b/scp2/macros/makefile.mk @@ -45,4 +45,4 @@ ALLTAR : $(INCCOM)$/langmacros.inc .PHONY $(INCCOM)$/langmacros.inc: @echo ------------------------------ @echo Making: $@ - $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@ -c $(SOLARSRC)/set_soenv.stamp + $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@ -c $(SRC_ROOT)/set_soenv.stamp diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index ea9e043239de..e21ff84e98cb 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -130,11 +130,11 @@ ZIP2LIST= \ .IF "$(L10N_framework)"=="" .INCLUDE : extension_post.mk -$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f) +$(COMPONENT_BITMAPS) : $(SRC_ROOT)/$(RSCDEFIMG)$/minimizer$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) +$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index d33680f3152a..c83858736d7d 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -165,7 +165,7 @@ $(MISC)/descriptions : $(DESCRIPTION) .ENDIF $(TOUCH) $@ -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) +$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ .ENDIF # L10N_framework diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 39ef9063bc22..883482f36ba6 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -306,7 +306,7 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ -$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) +$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/set_soenv.in b/set_soenv.in index 1997dc615d94..e87c8799c94b 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -259,8 +259,6 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path $XLIB = PathFormat('@XLIB@'); # X11 libraries $XINC = PathFormat('@XINC@'); # X11 includes -# Location of the source. -$SOLARSRC = '$SRC_ROOT'; # default TARFILE_LOCATION if ('@TARFILE_LOCATION@' eq "DEFAULT") @@ -279,7 +277,6 @@ $SOLARVERSION = '$SOLARVER'; $WORKDIR = '$SRC_ROOT/workdir/$INPATH'; $OUTDIR = '$SOLARVER/$INPATH'; #Some directories that are symlinks under rawbuild, have to use realpath on Cygwin -$SOLARDEFIMG = PathFormat($SRC_ROOT.$DEFIMGS); $SOLARENVINC = '$SOLARENV'.$INC; @@ -779,7 +776,6 @@ ToFile( "SOLARVERSION", $SOLARVERSION, "e" ); ToFile( "WORKDIR", $WORKDIR, "e" ); ToFile( "OUTDIR", $OUTDIR, "e" ); ToFile( "SOLARENV", $SOLARENV, "e" ); -ToFile( "SOLARDEFIMG", $SOLARDEFIMG, "e" ); ToFile( "SOLARENVINC", $SOLARENVINC, "e" ); ToFile( "DMAKEROOT", $DMAKEROOT, "e" ); if ( $JDK ne "gcj" ) { @@ -864,8 +860,6 @@ if ($platform !~ m/cygwin/) { ToFile( "TMPDIR", "$ENV{'TMPDIR'}", "e" ); } } -ToFile( "SOLARSRC", $SOLARSRC, "e" ); -ToFile( "SRCDIR", $SOLARSRC, "e" ); if ( $platform =~ m/cygwin/ ) { diff --git a/smoketest/data/Global.xml b/smoketest/data/Global.xml index 8c549f824be2..dbe5c3475a7e 100644 --- a/smoketest/data/Global.xml +++ b/smoketest/data/Global.xml @@ -120,8 +120,8 @@ Dim gDlgState as Integer Sub SetGlobalDoc gOutputDoc = ThisComponent - REM need to have the binfilter component, and SOLARSRC set to find sample docs - if Environ("SOLARSRC") <> "" then + REM need to have the binfilter component, and SRC_ROOT set to find sample docs + if Environ("SRC_ROOT") <> "" then oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" ) End If end Sub diff --git a/smoketest/data/Test_10er.xml b/smoketest/data/Test_10er.xml index 54ee0769a5b8..f06b9a24b5e9 100644 --- a/smoketest/data/Test_10er.xml +++ b/smoketest/data/Test_10er.xml @@ -395,7 +395,7 @@ Sub MakeDocTest gCurrentTestCase = cDocOpen50 if bMakeOpen50Test and IsFilterAvailable (gCurrentDocTest or cFlt50) then - SOLARSRC = ConvertToURL(Environ("SOLARSRC")) + SOLARSRC = ConvertToURL(Environ("SRC_ROOT")) sFileName50 = SOLARSRC+"/qadevOOo/testdocs/ttt."+GetDocEndings(gCurrentDocTest or cFlt50) oDoc = LoadDoc (sFileName50) 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) \ -- cgit