diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-09 09:51:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-09 09:51:45 +0000 |
| commit | 71cb84fe21217775d0d1a57946b4d3fcad22a194 (patch) | |
| tree | 2a2fffb9d3a735e911001a297fb4b4aa0f2d7d70 | |
| parent | 8ae594ef93d6bf4db38ef905b535980d0f8d9431 (diff) | |
INTEGRATION: CWS jl31 (1.5.20); FILE MERGED
2006/02/20 11:49:50 jl 1.5.20.1: #i62141# facilitate version changes
| -rw-r--r-- | cli_ure/source/basetypes/makefile.mk | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk index 588c80d4ffb7..bc05a3a66604 100644 --- a/cli_ure/source/basetypes/makefile.mk +++ b/cli_ure/source/basetypes/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2005-10-25 11:14:19 $ +# last change: $Author: rt $ $Date: 2006-03-09 10:51:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,8 @@ TARGET = basetypes .INCLUDE : $(PRJ)$/util$/target.pmk .INCLUDE : target.mk +.INCLUDE : $(BIN)$/cliureversion.mk + .IF "$(USE_SHELL)"!="4nt" ECHOQUOTE=' .ELSE @@ -53,14 +55,14 @@ ECHOQUOTE= .IF "$(BUILD_FOR_CLI)" != "" -#!!! Always change version if code has changed. Provide a publisher -#policy assembly!!! -ASSEMBLY_VERSION="1.0.0.0" ASSEMBLY_ATTRIBUTES = $(MISC)$/assembly_ure_$(TARGET).cs +POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_BASETYPES_POLICY_ASSEMBLY).dll ALLTAR : \ - $(BIN)$/cli_basetypes.dll + $(BIN)$/cli_basetypes.dll \ + $(POLICY_ASSEMBLY_FILE) + CSFILES = \ uno$/Any.cs \ @@ -73,14 +75,14 @@ CSFILES = \ uno$/PolymorphicType.cs \ $(ASSEMBLY_ATTRIBUTES) -$(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk +$(ASSEMBLY_ATTRIBUTES) : assembly.cs $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk $(GNUCOPY) -p assembly.cs $@ +echo $(ECHOQUOTE) \ - [assembly:System.Reflection.AssemblyVersion( $(ASSEMBLY_VERSION))] \ + [assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \ [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \ >> $@ -$(BIN)$/cli_basetypes.dll : $(CSFILES) +$(BIN)$/cli_basetypes.dll : $(CSFILES) $(BIN)$/cliureversion.mk +$(CSC) $(CSCFLAGS) \ -target:library \ -out:$@ \ @@ -88,6 +90,19 @@ $(BIN)$/cli_basetypes.dll : $(CSFILES) $(CSFILES) @echo "If code has changed then provide a policy assembly and change the version!" +#do not forget to deliver cli_types.config. It is NOT embedded in the policy file. +$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_basetypes.config + +$(WRAPCMD) AL.exe -out:$@ \ + -version:$(CLI_BASETYPES_POLICY_VERSION) \ + -keyfile:$(BIN)$/cliuno.snk \ + -link:$(BIN)$/cli_basetypes.config + +#Create the config file that is used with the policy assembly +$(BIN)$/cli_basetypes.config: cli_basetypes_config $(BIN)$/cliureversion.mk + +$(PERL) $(PRJ)$/source$/scripts$/subst_template.pl \ + $< $@ + + .ENDIF |