merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0318-mono-bootstrap-config-and-policy.diff
blob2f1102e8f320c27a786efb2aebb3b6eda4020c66
1 diff -rup cli_ure-orig-1/source/bootstrap/makefile.mk cli_ure/source/bootstrap/makefile.mk
2 --- cli_ure-orig-1/source/bootstrap/makefile.mk 2008-07-21 15:10:12.000000000 +0200
3 +++ cli_ure/source/bootstrap/makefile.mk 2008-07-21 15:33:46.000000000 +0200
4 @@ -58,10 +58,14 @@ ASSEMBLY_KEY="$(BIN)$/cliuno.snk"
6 ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_cppuhelper.cs
8 +POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_CPPUHELPER_POLICY_ASSEMBLY).dll
10 ALLTAR : \
11 $(SHL1TARGETN) \
12 $(ASSEMBLY_ATTRIBUTES) \
13 - $(BIN)$/cli_cppuhelper.dll
14 + $(BIN)$/cli_cppuhelper.dll \
15 + $(BIN)$/cli_cppuhelper.config \
16 + $(POLICY_ASSEMBLY_FILE)
18 CSFILES = \
19 managed_bootstrap.cs \
20 @@ -109,6 +113,17 @@ SHL1STDLIBS += $(MONO_LIBS)
22 SHL1TARGET = $(TARGET)
24 +$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
25 + $(WRAPCMD) $(AL) -out:$@ \
26 + -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
27 + -keyfile:$(BIN)$/cliuno.snk \
28 + -link:cli_cppuhelper.config,$(BIN)$/cli_cppuhelper.config
30 +#Create the config file that is used with the policy assembly
31 +$(BIN)$/cli_cppuhelper.config: ../native/cli_cppuhelper_config $(BIN)$/cliureversion.mk
32 + $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
33 + $< $@
35 .ENDIF
37 .INCLUDE : $(PRJ)$/util$/target.pmk