mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli_ure: Win32 make quoting problem, use sed to work around

Browse Source 
Change-Id: Ide8a3c574a1904e08921684453256d1d3c98fd78
This commit is contained in:
Michael Stahl
2014-06-02 01:27:53 +02:00
parent f5111df1f4
commit 637b0ef1b5
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli_ure/CustomTarget_cli_ure_assemblies.mk
View File

@@ -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:

1
cli_ure/source/basetypes/assembly.cs
View File

@@ -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@" )]

1
cli_ure/source/native/assembly.cxx
View File

@@ -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: */

1
cli_ure/source/ure/assembly.cs
View File

@@ -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@" )]