[mono] mono-build.diff: add mono support

integrated with cli_ure-prj-build-lst.diff

7 files changed, 16 insertions, 14 deletions

diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index d72c5250d225..580c1eb9ed7c 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -2,12 +2,13 @@ ure     cli_ure :       cppu cppuhelper sal DESKTOP:codemaker stoc udkapi bridge
 ure	cli_ure						usr1	-	all	ure_mkout NULL
 ure	cli_ure\inc					nmake   -   all   ure_inc NULL
 ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
-ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
-ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
-ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
-ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
-ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
-ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
+ure cli_ure\source				nmake	-	all		ure_source_source ure_inc NULL
+ure cli_ure\source\basetypes	nmake	-	all		ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
+ure	cli_ure\source\bootstrap        nmake   -       u       ure_source_bootstrap ure_source_climaker ure_source_source ure_source_basetypes ure_inc ure_unotypes NULL
+ure cli_ure\source\climaker		nmake	-	all		ure_source_climaker ure_source_basetypes ure_inc NULL
+ure cli_ure\unotypes			nmake	-	all		ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
+ure	cli_ure\source\ure                      nmake   -       all     ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_source_basetypes ure_unotypes ure_inc NULL
+ure cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
 ure	cli_ure\source\mono_bridge	nmake	-	u		ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
-ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
-#ure	cli_ure\util			nmake	-	w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
+ure cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
+#ure cli_ure\util				nmake	-	w,vc7	ure_util ure_source_ure ure_source_native NULL
diff --git a/cli_ure/prj/d.lst b/cli_ure/prj/d.lst
index dff5e25583d7..2394a4b357c8 100644
--- a/cli_ure/prj/d.lst
+++ b/cli_ure/prj/d.lst
@@ -3,6 +3,7 @@
 ..\%__SRC%\bin\climaker.exe.config %_DEST%\bin\climaker.exe.config
 
 ..\%__SRC%\bin\cli_*.dll %_DEST%\bin\cli_*.dll
+..\%__SRC%\lib\libcli*.so %_DEST%\lib\libcli*.so
 ..\%__SRC%\bin\cli_*.pdb %_DEST%\bin\cli_*.pdb
 ..\%__SRC%\bin\cli_*.config %_DEST%\bin\cli_*.config
 ..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
@@ -10,4 +11,4 @@
 
 ..\%__SRC%\bin\cliuno.snk %_DEST%\bin\cliuno.snk
 
-..\%__SRC%\bin\cliureversion.mk %_DEST%\bin\cliureversion.mk
\ No newline at end of file
+..\%__SRC%\bin\cliureversion.mk %_DEST%\bin\cliureversion.mk
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk
index 5547c32de0df..8ea251b1d5cd 100644
--- a/cli_ure/source/basetypes/makefile.mk
+++ b/cli_ure/source/basetypes/makefile.mk
@@ -88,7 +88,7 @@ $(BIN)$/cli_basetypes.dll : $(CSFILES) $(BIN)$/cliureversion.mk
 
 #do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file.
 $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config
-    $(WRAPCMD) AL.exe -out:$@ \
+    $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_BASETYPES_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
             -link:$(BIN)$/cli_basetypes.config
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 58e9bd359dfd..367e2704c117 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -147,7 +147,7 @@ $(SIGN): $(SHL1TARGETN)
 # cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the
 # assembly is also 'MSIL'  like its policy file.
 $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
-    $(WRAPCMD) AL.exe -out:$@ \
+    $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
             -link:$(BIN)$/cli_cppuhelper.config \
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index 91c122fc4c56..8e91f9ae744e 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -96,7 +96,7 @@ $(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_uretypes.dll $(BIN)$/cliureversion.
 
 #do not forget to deliver cli_ure.config. It is NOT embedded in the policy file.
 $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ure.config
-    $(WRAPCMD) AL.exe -out:$@ \
+    $(WRAPCMD) $(AL) -out:$@ \
             -version:$(CLI_URE_POLICY_VERSION) \
             -keyfile:$(BIN)$/cliuno.snk \
             -link:$(BIN)$/cli_ure.config
diff --git a/cli_ure/util/makefile.pmk b/cli_ure/util/makefile.pmk
index 6a3ea0d706e4..7dbe19172f29 100644
--- a/cli_ure/util/makefile.pmk
+++ b/cli_ure/util/makefile.pmk
@@ -27,7 +27,7 @@
 
 # no translation here anyway
 .IF "$(L10N_framework)"==""
-.IF "$(COM)" == "MSC"
+.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)"== "MSC10" || "$(ENABLE_MONO)" == "YES"
 BUILD_FOR_CLI = "true"
 CFLAGSENABLESYMBOLS:=-Z7
 .ENDIF
diff --git a/cli_ure/util/target.pmk b/cli_ure/util/target.pmk
index 3a99d5ab6195..cb922fac124f 100644
--- a/cli_ure/util/target.pmk
+++ b/cli_ure/util/target.pmk
@@ -34,7 +34,7 @@ CSCFLAGS = -warnaserror+ -noconfig
 .IF "$(product)" == ""
 CSCFLAGS += -checked+ -define:DEBUG -define:TRACE
 .ELSE
-CSCFLAGS += -o
+CSCFLAGS += -optimize
 .ENDIF
 
 .ELSE # debug