diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:05:12 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:05:12 +0000 |
| commit | 405cd31d0d971c087803bc85d681e6c2e2aa207b (patch) | |
| tree | 587be3c820e217256e40215ccab54ecde881777c /cli_ure/source | |
| parent | e133bda52003d9b9083589be062daaabb87b2a03 (diff) | |
INTEGRATION: CWS obo05 (1.17.6); FILE MERGED
2006/09/07 07:37:23 obo 1.17.6.3: typo
2006/09/06 13:01:57 obo 1.17.6.2: #i53611# small changes
2006/09/05 07:59:33 obo 1.17.6.1: #i53611# net 2005
Diffstat (limited to 'cli_ure/source')
| -rw-r--r-- | cli_ure/source/ure/makefile.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk index e7479d009bcc..2aa69d39bb1a 100644 --- a/cli_ure/source/ure/makefile.mk +++ b/cli_ure/source/ure/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: rt $ $Date: 2006-07-25 07:55:13 $ +# last change: $Author: vg $ $Date: 2006-09-25 13:05:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -63,6 +63,9 @@ ALLTAR : \ $(BIN)$/cli_ure.dll \ $(POLICY_ASSEMBLY_FILE) +.IF "$(CCNUMVER)" >= "001399999999" +CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk" +.ENDIF CSFILES = \ uno$/util$/DisposeGuard.cs \ @@ -71,12 +74,20 @@ CSFILES = \ uno$/util$/WeakComponentBase.cs \ $(ASSEMBLY_ATTRIBUTES) +.IF "$(CCNUMVER)" <= "001399999999" $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk $(GNUCOPY) -p assembly.cs $@ +echo $(ECHOQUOTE) \ [assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")] \ [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \ >> $@ +.ELSE +$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk + $(GNUCOPY) -p assembly.cs $@ + +echo $(ECHOQUOTE) \ + [assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")]$(ECHOQUOTE) \ + >> $@ +.ENDIF $(BIN)$/cli_ure.dll : $(CSFILES) $(BIN)$/cli_types.dll $(BIN)$/cliureversion.mk +$(CSC) $(CSCFLAGS) \ |