diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:15:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:15:59 +0000 |
| commit | 11da28c837c9c317efdd9fc396e8bdf1f4dfa3b8 (patch) | |
| tree | 7b4e58b90683503d4db57e7ca7236cb8abfe4426 /cli_ure/unotypes | |
| parent | 8832b0ddd44467135d41758237512fe14628ffff (diff) | |
INTEGRATION: CWS jl104 (1.18.4); FILE MERGED
2008/06/18 14:25:02 jl 1.18.4.1: #i88078# cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools
Diffstat (limited to 'cli_ure/unotypes')
| -rw-r--r-- | cli_ure/unotypes/makefile.mk | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk index 81be2a961b15..2c4cd2b221e2 100644 --- a/cli_ure/unotypes/makefile.mk +++ b/cli_ure/unotypes/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # # This file is part of OpenOffice.org. # @@ -45,43 +45,37 @@ TARGET = unotypes .INCLUDE : $(BIN)$/cliureversion.mk -POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_TYPES_POLICY_ASSEMBLY).dll +POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_URETYPES_POLICY_ASSEMBLY).dll ALLTAR : \ - $(OUT)$/bin$/cli_types.dll \ + $(OUT)$/bin$/cli_uretypes.dll \ $(POLICY_ASSEMBLY_FILE) - - 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 $(BIN)$/cliureversion.mk - $(WRAPCMD) $(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \ +$(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk + $(WRAPCMD) $(BIN)$/climaker.exe $(CLIMAKERFLAGS) \ --out $@ \ - --keyfile $(BIN)$/cliuno.snk \ - --assembly-version $(CLI_TYPES_NEW_VERSION) \ + --keyfile $(BIN)$/cliuno.snk \ + --assembly-version $(CLI_URETYPES_NEW_VERSION) \ --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \ --assembly-company "OpenOffice.org" \ - $(SOLARBINDIR)$/types_doc.rdb - -# --assembly-copyright "2003" \ + $(SOLARBINDIR)$/udkapi.rdb -#do not forget to deliver cli_types.config. It is NOT embedded in the policy file. -# iz62624: Add dependency for "$(OUT)$/bin$/cli_types.dll" because climaker locks cliuno.mk. -$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_types.config $(OUT)$/bin$/cli_types.dll +#do not forget to deliver cli_uretypes.config. It is NOT embedded in the policy file. +$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_uretypes.config $(OUT)$/bin$/cli_uretypes.dll $(WRAPCMD) AL.exe -out:$@ \ - -version:$(CLI_TYPES_POLICY_VERSION) \ + -version:$(CLI_URETYPES_POLICY_VERSION) \ -keyfile:$(BIN)$/cliuno.snk \ - -link:$(BIN)$/cli_types.config + -link:$(BIN)$/cli_uretypes.config #Create the config file that is used with the policy assembly -$(BIN)$/cli_types.config: cli_types_config $(BIN)$/cliureversion.mk - $(PERL) $(PRJ)$/source$/scripts$/subst_template.pl \ +$(BIN)$/cli_uretypes.config: cli_uretypes_config $(BIN)$/cliureversion.mk + $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \ $< $@ |