[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk cli_ure/source solenv/gbuild

[Matus Kukan]

 cli_ure/CustomTarget_cli_ure_assemblies.mk |    6 +++---
 cli_ure/source/native/path.cxx             |    2 +-
 solenv/gbuild/CliLibrary.mk                |    1 -
 solenv/gbuild/platform/WNT_INTEL_MSC.mk    |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit d8fc82680dd530ed201cfa0eb4491c093469e191
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Aug 6 23:21:49 2012 +0200

    force cli_ure to build
    
    - there is still missing dependency on cliuno.snk
    - remove -warnaserror+ causing weird problem
    - export random symbol so that we get icli_cppuhelper_native.lib file
      created
    
    Change-Id: Ifd3b4785f83496d2c9bff6b1ea2fd39b6978725c

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 6773848..da66178 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -43,20 +43,20 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
 	$(GNUCOPY) $< $@.tmp && \
 	echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \
-	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(OUTDIR)/bin/cliuno.snk" )]' >> $@.tmp &&) \
+	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.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 && \
-	echo '[assembly:System::Reflection::AssemblyKeyFile( "$(OUTDIR)/bin/cliuno.snk" )];' >> $@.tmp && \
+	echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )];' >> $@.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 && \
-	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(OUTDIR)/bin/cliuno.snk" )]' >> $@.tmp &&) \
+	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \
 	mv $@.tmp $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 087e0cf..97c7f36 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -30,7 +30,7 @@
 
 namespace cli_ure {
 
-WCHAR * filename(WCHAR * path) {
+SAL_DLLPUBLIC_EXPORT WCHAR * filename(WCHAR * path) {
     WCHAR * f = path;
     for (WCHAR * p = path;;) {
         switch (*p++) {
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index bf2c88c..9cf6bd5 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -13,7 +13,6 @@ gb_CliLibraryTarget_EXT := $(gb_CliAssembly_POLICYEXT)
 
 gb_CliLibraryTarget_CSCFLAGS := \
 	-noconfig \
-	-warnaserror+
 
 gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
 	-checked+ \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index bf44b79..8b03099 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -738,7 +738,7 @@ gb_InstallScript_EXT := .inf
 # CliAssemblyTarget class
 
 gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
-gb_CliAssemblyTarget_get_dll = $(gb_Library_OUTDIRLOCATION)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
+gb_CliAssemblyTarget_get_dll = $(OUTDIR)/bin/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
 
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"