mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses

Browse Source
This commit is contained in:
Norbert Thiebaud
2012-01-19 01:28:32 -06:00
parent 628ee842af
commit 43b987e43f
16 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -311,6 +311,7 @@ export SIZEOF_POINTER="@SIZEOF_POINTER@"
export SIZEOF_SHORT="@SIZEOF_SHORT@" export SIZEOF_SHORT="@SIZEOF_SHORT@"
export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@" export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@" export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
export SRCDIR="@SRC_ROOT@"
export STARTCENTER_LEFT_BITMAP="@STARTCENTER_LEFT_BITMAP@" export STARTCENTER_LEFT_BITMAP="@STARTCENTER_LEFT_BITMAP@"
export STARTCENTER_RIGHT_BITMAP="@STARTCENTER_RIGHT_BITMAP@" export STARTCENTER_RIGHT_BITMAP="@STARTCENTER_RIGHT_BITMAP@"
export STARTCENTER_RTL_LEFT_BITMAP="@STARTCENTER_RTL_LEFT_BITMAP@" export STARTCENTER_RTL_LEFT_BITMAP="@STARTCENTER_RTL_LEFT_BITMAP@"

4
connectivity/source/drivers/hsqldb/makefile.mk
View File

@@ -51,12 +51,12 @@ CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
SRS1NAME=$(TARGET) SRS1NAME=$(TARGET)
SRC1FILES = \ SRC1FILES = \
hsqlui.src hsqlui.src
RES1FILELIST=\ RES1FILELIST=\
$(SRS)$/$(TARGET).srs $(SRS)$/$(TARGET).srs
RESLIB1NAME=$(TARGET) RESLIB1NAME=$(TARGET)
RESLIB1IMAGES=$(SOLARDEFIMG)$/database RESLIB1IMAGES=$(SRC_ROOT)/$(RSCDEFIMG)/database
RESLIB1SRSFILES=$(RES1FILELIST) RESLIB1SRSFILES=$(RES1FILELIST)
# Note that the resource file built here is currently *not* included # Note that the resource file built here is currently *not* included

2
mysqlc/source/makefile.mk
View File

@@ -220,7 +220,7 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
.INCLUDE : target.mk .INCLUDE : target.mk
.INCLUDE : extension_post.mk .INCLUDE : extension_post.mk
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@

10
packimages/pack/makefile.mk
View File

@@ -40,8 +40,8 @@ SORTED_LIST=$(RES)$/img$/sorted.lst
# (Tango fallbacks to Industrial for the missing icons) # (Tango fallbacks to Industrial for the missing icons)
CUSTOM_IMAGE_SETS=$(WITH_THEMES) CUSTOM_IMAGE_SETS=$(WITH_THEMES)
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/icon-themes$/tango CUSTOM_PREFERRED_FALLBACK_1*=-c $(SRC_ROOT)/icon-themes$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/icon-themes$/industrial CUSTOM_PREFERRED_FALLBACK_2*=-c $(SRC_ROOT)/icon-themes$/industrial
ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
@@ -54,14 +54,14 @@ $(SORTED_LIST) : image-sort.lst
$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
@@-$(MKDIR) $(RES)$/img @@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH) #+-$(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) $@ $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst $(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 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 # make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip: $(COMMONBIN)$/images_brand.zip:

2
reportbuilder/util/makefile.mk
View File

@@ -134,7 +134,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@

2
scp2/macros/makefile.mk
View File

@@ -45,4 +45,4 @@ ALLTAR : $(INCCOM)$/langmacros.inc
.PHONY $(INCCOM)$/langmacros.inc: .PHONY $(INCCOM)$/langmacros.inc:
@echo ------------------------------ @echo ------------------------------
@echo Making: $@ @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

4
sdext/source/minimizer/makefile.mk
View File

@@ -130,11 +130,11 @@ ZIP2LIST= \
.IF "$(L10N_framework)"=="" .IF "$(L10N_framework)"==""
.INCLUDE : extension_post.mk .INCLUDE : extension_post.mk
$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f) $(COMPONENT_BITMAPS) : $(SRC_ROOT)/$(RSCDEFIMG)$/minimizer$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@

2
sdext/source/pdfimport/makefile.mk
View File

@@ -165,7 +165,7 @@ $(MISC)/descriptions : $(DESCRIPTION)
.ENDIF .ENDIF
$(TOUCH) $@ $(TOUCH) $@
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@
.ENDIF # L10N_framework .ENDIF # L10N_framework

2
sdext/source/presenter/makefile.mk
View File

@@ -306,7 +306,7 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
@-$(MKDIRHIER) $(@:d) @-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@ +$(COPY) $< $@
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@

6
set_soenv.in
View File

@@ -259,8 +259,6 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path
$XLIB = PathFormat('@XLIB@'); # X11 libraries $XLIB = PathFormat('@XLIB@'); # X11 libraries
$XINC = PathFormat('@XINC@'); # X11 includes $XINC = PathFormat('@XINC@'); # X11 includes
# Location of the source.
$SOLARSRC = '$SRC_ROOT';
# default TARFILE_LOCATION # default TARFILE_LOCATION
if ('@TARFILE_LOCATION@' eq "DEFAULT") if ('@TARFILE_LOCATION@' eq "DEFAULT")
@@ -279,7 +277,6 @@ $SOLARVERSION = '$SOLARVER';
$WORKDIR = '$SRC_ROOT/workdir/$INPATH'; $WORKDIR = '$SRC_ROOT/workdir/$INPATH';
$OUTDIR = '$SOLARVER/$INPATH'; $OUTDIR = '$SOLARVER/$INPATH';
#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin #Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
$SOLARDEFIMG = PathFormat($SRC_ROOT.$DEFIMGS);
$SOLARENVINC = '$SOLARENV'.$INC; $SOLARENVINC = '$SOLARENV'.$INC;
@@ -779,7 +776,6 @@ ToFile( "SOLARVERSION", $SOLARVERSION, "e" );
ToFile( "WORKDIR", $WORKDIR, "e" ); ToFile( "WORKDIR", $WORKDIR, "e" );
ToFile( "OUTDIR", $OUTDIR, "e" ); ToFile( "OUTDIR", $OUTDIR, "e" );
ToFile( "SOLARENV", $SOLARENV, "e" ); ToFile( "SOLARENV", $SOLARENV, "e" );
ToFile( "SOLARDEFIMG", $SOLARDEFIMG, "e" );
ToFile( "SOLARENVINC", $SOLARENVINC, "e" ); ToFile( "SOLARENVINC", $SOLARENVINC, "e" );
ToFile( "DMAKEROOT", $DMAKEROOT, "e" ); ToFile( "DMAKEROOT", $DMAKEROOT, "e" );
if ( $JDK ne "gcj" ) { if ( $JDK ne "gcj" ) {
@@ -864,8 +860,6 @@ if ($platform !~ m/cygwin/) {
ToFile( "TMPDIR", "$ENV{'TMPDIR'}", "e" ); ToFile( "TMPDIR", "$ENV{'TMPDIR'}", "e" );
} }
} }
ToFile( "SOLARSRC", $SOLARSRC, "e" );
ToFile( "SRCDIR", $SOLARSRC, "e" );
if ( $platform =~ m/cygwin/ ) if ( $platform =~ m/cygwin/ )
{ {

4
smoketest/data/Global.xml
View File

@@ -120,8 +120,8 @@ Dim gDlgState as Integer
Sub SetGlobalDoc Sub SetGlobalDoc
gOutputDoc = ThisComponent gOutputDoc = ThisComponent
REM need to have the binfilter component, and SOLARSRC set to find sample docs REM need to have the binfilter component, and SRC_ROOT set to find sample docs
if Environ(&quot;SOLARSRC&quot;) &lt;&gt; &quot;&quot; then if Environ(&quot;SRC_ROOT&quot;) &lt;&gt; &quot;&quot; then
oBinFilterComp = createUnoService( &quot;com.sun.star.comp.office.BF_MigrateFilter&quot; ) oBinFilterComp = createUnoService( &quot;com.sun.star.comp.office.BF_MigrateFilter&quot; )
End If End If
end Sub end Sub

2
smoketest/data/Test_10er.xml
View File

@@ -395,7 +395,7 @@ Sub MakeDocTest
gCurrentTestCase = cDocOpen50 gCurrentTestCase = cDocOpen50
if bMakeOpen50Test and IsFilterAvailable (gCurrentDocTest or cFlt50) then if bMakeOpen50Test and IsFilterAvailable (gCurrentDocTest or cFlt50) then
SOLARSRC = ConvertToURL(Environ(&quot;SOLARSRC&quot;)) SOLARSRC = ConvertToURL(Environ(&quot;SRC_ROOT&quot;))
sFileName50 = SOLARSRC+&quot;/qadevOOo/testdocs/ttt.&quot;+GetDocEndings(gCurrentDocTest or cFlt50) sFileName50 = SOLARSRC+&quot;/qadevOOo/testdocs/ttt.&quot;+GetDocEndings(gCurrentDocTest or cFlt50)
oDoc = LoadDoc (sFileName50) oDoc = LoadDoc (sFileName50)

2
solenv/bin/build.pl
View File

@@ -1335,7 +1335,7 @@ sub usage {
print STDERR " --help - print help info\n"; print STDERR " --help - print help info\n";
print STDERR " --ignore - force tool to ignore errors\n"; print STDERR " --ignore - force tool to ignore errors\n";
print STDERR " --html - generate html page with build status\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 " --html_path - set html page path\n";
print STDERR " --stoponerror - stop build when error occurs (for mp builds)\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"; print STDERR " --interactive - start interactive build process (process can be managed via html page)\n";

80
solenv/inc/_tg_rslb.mk
View File

@@ -12,11 +12,11 @@ $(RSC_MULTI1) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB1NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \ $(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -48,11 +48,11 @@ $(RSC_MULTI2) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB2NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \ $(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -84,11 +84,11 @@ $(RSC_MULTI3) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB3NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \ $(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -120,11 +120,11 @@ $(RSC_MULTI4) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB4NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \ $(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -156,11 +156,11 @@ $(RSC_MULTI5) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB5NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \ $(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -192,11 +192,11 @@ $(RSC_MULTI6) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB6NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \ $(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -228,11 +228,11 @@ $(RSC_MULTI7) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB7NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \ $(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -264,11 +264,11 @@ $(RSC_MULTI8) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB8NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \ $(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -300,11 +300,11 @@ $(RSC_MULTI9) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB9NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \ $(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -336,11 +336,11 @@ $(RSC_MULTI10) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB10NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \ $(RSC10HEADER) $(RESLIB10SRSFILES) \

2
solenv/inc/installationtest.mk
View File

@@ -55,7 +55,7 @@ my_instsets = $(shell ls -dt \
installationtest_instset = $(my_instsets:1) installationtest_instset = $(my_instsets:1)
.ELSE .ELSE
installationtest_instset = \ installationtest_instset = \
$(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso) $(SRC_ROOT)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
.END .END
.IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES" .IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES"

8
solenv/inc/tg_rslb.mk
View File

@@ -40,11 +40,11 @@ $(RSC_MULTI$(TNR)) : \
$(foreach,i,$(alllangiso) -lg$i \ $(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \ -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={$j} ) \
-lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \ -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSCDEFIMG)/res ) \
-subMODULE=$(SOLARDEFIMG) \ -subMODULE=$(SRC_ROOT)/$(RSCDEFIMG) \
-subGLOBALRES=$(SOLARDEFIMG)/res \ -subGLOBALRES=$(SRC_ROOT)/$(RSCDEFIMG)/res \
-oil=$(BIN) \ -oil=$(BIN) \
-ft=$@ \ -ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \ $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \