diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-05 07:37:48 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-09 07:42:29 +0200 |
| commit | 009d6c69eafea1d2bd21d15a3266aefd82e40d45 (patch) | |
| tree | ba0fbd88d2c5bc096ef07e1521dbe2911afd4adc /solenv | |
| parent | 3abc7880e0e09b1a74922067707b37ef45462479 (diff) | |
move platform-specific settings to platform
Change-Id: I99bf341df0a8cfe25f0821c8d21d3e27f3b12ea4
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 4 |
7 files changed, 27 insertions, 5 deletions
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index c4ee6498a61f..428c2d4ce74c 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -27,12 +27,10 @@ # ExtensionTarget class +# platform +# gb_ExtensionTarget_LICENSEFILE_DEFAULT + gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q) -ifeq ($(GUI),WNT) -gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt -else -gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE -endif gb_ExtensionTarget_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex) gb_ExtensionTarget_XRMEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_XRMEXTARGET) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index b1f5d6d0d8c3..27c9d6440c46 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -322,6 +322,10 @@ gb_ScpConvertTarget_ScpConvertTarget_platform := gb_InstallScript_EXT := .ins +# ExtensionTarget class + +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE + # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 81d6226aba13..180c35cb3bf6 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -460,6 +460,10 @@ endef gb_InstallScript_EXT := .inf +# ExtensionTarget class + +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt + # Python gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload" diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index a060cc8f048f..0c0c98fd64c5 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -731,6 +731,10 @@ endef gb_InstallScript_EXT := .inf +# ExtensionTarget class + +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt + # 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" diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 084c4c02c015..47c9771052aa 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -431,6 +431,10 @@ gb_ScpConvertTarget_ScpConvertTarget_platform := gb_InstallScript_EXT := .ins +# ExtensionTarget class + +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE + # Python gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 2532c1999bd9..bf582c2def0b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -430,6 +430,10 @@ gb_ScpConvertTarget_ScpConvertTarget_platform := gb_InstallScript_EXT := .ins +# ExtensionTarget class + +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index ed73734e872a..555aab1c7e87 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -432,6 +432,10 @@ gb_ScpConvertTarget_ScpConvertTarget_platform := gb_InstallScript_EXT := .ins +# ExtensionTarget class + +gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload |