diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:53:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:53:19 +0000 |
| commit | 2a0367409b3a01ddcb0a8f5c111bc8ba6342fac6 (patch) | |
| tree | 3e492412b7d97102b333c3dfd8247ee5bfd36414 /cli_ure/unotypes | |
| parent | ed5641f559f1eb481f76c019013a8135c0f21cb1 (diff) | |
INTEGRATION: CWS jl16 (1.9.8); FILE MERGED
2005/08/10 08:54:29 jl 1.9.8.1: #i47140# policy.1.1.cli_types.dll is build
Diffstat (limited to 'cli_ure/unotypes')
| -rw-r--r-- | cli_ure/unotypes/makefile.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk index e583534315e6..ad0d36f47f98 100644 --- a/cli_ure/unotypes/makefile.mk +++ b/cli_ure/unotypes/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2005-09-08 02:04:12 $ +# last change: $Author: hr $ $Date: 2005-09-23 11:53:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,14 +47,19 @@ TARGET = unotypes .IF "$(BUILD_FOR_CLI)" != "" +POLICYASSEMBLY = policy.1.1.cli_types.dll + ALLTAR : \ - $(OUT)$/bin$/cli_types.dll + $(OUT)$/bin$/cli_types.dll \ + $(OUT)$/bin$/$(POLICYASSEMBLY) CLIMAKERFLAGS = .IF "$(debug)" != "" CLIMAKERFLAGS += --verbose .ENDIF + +#When changing the assembly version then this must also be done in scp2 $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb +$(WRAPCMD) $(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \ --out $@ \ @@ -66,6 +71,13 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb # --assembly-copyright "2003" \ +#do not forget to deliver cli_types.config. It is NOT embedded in the policy file. +$(OUT)$/bin$/$(POLICYASSEMBLY) : cli_types.config + +$(COPY) cli_types.config $(OUT)$/bin + +$(WRAPCMD) AL.exe /out:$@ \ + /version:1.0.0.0 \ + /keyfile:$(BIN)$/cliuno.snk \ + /link:cli_types.config #Version changes #incompatible change from 1.0.0.0 -> 1.1.0.0 |