diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 11:44:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 11:44:09 +0000 |
| commit | ea6bc1e6afd4c8f902f4e2da3924a90bd1c73ecf (patch) | |
| tree | 69b3ee6e65aa1fc837e6aaf191c0ddd62faa4d3c /cli_ure | |
| parent | e591a08dc3d37e13703c855a7f4056faa4e34406 (diff) | |
CWS-TOOLING: integrate CWS jl115
2009-01-29 13:13:16 +0100 jsk r267121 : #i98596#
2009-01-23 14:50:24 +0100 jl r266821 : #98273# climaker.exe.config prevents using publisher policy
2009-01-23 14:10:51 +0100 jl r266817 : #i98392# wrong use of iterator when removing a factory, which may lead to a crash
2009-01-19 11:36:29 +0100 jl r266484 : #i96690# test extension
2009-01-19 11:32:46 +0100 jl r266483 : #i96690#
2009-01-16 17:09:19 +0100 jl r266439 : #i96690# ignore duplicate path URLs in manifest.xml. These may be introduces by copy/paste and lead to nasty errors
2009-01-16 14:04:00 +0100 jl r266416 : #i92032# increasing minimum version of Java
2009-01-16 10:57:02 +0100 jl r266407 : #i96816# compiler warning breaks build
2009-01-15 16:58:54 +0100 jl r266384 : #i94938# patch from cmc.
2009-01-15 16:35:18 +0100 jl r266383 : #i95838# applying patch
2009-01-15 16:15:58 +0100 jl r266381 : #i70855# #i96102# WaitForMultipleObjects wrong implemented
2009-01-14 12:46:21 +0100 jl r266287 : #i98038# increased assembly versions
2009-01-14 12:44:55 +0100 jl r266285 : #i98038# increased assembly versions
2009-01-13 17:11:20 +0100 jl r266239 : #i98038# new test library for assemblies from 3.0.1
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/climaker/climaker.exe.config | 10 | ||||
| -rw-r--r-- | cli_ure/source/climaker/makefile.mk | 11 | ||||
| -rw-r--r-- | cli_ure/version/version.txt | 24 |
3 files changed, 33 insertions, 12 deletions
diff --git a/cli_ure/source/climaker/climaker.exe.config b/cli_ure/source/climaker/climaker.exe.config new file mode 100644 index 000000000000..5ff03513900c --- /dev/null +++ b/cli_ure/source/climaker/climaker.exe.config @@ -0,0 +1,10 @@ +<?xml version="1.0"?>
+<configuration>
+ <runtime>
+ <gcConcurrent enabled="true" />
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <publisherPolicy apply="no" />
+ <probing privatePath="" />
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk index 7da7564a147e..51da0d89f547 100644 --- a/cli_ure/source/climaker/makefile.mk +++ b/cli_ure/source/climaker/makefile.mk @@ -116,6 +116,17 @@ APP1STDLIBS += \ .INCLUDE : $(PRJ)$/util$/target.pmk .INCLUDE : target.mk +CLIMAKER_CONFIG = $(BIN)$/climaker.exe.config + +ALLTAR: \ + $(CLIMAKER_CONFIG) + + + +#Create the config file that is used with the policy assembly +$(CLIMAKER_CONFIG): climaker.exe.config + $(GNUCOPY) -p $< $@ + .IF "$(BUILD_FOR_CLI)" != "" $(OBJFILES): $(BIN)$/cli_basetypes.dll diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt index 7e81c58e3277..a5b40dde8d0c 100644 --- a/cli_ure/version/version.txt +++ b/cli_ure/version/version.txt @@ -29,23 +29,23 @@ # #************************************************************************* -CLI_URETYPES_NEW_VERSION=1.0.1.0 -CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.0.0 -CLI_URETYPES_POLICY_VERSION=1.1.0.0 +CLI_URETYPES_NEW_VERSION=1.0.2.0 +CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.1.0 +CLI_URETYPES_POLICY_VERSION=2.0.0.0 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes -CLI_BASETYPES_NEW_VERSION=1.0.12.0 -CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.11.0 -CLI_BASETYPES_POLICY_VERSION=12.0.0.0 +CLI_BASETYPES_NEW_VERSION=1.0.13.0 +CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.12.0 +CLI_BASETYPES_POLICY_VERSION=13.0.0.0 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes -CLI_URE_NEW_VERSION=1.0.15.0 -CLI_URE_OLD_VERSION=1.0.0.0-1.0.14.0 -CLI_URE_POLICY_VERSION=15.0.0.0 +CLI_URE_NEW_VERSION=1.0.16.0 +CLI_URE_OLD_VERSION=1.0.0.0-1.0.15.0 +CLI_URE_POLICY_VERSION=16.0.0.0 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure -CLI_CPPUHELPER_NEW_VERSION=1.0.15.0 -CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.14.0 -CLI_CPPUHELPER_POLICY_VERSION=15.0.0.0 +CLI_CPPUHELPER_NEW_VERSION=1.0.16.0 +CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.15.0 +CLI_CPPUHELPER_POLICY_VERSION=16.0.0.0 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper |