[ooo-build-commit] .: set_soenv.in solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Sep 17 04:46:27 PDT 2010
set_soenv.in | 9 ++
solenv/inc/_tg_rslb.mk | 160 ++++++++++++++++++++++++-------------------------
solenv/inc/tg_rslb.mk | 16 ++--
3 files changed, 95 insertions(+), 90 deletions(-)
New commits:
commit b2fcf1a4249bafa7cd47d3e4c2e987fb2fb1692e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Sep 17 14:21:21 2010 +0300
Workaround for default_images symlink problem on Cygwin
diff --git a/set_soenv.in b/set_soenv.in
index d050c4b..27de833 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -70,7 +70,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
#-------------------------------------------
#
# Help variables.
-my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
+my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
$CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
@@ -79,7 +79,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
- $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,
+ $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $SOLARDEFIMG,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
$DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
@@ -907,6 +907,7 @@ $OPT = $ds."opt";
$LOCAL = $ds."local";
$SOLENV = $ds."solenv";
$SOLVER = $ds."solver";
+$DEFIMGS = $ds."default_images";
$CONFIG = $ds."config";
$USR_BIN = $USR.$BIN;
$USR_LIB = $USR.$LIB64;
@@ -1009,6 +1010,9 @@ else
#Location of Solar version.
$SOLARVERSION = '$SOLARVER';
+#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
+$SOLARDEFIMG = PathFormat($SRC_ROOT.$DEFIMGS);
+
$SOLARENVINC = '$SOLARENV'.$INC;
# Location of
$LOCALINI = '$SOLARENV'.$CONFIG;
@@ -1731,6 +1735,7 @@ ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
ToFile( "SOLARVER", $SOLARVER, "e" );
ToFile( "SOLARVERSION", $SOLARVERSION, "e" );
ToFile( "SOLARENV", $SOLARENV, "e" );
+ToFile( "SOLARDEFIMG", $SOLARDEFIMG, "e" );
ToFile( "SOLARENVINC", $SOLARENVINC, "e" );
ToFile( "LOCALINI", $LOCALINI, "e" );
ToFile( "STAR_INIROOT", $STAR_INIROOT, "e" );
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 273ac8d..8248733 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -29,11 +29,11 @@ $(RSC_MULTI1) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -44,11 +44,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -106,11 +106,11 @@ $(RSC_MULTI2) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -121,11 +121,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -183,11 +183,11 @@ $(RSC_MULTI3) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -198,11 +198,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -260,11 +260,11 @@ $(RSC_MULTI4) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -275,11 +275,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -337,11 +337,11 @@ $(RSC_MULTI5) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -352,11 +352,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -414,11 +414,11 @@ $(RSC_MULTI6) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -429,11 +429,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -491,11 +491,11 @@ $(RSC_MULTI7) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -506,11 +506,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -568,11 +568,11 @@ $(RSC_MULTI8) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -583,11 +583,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -645,11 +645,11 @@ $(RSC_MULTI9) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -660,11 +660,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -722,11 +722,11 @@ $(RSC_MULTI10) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \
@@ -737,11 +737,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 4009638..913608e 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -57,11 +57,11 @@ $(RSC_MULTI$(TNR)) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
@@ -72,11 +72,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),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+ $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+ -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+ -subMODULE=$(SOLARDEFIMG) \
+ -subGLOBALRES=$(SOLARDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
More information about the ooo-build-commit
mailing list