Kaydet (Commit) b3db695a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

SDK: Split PLATFORMID at build time rather than runtime

...where $(shell printf ...) in settings.mk likely doesn't work on Windows.

Change-Id: I64a51203d1bf131160768f9a9069f428228aa6b1
üst 53351ad6
......@@ -13,7 +13,9 @@ $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
tr -d "\015" < $< | sed -e 's/@@PLATFORMID@@/$(PLATFORMID)/' \
tr -d "\015" < $< | sed \
-e 's/@@PLATFORM@@/$(firstword $(subst _, ,$(PLATFORMID)))/' \
-e 's/@@PROCTYPE@@/$(subst $(WHITESPACE),_,$(wordlist 2,$(words $(subst _, ,$(PLATFORMID))),$(subst _, ,$(PLATFORMID))))/' \
-e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
-e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \
-e 's/@@ENABLE_DBGUTIL@@/$(ENABLE_DBGUTIL)/' > $@
......
PLATFORMID=@@PLATFORMID@@
PLATFORM=@@PLATFORM@@
PROCTYPE=@@PROCTYPE@@
SDKVERSION=@@RELEASE@@
BUILDID=@@BUILDID@@
LIBO_SDK_ENABLE_DBGUTIL=@@ENABLE_DBGUTIL@@
......@@ -21,10 +21,6 @@
include $(OO_SDK_HOME)/settings/dk.mk
# test for the platform
PLATFORM := $(shell printf '%s' $(PLATFORMID) | cut -f 1 -d _)
PROCTYPE := $(shell printf '%s' $(PLATFORMID) | cut -f 2- -d _)
# debug option, default is no debug
DEBUG=no
ifeq "$(MAKECMDGOALS)" "debug"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment