[ooo-build-commit] patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Oct 16 06:55:25 PDT 2009
patches/dev300/piece-build.diff | 6
patches/dev300/piece-cli_ure.diff | 28 +-
patches/dev300/piece-desktop.diff | 11
patches/dev300/piece-helpcontent2.diff | 7
patches/dev300/piece-icons.diff | 396 ++++++++++++++++-----------------
patches/dev300/piece-io.diff | 9
patches/dev300/piece-odk.diff | 11
patches/dev300/piece-offapi.diff | 22 -
patches/dev300/piece-scp2.diff | 2
patches/dev300/piece-services.diff | 61 +----
patches/dev300/piece-setup_native.diff | 20 -
patches/dev300/piece-solenv.diff | 60 +++--
patches/dev300/piece-target.diff | 36 +--
patches/dev300/piece-transex3.diff | 10
patches/dev300/piece-unoil.diff | 12 -
patches/dev300/piece-writerfilter.diff | 18 -
16 files changed, 350 insertions(+), 359 deletions(-)
New commits:
commit cb6f9e2da4b43dccc7277e8cd884b1cbb79029ec
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Oct 16 14:56:32 2009 +0200
Update piece-*.diff for ooo320-m1
* patches/dev300/piece-build.diff:
* patches/dev300/piece-cli_ure.diff:
* patches/dev300/piece-desktop.diff:
* patches/dev300/piece-helpcontent2.diff:
* patches/dev300/piece-icons.diff:
* patches/dev300/piece-io.diff:
* patches/dev300/piece-odk.diff:
* patches/dev300/piece-offapi.diff:
* patches/dev300/piece-scp2.diff:
* patches/dev300/piece-services.diff:
* patches/dev300/piece-setup_native.diff:
* patches/dev300/piece-solenv.diff:
* patches/dev300/piece-target.diff:
* patches/dev300/piece-transex3.diff:
* patches/dev300/piece-unoil.diff:
* patches/dev300/piece-writerfilter.diff: update for ooo310-m1; they might
still need some update to actually finnish the build ;-)
diff --git a/patches/dev300/piece-build.diff b/patches/dev300/piece-build.diff
index f5ecb3c..960fbf8 100644
--- a/patches/dev300/piece-build.diff
+++ b/patches/dev300/piece-build.diff
@@ -21,9 +21,9 @@
+ } else {
+ GetParentDeps( $CurrentPrj, \%global_deps_hash);
+ }
- modules_classify(keys %global_deps_hash);
- store_weights(\%global_deps_hash);
- prepare_build_from(\%global_deps_hash) if ($build_from);
+ if (scalar keys %active_modules) {
+ $active_modules{$CurrentPrj}++;
+ $modules_types{$CurrentPrj} = 'mod';
@@ -893,6 +928,9 @@
} else {
$StandDir = cwd();
diff --git a/patches/dev300/piece-cli_ure.diff b/patches/dev300/piece-cli_ure.diff
index 3dba277..2710401 100644
--- a/patches/dev300/piece-cli_ure.diff
+++ b/patches/dev300/piece-cli_ure.diff
@@ -1,31 +1,31 @@
---- cli_ure/unotypes/makefile.mk.old 2008-08-29 13:34:51.000000000 +0200
-+++ cli_ure/unotypes/makefile.mk 2008-08-29 14:29:05.000000000 +0200
+--- cli_ure/unotypes/makefile.mk.old 2009-10-14 15:38:06.000000000 +0200
++++ cli_ure/unotypes/makefile.mk 2009-10-15 11:53:52.000000000 +0200
@@ -44,7 +44,7 @@ TARGET = unotypes
.IF "$(BUILD_FOR_CLI)" != "" && ("$(GUI)" == "WNT" || "$(ENABLE_MONO_CLIMAKER)" == "YES")
.IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
-WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(OUT)/lib
+WRAPCMD=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(SOLARPIECE)$/$(INPATH)$/lib:$(OUT)/lib
- CLIMAKER=climaker
+ CLIMAKER=$(BIN)$/climaker
.ELSE
CLIMAKER=climaker.exe
@@ -64,14 +64,14 @@ CLIMAKERFLAGS += --verbose
.ENDIF
#When changing the assembly version then this must also be done in scp2
--$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-+$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/$(CLIMAKER) $(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb $(BIN)$/cliureversion.mk
- $(WRAPCMD) $(BIN)$/$(CLIMAKER) $(CLIMAKERFLAGS) \
- --out $@ \
- --keyfile $(BIN)$/cliuno.snk \
- --assembly-version $(CLI_URETYPES_NEW_VERSION) \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
- --assembly-company "OpenOffice.org" \
-- $(SOLARBINDIR)$/udkapi.rdb
-+ $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
+-$(OUT)$/bin$/cli_uretypes.dll : $(CLIMAKER) $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
++$(OUT)$/bin$/cli_uretypes.dll : $(CLIMAKER) $(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb $(BIN)$/cliureversion.mk
+ $(WRAPCMD) $(CLIMAKER) $(CLIMAKERFLAGS) \
+ --out $@ \
+ --keyfile $(BIN)$/cliuno.snk \
+ --assembly-version $(CLI_URETYPES_NEW_VERSION) \
+ --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
+ --assembly-company "OpenOffice.org" \
+- $(SOLARBINDIR)$/udkapi.rdb
++ $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
- $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_uretypes.config $(OUT)$/bin$/cli_uretypes.dll
+ #see i62886 for the dependency on cli_uretypes.dll
--- cli_ure/qa/climaker/makefile.mk.old 2008-06-25 14:05:37.000000000 +0200
+++ cli_ure/qa/climaker/makefile.mk 2008-08-29 13:50:49.000000000 +0200
@@ -106,7 +106,7 @@ $(OUTDIR)$/types.rdb: $(OUTDIR)$/types.u
diff --git a/patches/dev300/piece-desktop.diff b/patches/dev300/piece-desktop.diff
index 01c6df5..a9b020d 100644
--- a/patches/dev300/piece-desktop.diff
+++ b/patches/dev300/piece-desktop.diff
@@ -1,7 +1,10 @@
---- desktop/prj/build.lst
-+++ desktop/prj/build.lst
-@@ -37,4 +37,3 @@
+--- desktop/prj/build.lst.old 2009-10-14 15:37:58.000000000 +0200
++++ desktop/prj/build.lst 2009-10-14 15:46:50.000000000 +0200
+@@ -39,7 +39,6 @@ dt desktop\source\deployment\registry\he
dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_executable dt_inc NULL
dt desktop\scripts nmake - u dt_scripts dt_inc NULL
- dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
+ dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL
-dt desktop\zipintro nmake - all dt_zipintro NULL
+ dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL
+ dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL
+ dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL
diff --git a/patches/dev300/piece-helpcontent2.diff b/patches/dev300/piece-helpcontent2.diff
index 3044eb5..757e31f 100644
--- a/patches/dev300/piece-helpcontent2.diff
+++ b/patches/dev300/piece-helpcontent2.diff
@@ -13,11 +13,12 @@
--- helpcontent2/settings.pmk 2008-07-25 16:23:36.000000000 +0100
+++ helpcontent2/settings.pmk 2008-07-25 16:23:36.000000000 +0100
-@@ -1,10 +1,10 @@
+@@ -1,11 +1,11 @@
.INCLUDE : $(INCCOM)$/aux_langs.mk
--my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
-+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/HelpIndexerTool.jar$
+
.IF "$(SYSTEM_LUCENE)" == "YES"
my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
.ELSE
diff --git a/patches/dev300/piece-icons.diff b/patches/dev300/piece-icons.diff
index 833ec16..5532dfd 100644
--- a/patches/dev300/piece-icons.diff
+++ b/patches/dev300/piece-icons.diff
@@ -13,32 +13,32 @@
@@ -62,11 +62,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(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=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
@@ -77,11 +77,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(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=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
@@ -47,320 +47,320 @@
@@ -30,11 +30,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -45,11 +45,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB1NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \
@@ -108,11 +108,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -123,11 +123,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB2NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \
@@ -186,11 +186,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -201,11 +201,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB3NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \
@@ -264,11 +264,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -279,11 +279,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB4NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \
@@ -342,11 +342,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -357,11 +357,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB5NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \
@@ -420,11 +420,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -435,11 +435,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB6NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \
@@ -498,11 +498,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -513,11 +513,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB7NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \
@@ -576,11 +576,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -591,11 +591,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB8NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \
@@ -654,11 +654,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -669,11 +669,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB9NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \
@@ -732,11 +732,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$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),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \
@@ -747,11 +747,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),$(IMGSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \
+ -fs={$(BIN)/$(RESLIB10NAME)$i.res} \
+- $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
++ $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-- -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \
-- -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \
-- -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \
-+ -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(IMGSRC)$/$(RSCDEFIMG)$/res ) \
-+ -subMODULE=$(IMGSRC)$/$(RSCDEFIMG) \
-+ -subGLOBALRES=$(IMGSRC)$/$(RSCDEFIMG)$/res \
+- -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
+- -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
+- -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
++ -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
++ -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
++ -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \
diff --git a/patches/dev300/piece-io.diff b/patches/dev300/piece-io.diff
index ae2b1ed..9c2a770 100644
--- a/patches/dev300/piece-io.diff
+++ b/patches/dev300/piece-io.diff
@@ -1,7 +1,7 @@
diff -u -r io/source/acceptor/makefile.mk io/source/acceptor/makefile.mk
--- io/source/acceptor/makefile.mk 2008-04-11 12:43:42.000000000 +0100
+++ io/source/acceptor/makefile.mk 2008-07-17 11:16:04.000000000 +0100
-@@ -36,15 +36,15 @@
+@@ -36,16 +36,16 @@
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
COMP1TYPELIST = acceptor
@@ -10,6 +10,7 @@ diff -u -r io/source/acceptor/makefile.mk io/source/acceptor/makefile.mk
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+ .IF "$(L10N_framework)"==""
DLLPRE =
# ------------------------------------------------------------------
@@ -24,7 +25,7 @@ Only in io/source/acceptor: makefile.mk~
diff -u -r io/source/connector/makefile.mk io/source/connector/makefile.mk
--- io/source/connector/makefile.mk 2008-04-11 12:45:15.000000000 +0100
+++ io/source/connector/makefile.mk 2008-07-17 11:15:19.000000000 +0100
-@@ -36,15 +36,15 @@
+@@ -36,16 +36,16 @@
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
COMP1TYPELIST = connectr
@@ -33,6 +34,7 @@ diff -u -r io/source/connector/makefile.mk io/source/connector/makefile.mk
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+ .IF "$(L10N_framework)"==""
DLLPRE =
# ------------------------------------------------------------------
@@ -47,7 +49,7 @@ Only in io/source/connector: makefile.mk~
diff -u -r io/source/stm/makefile.mk io/source/stm/makefile.mk
--- io/source/stm/makefile.mk 2008-04-11 12:46:07.000000000 +0100
+++ io/source/stm/makefile.mk 2008-07-17 11:16:32.000000000 +0100
-@@ -35,14 +35,14 @@
+@@ -35,15 +35,15 @@
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
COMP1TYPELIST = stm
@@ -56,6 +58,7 @@ diff -u -r io/source/stm/makefile.mk io/source/stm/makefile.mk
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+ .IF "$(L10N_framework)"==""
DLLPRE =
# --- Files --------------------------------------------------------
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
diff --git a/patches/dev300/piece-odk.diff b/patches/dev300/piece-odk.diff
index 6084784..0038b01 100644
--- a/patches/dev300/piece-odk.diff
+++ b/patches/dev300/piece-odk.diff
@@ -1,6 +1,6 @@
--- odk/pack/gendocu/makefile.mk.old 2009-04-02 12:54:49.000000000 +0200
+++ odk/pack/gendocu/makefile.mk 2009-04-14 17:28:52.000000000 +0200
-@@ -81,11 +81,11 @@ AUTODOCPARAMS= -lg c++ \
+@@ -81,7 +81,7 @@ AUTODOCPARAMS= -lg c++ \
-p salhelper $(INCOUT) -t salhelper \
-p bridges $(INCOUT) -t bridges
@@ -9,11 +9,6 @@
JAVADOCLOG = $(MISC)$/javadoc_log.txt
--MY_AUTODOC=$(SOLARBINDIR)$/autodoc
-+MY_AUTODOC=$(SOLARPIECE)$/$(INPATH)$/bin$/autodoc
-
- .IF "$(SOLAR_JAVA)"!=""
- all: \
--- odk/source/unowinreg/win/makefile.mk.old 2009-04-02 12:54:49.000000000 +0200
+++ odk/source/unowinreg/win/makefile.mk 2009-04-14 17:19:37.000000000 +0200
@@ -77,7 +77,7 @@ $(BIN)$/unowinreg.dll : unowinreg.cxx
@@ -31,8 +26,8 @@
CONVERTTAGFLAGNAME=converttags_html_files.flag
CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME)
--MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc
-+MY_AUTODOC=$(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/autodoc
+-MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc
++MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/autodoc
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
MY_COPY=$(GNUCOPY)
diff --git a/patches/dev300/piece-offapi.diff b/patches/dev300/piece-offapi.diff
index b2f7927..42975be 100644
--- a/patches/dev300/piece-offapi.diff
+++ b/patches/dev300/piece-offapi.diff
@@ -1,23 +1,23 @@
---- offapi/util/makefile.mk 2008-07-17 10:25:46.000000000 +0100
-+++ offapi/util/makefile.mk 2008-07-17 10:25:46.000000000 +0100
-@@ -158,15 +158,16 @@
+--- offapi/util/makefile.mk.old 2009-10-14 15:37:57.000000000 +0200
++++ offapi/util/makefile.mk 2009-10-14 16:42:17.000000000 +0200
+@@ -163,15 +163,16 @@ ALLTAR : $(UCR)$/types.db \
$(REGISTRYCHECKFLAG) \
$(UNOTYPE_STATISTICS)
-$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
+UDKRDB=$(SOLARPIECE)$/$(INPATH)$/bin
+$(UCR)$/types.db : $(UCR)$/offapi.db $(UDKRDB)$/udkapi.rdb
- -$(RM) $(REGISTRYCHECKFLAG)
- $(GNUCOPY) -f $(UCR)$/offapi.db $@
-- $(REGMERGE) $(REGMERGEFLAGS) $@ / $(SOLARBINDIR)$/udkapi.rdb
-+ $(REGMERGE) $(REGMERGEFLAGS) $@ / $(UDKRDB)$/udkapi.rdb
+ @-$(RM) $(REGISTRYCHECKFLAG)
+ @$(GNUCOPY) -f $(UCR)$/offapi.db $@
+- $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
++ $(COMMAND_ECHO)$(REGMERGE) $@ / $(UDKRDB)$/udkapi.rdb
-$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
+$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(UDKRDB)$/udkapi_doc.rdb
- -$(RM) $(REGISTRYCHECKFLAG)
- $(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
-- $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
-+ $(REGMERGE) $@ / $(UDKRDB)$/udkapi_doc.rdb
+ @-$(RM) $(REGISTRYCHECKFLAG)
+ @$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
+- $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
++ $(COMMAND_ECHO)$(REGMERGE) $@ / $(UDKRDB)$/udkapi_doc.rdb
#JSC: The type library has changed, all temporary not checked types are removed
# and will be check from now on.
diff --git a/patches/dev300/piece-scp2.diff b/patches/dev300/piece-scp2.diff
index 6b55a9b..8df950a 100644
--- a/patches/dev300/piece-scp2.diff
+++ b/patches/dev300/piece-scp2.diff
@@ -1,7 +1,7 @@
--- scp2/prj/build.lst 2008-06-06 10:37:54.000000000 +0100
+++ scp2/prj/build.lst 2008-06-06 10:37:54.000000000 +0100
@@ -1,4 +1,4 @@
--cp scp2 : setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+-cp scp2 : l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : soltools PYTHON:python ICU:icu NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
diff --git a/patches/dev300/piece-services.diff b/patches/dev300/piece-services.diff
index be12878..489d742 100644
--- a/patches/dev300/piece-services.diff
+++ b/patches/dev300/piece-services.diff
@@ -61,18 +61,9 @@ diff -u -r solenv.pristine/bin/modules/installer/archivefiles.pm solenv/bin/modu
+ next if (defined $ENV{OO_BUILD_SERVICES});
+
- $systemcall = "$installer::globals::unzippath -l $sourcepath |";
- open (UNZIP, "$systemcall");
- my @zipfile = <UNZIP>;
-@@ -219,7 +221,7 @@
- # Parameter -q : quiet mode
-
- if ( $installer::globals::dounzip ) # really unpacking the files
-- {
-+ {
- $returnvalue = 1;
- $systemcall = "$installer::globals::unzippath -o -q $sourcepath -d $unzipdir";
- $returnvalue = system($systemcall);
+ my $zip = Archive::Zip->new();
+ if ( $zip->read($sourcepath) != AZ_OK )
+ {
Only in solenv/bin/modules/installer: archivefiles.pm~
diff -u -r solenv.pristine/bin/modules/installer/scpzipfiles.pm solenv/bin/modules/installer/scpzipfiles.pm
--- solenv.pristine/bin/modules/installer/scpzipfiles.pm 2008-08-13 14:01:56.000000000 +0100
@@ -113,32 +104,32 @@ diff -u -r solenv.pristine/bin/modules/installer/scpzipfiles.pm solenv/bin/modul
$onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
Only in solenv/bin/modules/installer: scpzipfiles.pm~
diff -u -r solenv.pristine/bin/modules/installer/scriptitems.pm solenv/bin/modules/installer/scriptitems.pm
---- solenv.pristine/bin/modules/installer/scriptitems.pm 2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/scriptitems.pm 2008-08-14 13:06:53.000000000 +0100
-@@ -1304,7 +1304,10 @@
- $error_occured = 1;
- }
-
-- next; # removing this file from list, if sourcepath is empty
-+ if (!defined $ENV{OO_BUILD_SERVICES}) {
-+ print STDERR "drop file $filename ?\n";
-+ next; # removing this file from list, if sourcepath is empty
-+ }
- }
- }
+--- solenv/bin/modules/installer/scriptitems.pm.old1 2009-10-14 17:19:30.000000000 +0200
++++ solenv/bin/modules/installer/scriptitems.pm 2009-10-14 17:29:33.000000000 +0200
+@@ -1407,7 +1407,10 @@ sub remove_Files_Without_Sourcedirectory
+ }
+ }
+ }
+- next; # removing this file from list, if sourcepath is empty
++ if (!defined $ENV{OO_BUILD_SERVICES}) {
++ print STDERR "drop file $filename ?\n";
++ next; # removing this file from list, if sourcepath is empty
++ }
+ }
+ }
Only in solenv/bin/modules/installer: scriptitems.pm~
diff -u -r solenv.pristine/bin/modules/installer/servicesfile.pm solenv/bin/modules/installer/servicesfile.pm
--- solenv.pristine/bin/modules/installer/servicesfile.pm 2008-08-13 14:01:56.000000000 +0100
+++ solenv/bin/modules/installer/servicesfile.pm 2008-08-14 16:30:39.000000000 +0100
@@ -138,6 +138,7 @@
- for ( my $i = 0; $i <= $#{$unocomponents}; )
+ for ( my $i = 0; $i <= $#{$unocomponents}; ++$i )
{
- my $sourcepath = ${$unocomponents}[$i++]->{'sourcepath'};
+ my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
+ defined $ENV{OO_BUILD_SERVICES} && $sourcepath eq "" && next;
-
- $filestring = $filestring . make_file_url($sourcepath);
-
+ my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
+ if (defined($urlprefix))
+ {
@@ -506,7 +509,12 @@
{
my $filename = $installer::globals::regcompjars[$i];
@@ -175,14 +166,4 @@ diff -u -r solenv.pristine/bin/modules/installer/servicesfile.pm solenv/bin/modu
# Now the creation of all files with flag STARREGISTRY can begin
for ( my $i = 0; $i <= $#{$registryfiles}; $i++ )
-@@ -952,6 +965,9 @@
- else { $searchname = "regmerge.exe"; }
-
- $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
-+ if ( $$regmergefileref eq "" && $installer::globals::split) {
-+ $$regmergefileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $searchname;
-+ }
- if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); }
- # For Windows the libraries included into the mozruntime.zip have to be added to the path
- if ($installer::globals::iswin) { add_path_to_pathvariable_directory($filesarrayref, "mozruntime_zip"); }
Only in solenv/bin/modules/installer: servicesfile.pm~
diff --git a/patches/dev300/piece-setup_native.diff b/patches/dev300/piece-setup_native.diff
index afb3752..f9b4be8 100644
--- a/patches/dev300/piece-setup_native.diff
+++ b/patches/dev300/piece-setup_native.diff
@@ -1,26 +1,10 @@
---- setup_native/registry/data/org/openoffice/Office/makefile.mk.old 2009-04-02 13:05:47.000000000 +0200
-+++ setup_native/registry/data/org/openoffice/Office/makefile.mk 2009-04-08 12:34:02.000000000 +0200
-@@ -34,10 +34,10 @@ PRJNAME=setup_native
- TARGET=data_registration
- PACKAGE=org.openoffice.Office
-
--ABSXCSROOT=$(SOLARXMLDIR)
-+ABSXCSROOT=$(SPLITINSTALLDIR)$/..$/share
- XCSROOT=..
--DTDDIR=$(ABSXCSROOT)
--XSLDIR=$(ABSXCSROOT)$/processing
-+DTDDIR=$(SOLARXMLDIR)
-+XSLDIR=$(SOLARXMLDIR)$/processing
- PROCESSOUT=$(MISC)$/$(TARGET)
- PROCESSORDIR=$(SOLARBINDIR)
-
--- setup_native/prj/build.lst.old 2009-04-02 13:05:47.000000000 +0200
+++ setup_native/prj/build.lst 2009-04-08 12:34:02.000000000 +0200
@@ -1,7 +1,5 @@
- pk setup_native : soltools xml2cmp sal officecfg unoil NULL
+ pk setup_native : transex3 soltools sal xml2cmp NULL
pk setup_native usr1 - all sn_mkout NULL
-pk setup_native\scripts\source nmake - u sn_source NULL
-pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL
+ pk setup_native\source\mac nmake - u sn_mac NULL
pk setup_native\source\win32\customactions\tools nmake - w sn_tools NULL
pk setup_native\source\win32\customactions\relnotes nmake - w sn_relnotes NULL
- pk setup_native\source\win32\customactions\regactivex nmake - w sn_regactivex NULL
diff --git a/patches/dev300/piece-solenv.diff b/patches/dev300/piece-solenv.diff
index d18c74b..0f7491e 100644
--- a/patches/dev300/piece-solenv.diff
+++ b/patches/dev300/piece-solenv.diff
@@ -42,24 +42,48 @@
}
---- solenv/bin/modules/installer/scriptitems.pm 2008-07-18 17:54:05.000000000 +0100
-+++ solenv/bin/modules/installer/scriptitems.pm 2008-07-18 17:54:05.000000000 +0100
-@@ -1133,11 +1134,13 @@
- if ( ! ( $styles =~ /\bSTARREGISTRY\b/ )) # StarRegistry files will be created later
- {
- my $filename = $onefile->{'Name'};
-+ if (! $installer::globals::split) {
- $infoline = "ERROR: Removing file $filename from file list.\n";
- push( @installer::globals::logfileinfo, $infoline);
+--- solenv/bin/modules/installer/scriptitems.pm.old 2009-10-14 15:38:04.000000000 +0200
++++ solenv/bin/modules/installer/scriptitems.pm 2009-10-14 17:13:44.000000000 +0200
+@@ -1373,8 +1373,10 @@ sub remove_Files_Without_Sourcedirectory
+
+ if ( ! ( $styles =~ /\bSTARREGISTRY\b/ )) # StarRegistry files will be created later
+ {
+- my $filename = $onefile->{'Name'};
++ my $filename = $onefile->{'Name'};
- push(@missingfiles, "ERROR: File not found: $filename\n");
- $error_occured = 1;
-+ }
++ if (! $installer::globals::split)
++ {
+ if ( ! $installer::globals::languagepack )
+ {
+ $infoline = "ERROR: Removing file $filename from file list.\n";
+@@ -1383,7 +1385,6 @@ sub remove_Files_Without_Sourcedirectory
+ push(@missingfiles, "ERROR: File not found: $filename\n");
+ $error_occured = 1;
+
+- next; # removing this file from list, if sourcepath is empty
+ }
+ else # special case for language packs
+ {
+@@ -1395,7 +1396,6 @@ sub remove_Files_Without_Sourcedirectory
+ push(@missingfiles, "ERROR: File not found: $filename\n");
+ $error_occured = 1;
+
+- next; # removing this file from list, if sourcepath is empty
+ }
+ else
+ {
+@@ -1404,9 +1404,10 @@ sub remove_Files_Without_Sourcedirectory
+ $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+
+- next; # removing this file from list, if sourcepath is empty
+ }
+ }
++ }
++ next; # removing this file from list, if sourcepath is empty
+ }
+ }
- next; # removing this file from list, if sourcepath is empty
- }
-
-
--- solenv/bin/modules/installer/profiles.pm 2008-07-21 14:04:00.000000000 +0100
+++ solenv/bin/modules/installer/profiles.pm 2008-07-21 14:04:00.000000000 +0100
@@ -91,20 +91,32 @@
@@ -276,8 +300,8 @@
my $profilesinproductlanguageresolvedarrayref;
my $profileitemsinproductlanguageresolvedarrayref;
-- if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )))
-+ if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && $ENV{OO_ALLOW_PROFILES})
+- if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)))
++ if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && $ENV{OO_ALLOW_PROFILES})
{
installer::logger::print_message( "... creating profiles ...\n" );
diff --git a/patches/dev300/piece-target.diff b/patches/dev300/piece-target.diff
index eeb97fd..f1de2fe 100644
--- a/patches/dev300/piece-target.diff
+++ b/patches/dev300/piece-target.diff
@@ -6,35 +6,35 @@ diff -u -p -r1.209 target.mk
--- solenv/inc/target.mk 6 Jun 2008 12:00:28 -0000 1.209
+++ solenv/inc/target.mk 4 Jul 2008 15:25:03 -0000
@@ -48,16 +48,16 @@
- ENVINCPRE+=-I$(PRE)$/inc
+ ENVINCPRE+=-I$(PRE)/inc
.ENDIF # "$(PRE)"!=""
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
--UNOINCLUDES=$(SOLARINCDIR)$/offuh
-+UNOINCLUDES*=-I$(SOLARINCDIR)$/offuh
+-UNOINCLUDES=$(SOLARINCDIR)/offuh
++UNOINCLUDES*=-I$(SOLARINCDIR)/offuh
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
SOLARINC+=$(JDKINCS)
# make sure INCLUDE isn't set
INCLUDE:=
.EXPORT : INCLUDE
.IF "$(PRJINC)"!=""
--INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
-+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
.ELSE # "$(PRJINC)"!=""
--INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
-+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
++INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) $(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
.ENDIF # "$(PRJINC)"!=""
- INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
+ INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
.EXPORT : LIB
@@ -218,6 +218,9 @@
- LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i)
+ LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i)
NEWCLASS:=$(LOCALJARS)
- NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)$/$(INPATH)$/bin/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITINSTALLDIR)$/classes/$i $(NULL)))
-+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITUREDIR)$/share$/java/$i $(NULL)))
+ NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARPIECE)/$(INPATH)/bin/$i $(NULL)))
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITINSTALLDIR)/classes/$i $(NULL)))
++NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SPLITUREDIR)/share/java/$i $(NULL)))
.ENDIF # "$(JARFILES)"!=""
.IF "$(EXTRAJARFILES)"!=""
- NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i)
+ NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i)
Index: unxlng.mk
@@ -54,7 +54,7 @@ Index: unxlng.mk
+++ solenv/inc/settings.mk
@@ -764,6 +764,7 @@
.ELSE
- SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
+ SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(EXT_UPDMINOR)
.ENDIF
+SOLARIDLINC*=-I$(SOLARIDLDIR)
@@ -62,10 +62,10 @@ Index: unxlng.mk
EXT_UPDMINOR=.$(UPDMINOR)
@@ -861,7 +861,7 @@
.IF "$(PRE)"!=""
- UNOIDLINC!:=-I$(PRE)$/idl $(UNOIDLINC)
+ UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
.ENDIF
--UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
-+UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc $(SOLARIDLINC) -I$(SOLARINCDIR)
+-UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
++UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc $(SOLARIDLINC) -I$(SOLARINCDIR)
CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
diff --git a/patches/dev300/piece-transex3.diff b/patches/dev300/piece-transex3.diff
index 3845c9d..761d865 100644
--- a/patches/dev300/piece-transex3.diff
+++ b/patches/dev300/piece-transex3.diff
@@ -1,10 +1,8 @@
---- transex3/scripts/localize.old 2004-08-30 19:29:46.000000000 +0200
-+++ transex3/scripts/localize 2008-11-14 17:51:04.000000000 +0100
-@@ -3,9 +3,15 @@ if [ x${SOLARENV}x = xx ]; then
- echo No environment found, please use 'setsolar'
- exit 1
+--- solenv/bin/localize.old 2004-08-30 19:29:46.000000000 +0200
++++ solenv/bin/localize 2008-11-14 17:51:04.000000000 +0100
+@@ -13,8 +13,13 @@ if [ x${SOLARENV}x = xx ]; then
fi
-+
+
if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx ]; then
- exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
+ bindir=bin
diff --git a/patches/dev300/piece-unoil.diff b/patches/dev300/piece-unoil.diff
index 56f2265..df03a95 100644
--- a/patches/dev300/piece-unoil.diff
+++ b/patches/dev300/piece-unoil.diff
@@ -14,12 +14,14 @@
--- unoil/climaker/makefile.mk.old 2008-08-29 16:01:05.000000000 +0200
+++ unoil/climaker/makefile.mk 2008-08-29 16:13:28.000000000 +0200
-@@ -61,11 +61,11 @@ ALLTAR : \
+@@ -61,12 +61,12 @@ ALLTAR : \
.IF "$(ENABLE_MONO_CLIMAKER)" == "YES"
--CLIMAKER=$(SOLARBINDIR)$/climaker
-+CLIMAKER=$(SOLARPIECE)$/$(INPATH)$/bin$/climaker
+-WRAPCMD=LD_LIBRARY_PATH=$(SOLARLIBDIR)
+-CLIMAKER=$(WRAPCMD) $(SOLARBINDIR)$/climaker
++WRAPCMD=LD_LIBRARY_PATH=$(SOLARPIECE)$/$(INPATH)$/lib
++CLIMAKER=$(WRAPCMD) $(SOLARPIECE)$/$(INPATH)$/bin$/climaker
.ELSE
@@ -37,8 +39,8 @@
+RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/offapi.rdb
+EXTRA_RDB = $(SOLARPIECE)$/$(INPATH)$/bin$/udkapi.rdb
- $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
- $(CLIMAKER) $(CLIMAKERFLAGS) \
+ EXTERNAL_DIR=$(PRJ)$/..$/external/cli
+
@@ -85,8 +85,8 @@ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA
--assembly-company "OpenOffice.org" \
--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
diff --git a/patches/dev300/piece-writerfilter.diff b/patches/dev300/piece-writerfilter.diff
index f131bcc..b9e1212 100644
--- a/patches/dev300/piece-writerfilter.diff
+++ b/patches/dev300/piece-writerfilter.diff
@@ -1,13 +1,13 @@
---- writerfilter/source/ooxml/makefile.mk
-+++ writerfilter/source/ooxml/makefile.mk
-@@ -184,8 +184,8 @@
- XSLTPROC=xsltproc
- .ENDIF
+--- writerfilter/source/ooxml/makefile.mk.old 2009-10-14 16:24:18.000000000 +0200
++++ writerfilter/source/ooxml/makefile.mk 2009-10-14 16:33:36.000000000 +0200
+@@ -183,8 +183,8 @@ GENERATEDFILES= \
+ $(TOKENXMLTMP) \
+ $(TOKENXML)
-$(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
-- $(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
-+ $(TOKENXMLTMP): $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
-+ $(TYPE) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
+- @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
++$(TOKENXMLTMP): $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
++ @$(TYPE) $(SOLARPIECE)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
$(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
- $(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
+ @$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
More information about the ooo-build-commit
mailing list