INTEGRATION: CWS jl30 (1.13.14); FILE MERGED

2006/01/27 15:16:54 jl 1.13.14.1: #61051# new versions offor assemblies and qa/versions test
This commit is contained in:
Kurt Zenker 2006-02-03 16:16:19 +00:00
parent 7d106316a5
commit 62fa8ff576

View File

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.13 $
# $Revision: 1.14 $
#
# last change: $Author: rt $ $Date: 2005-11-11 10:21:57 $
# last change: $Author: kz $ $Date: 2006-02-03 17:16:18 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -64,7 +64,7 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
+$(WRAPCMD) $(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \
--out $@ \
--keyfile $(BIN)$/cliuno.snk \
--assembly-version "1.1.1.0" \
--assembly-version "1.1.2.0" \
--assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
--assembly-company "OpenOffice.org" \
$(SOLARBINDIR)$/types_doc.rdb
@ -75,7 +75,7 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
$(OUT)$/bin$/$(POLICYASSEMBLY) : cli_types.config
+$(COPY) cli_types.config $(OUT)$/bin
+$(WRAPCMD) AL.exe -out:$@ \
-version:1.0.0.0 \
-version:2.0.0.0 \
-keyfile:$(BIN)$/cliuno.snk \
-link:cli_types.config
#Version changes