diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-08-02 18:23:11 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 12:24:47 +0200 |
| commit | 608b20ea0550c2b4f0eff27a2d52e39c02c8445e (patch) | |
| tree | 52db34afdc7a0ff8605e27dbae003d4d2726e627 /cli_ure | |
| parent | [mono] build-mono-link.diff: add mono support (diff) | |
| download | core-608b20ea0550c2b4f0eff27a2d52e39c02c8445e.tar.gz core-608b20ea0550c2b4f0eff27a2d52e39c02c8445e.zip | |
[mono] mono-build-keyfile.diff: add mono support
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/prj/d.lst | 2 | ||||
| -rw-r--r-- | cli_ure/source/basetypes/makefile.mk | 6 | ||||
| -rw-r--r-- | cli_ure/source/bootstrap/makefile.mk | 2 | ||||
| -rw-r--r-- | cli_ure/source/ure/makefile.mk | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/cli_ure/prj/d.lst b/cli_ure/prj/d.lst index 2394a4b357c8..b42bbc620522 100644 --- a/cli_ure/prj/d.lst +++ b/cli_ure/prj/d.lst @@ -12,3 +12,5 @@ ..\%__SRC%\bin\cliuno.snk %_DEST%\bin\cliuno.snk ..\%__SRC%\bin\cliureversion.mk %_DEST%\bin\cliureversion.mk + +..\%__SRC%\bin\cliuno.snk %_DEST%\bin\cliuno.snk diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk index 761df58a6222..e24b6fbc8ac2 100644 --- a/cli_ure/source/basetypes/makefile.mk +++ b/cli_ure/source/basetypes/makefile.mk @@ -47,8 +47,8 @@ POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_BASETYPES_POLICY_ASSEMBLY).dll ALLTAR : \ $(BIN)$/cli_basetypes.dll \ $(POLICY_ASSEMBLY_FILE) - -.IF "$(CCNUMVER)" >= "001399999999" + +.IF "$(COM)" != "MSC" || "$(CCNUMVER)" >= "001399999999" CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk" .ENDIF @@ -63,7 +63,7 @@ CSFILES = \ uno$/PolymorphicType.cs \ $(ASSEMBLY_ATTRIBUTES) -.IF "$(CCNUMVER)" <= "001399999999" +.IF "$(COM)" == "MSC" && "$(CCNUMVER)" <= "001399999999" $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk $(GNUCOPY) -p assembly.cs $@ echo \ diff --git a/cli_ure/source/bootstrap/makefile.mk b/cli_ure/source/bootstrap/makefile.mk index e6030ce43c65..54d3366c7398 100644 --- a/cli_ure/source/bootstrap/makefile.mk +++ b/cli_ure/source/bootstrap/makefile.mk @@ -69,7 +69,6 @@ $(ASSEMBLY_ATTRIBUTES) .PHONY: assembly.cs $(BIN)$/cliuno.snk $(BIN)$/cliurevers $(GNUCOPY) -p assembly.cs $@ +echo $(ECHOQUOTE) \ [assembly:System.Reflection.AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )] $(ECHOQUOTE) \ - $(ECHOQUOTE) [assembly:System.Reflection.AssemblyKeyFile($(ASSEMBLY_KEY))] $(ECHOQUOTE) \ >> $@ EXTERNAL_DIR=$(PRJ)$/..$/external/cli @@ -81,6 +80,7 @@ $(BIN)$/cli_cppuhelper.dll : $(CSFILES) $(OUT)$/bin$/cli_uretypes.dll +$(CSC) $(CSCFLAGS) \ -target:library \ -out:$@ \ + -keyfile:$(BIN)$/cliuno.snk \ -reference:$(OUT)$/bin$/cli_uretypes.dll \ -reference:System.dll \ $(CSFILES) diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk index 0481b0b78d1a..175256baf885 100644 --- a/cli_ure/source/ure/makefile.mk +++ b/cli_ure/source/ure/makefile.mk @@ -54,7 +54,7 @@ ALLTAR : \ $(BIN)$/cli_ure.dll \ $(POLICY_ASSEMBLY_FILE) -.IF "$(CCNUMVER)" >= "001399999999" +.IF "$(COM)" != "MSC" || "$(CCNUMVER)" >= "001399999999" CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk" .ENDIF @@ -68,7 +68,7 @@ CSFILES = \ uno$/util$/ManagedCodeLoader.cs \ $(ASSEMBLY_ATTRIBUTES) -.IF "$(CCNUMVER)" <= "001399999999" +.IF "$(COM)" == "MSC" && "$(CCNUMVER)" <= "001399999999" $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk $(GNUCOPY) -p assembly.cs $@ echo \ |