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
This commit is contained in:
@@ -4,9 +4,9 @@
|
|||||||
#
|
#
|
||||||
# $RCSfile: makefile.mk,v $
|
# $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 Contents of this file are made available subject to
|
||||||
# the terms of GNU Lesser General Public License Version 2.1.
|
# the terms of GNU Lesser General Public License Version 2.1.
|
||||||
@@ -47,14 +47,19 @@ TARGET = unotypes
|
|||||||
|
|
||||||
.IF "$(BUILD_FOR_CLI)" != ""
|
.IF "$(BUILD_FOR_CLI)" != ""
|
||||||
|
|
||||||
|
POLICYASSEMBLY = policy.1.1.cli_types.dll
|
||||||
|
|
||||||
ALLTAR : \
|
ALLTAR : \
|
||||||
$(OUT)$/bin$/cli_types.dll
|
$(OUT)$/bin$/cli_types.dll \
|
||||||
|
$(OUT)$/bin$/$(POLICYASSEMBLY)
|
||||||
|
|
||||||
CLIMAKERFLAGS =
|
CLIMAKERFLAGS =
|
||||||
.IF "$(debug)" != ""
|
.IF "$(debug)" != ""
|
||||||
CLIMAKERFLAGS += --verbose
|
CLIMAKERFLAGS += --verbose
|
||||||
.ENDIF
|
.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
|
$(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
|
||||||
+$(WRAPCMD) $(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \
|
+$(WRAPCMD) $(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \
|
||||||
--out $@ \
|
--out $@ \
|
||||||
@@ -66,6 +71,13 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
|
|||||||
|
|
||||||
# --assembly-copyright "2003" \
|
# --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
|
#Version changes
|
||||||
#incompatible change from 1.0.0.0 -> 1.1.0.0
|
#incompatible change from 1.0.0.0 -> 1.1.0.0
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user