diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-02 01:27:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-09 17:05:52 +0200 |
| commit | 637b0ef1b5ecc63c28656df4feac47fb0d009027 (patch) | |
| tree | c7783b4968b5704d258d29f704d4d28cdd402a38 /cli_ure | |
| parent | f5111df1f440bdd822f19ed26cd5cc983a57c2d1 (diff) | |
cli_ure: Win32 make quoting problem, use sed to work around
Change-Id: Ide8a3c574a1904e08921684453256d1d3c98fd78
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/CustomTarget_cli_ure_assemblies.mk | 12 | ||||
| -rw-r--r-- | cli_ure/source/basetypes/assembly.cs | 1 | ||||
| -rw-r--r-- | cli_ure/source/native/assembly.cxx | 1 | ||||
| -rw-r--r-- | cli_ure/source/ure/assembly.cs | 1 |
4 files changed, 9 insertions, 6 deletions
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index 63bbe1fac2e1..260a52b25fec 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -37,19 +37,19 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \ | $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : - $(GNUCOPY) $< $@.tmp && \ - echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \ + sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" \ + < $< > $@.tmp && \ mv $@.tmp $@ # TODO use macros for this $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : - $(GNUCOPY) $< $@.tmp && \ - echo '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' >> $@.tmp && \ + sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" \ + < $< > $@.tmp && \ mv $@.tmp $@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : - $(GNUCOPY) $< $@.tmp && \ - echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)" )]' >> $@.tmp && \ + sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" \ + < $< > $@.tmp && \ mv $@.tmp $@ # vim: set noet sw=4 ts=4: diff --git a/cli_ure/source/basetypes/assembly.cs b/cli_ure/source/basetypes/assembly.cs index 7cba65d9350f..ac99fffd8dd4 100644 --- a/cli_ure/source/basetypes/assembly.cs +++ b/cli_ure/source/basetypes/assembly.cs @@ -18,3 +18,4 @@ [assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )] [assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )] +[assembly:System.Reflection.AssemblyVersion( "@CLI_BASETYPES_NEW_VERSION@" )] diff --git a/cli_ure/source/native/assembly.cxx b/cli_ure/source/native/assembly.cxx index 73345b94b895..521f5a4842b1 100644 --- a/cli_ure/source/native/assembly.cxx +++ b/cli_ure/source/native/assembly.cxx @@ -21,5 +21,6 @@ [assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )]; [assembly:System::Reflection::AssemblyDelaySign(true)]; [assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )]; +[assembly:System::Reflection::AssemblyVersion( "@CLI_CPPUHELPER_NEW_VERSION@" )]; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cli_ure/source/ure/assembly.cs b/cli_ure/source/ure/assembly.cs index 32169581a1d2..1b946180d931 100644 --- a/cli_ure/source/ure/assembly.cs +++ b/cli_ure/source/ure/assembly.cs @@ -18,3 +18,4 @@ [assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )] [assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )] +[assembly:System.Reflection.AssemblyVersion( "@CLI_URE_NEW_VERSION@" )] |