Commit Graph

14 Commits

Author SHA1 Message Date
Michael Stahl
0d2542d67a gbuild, cli_ure: Win32 make issues with back and forward slashes
It looks like what works is to give the source file names with
backslashes but everything else with forward slashes?

Change-Id: Iaf910ab5fc41984d1315a30b164a334d28344c16
2014-06-09 17:05:53 +02:00
Matúš Kukan
85d1e39d74 gbuild: Fix and check package dependencies.
Change-Id: Ia54def7a404e07974eb1e8a556f4659cd974e7f8
Reviewed-on: https://gerrit.libreoffice.org/7081
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
2013-12-17 06:26:29 +00:00
Michael Stahl
968c735aa7 gbuild: refactor CliLibrary
- stop copying the DLL to OUTDIR
- since that was the main reason for the separation between
  CliLibrary and CliLibraryTarget, merge the targets;
  the newly inherited variables are not expected to cause problems
- hardcode target to URE bin dir for now, no immediate need for
  multiple layers

Change-Id: If0fea1337349c41f231c8cde122852c71d5080a7
2013-10-28 14:01:08 +01:00
Michael Stahl
4ac934946e cli_ure: cleanup in Library_cli_cppuhelper_native
Change-Id: I76b4815208354e78eb3575982235b6f26f1e02fd
2013-09-22 11:08:31 +02:00
Michael Stahl
c9eac7a838 cli_ure: remove obsolete USE_DEBUG_RUNTIME check for msvcmrt
This is handled in com_MSC_class.mk now.

Change-Id: I5e4c2e791e9acd623d7c5ce352b5c39b6cb939b4
2013-04-19 00:30:12 +02:00
Peter Foley
a7ef93ed1b drop executable bit
Change-Id: I092a8183b7aa044cc6e55df91ac1109e269d8b8e
2012-12-29 09:57:54 -05:00
David Ostrovsky
8865b7f013 fdo#55290: use the right native library name
It turns out that the native library cannot be renamed after creation.
The right name must be used from the beginning, otherwise
publishing is failing with the follow error (gacutil -i):

"Failure adding assembly to the cache: Invalid file or assembly name.
The name of the file must be the name of the assembly plus .dll or .exe."

To rectify that create the native lib as cli_cppuhelper.dll,
rename the signed assembly to assembly/cli_cppuhelper.dll and
teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll
(and not cli_cppuhelper.dll).

Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
2012-10-28 23:15:22 +01:00
Peter Foley
f61e81a6ef fix warnings in cli_ure
Change-Id: I4e081473612403e0bf277e8dbf5f1b9a15541dd7
2012-10-24 10:19:51 -04:00
David Tardon
40a4c469df fdo#55290 do not use resource file for assembly libs
I am not sure this really fixes the problem, but it is the only
difference between dmake and gbuild builds I can see.

Change-Id: I96fa4120dc2a8221a75e150a62582aebda98f505
2012-10-16 13:25:38 +02:00
Peter Foley
a4df4e9147 convert cli_ure/source/native to new syntax
Change-Id: I7dbb065c8b1b2fef85e6e7f42ef80991102785e0
2012-10-07 10:42:11 +02:00
Michael Stahl
dc397aae70 gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:
add a new gb_LinkTarget_use_system_win32_libs to abstract different
linker options on MSVC and GCC.

Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
2012-09-28 16:49:08 +02:00
Stephan Bergmann
7e57c7670b Typo
Change-Id: Ibd19e82a41ceac76ec5c3d6059f497926b8b5d0e
2012-09-24 17:02:26 +02:00
Matúš Kukan
fc42bf93bf cli_ure: another missing dep
Change-Id: I3f7d0034500b52e363f5cc3e136b89a5d75aab64
2012-09-22 08:15:25 +02:00
David Tardon
118cc6807d gbuildize cli_ure
Change-Id: I716d666fc6e9d5339bc65a1b3943b2cecf45b6fe
2012-09-22 08:15:23 +02:00