Kaydet (Commit) 5b7dff55 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

ENABLE_MACOSX_SANDBOX Harmonize ENABLE_* variable to TRUE/<nothing>

Change-Id: Ice05796a9887c4ff311b78fcddd9820e0f06e7f1
Reviewed-on: https://gerrit.libreoffice.org/5708Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst aa05e128
......@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,apple_remote))
ifeq ($(OS),MACOSX)
ifneq ($(ENABLE_MACOSX_SANDBOX),YES)
ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call gb_Module_add_targets,apple_remote,\
Library_AppleRemote \
))
......
......@@ -2781,7 +2781,7 @@ if test $_os = Darwin; then
elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then
AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java])
elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
ENABLE_MACOSX_SANDBOX=YES
ENABLE_MACOSX_SANDBOX=TRUE
AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX)
AC_MSG_RESULT([yes])
else
......@@ -2853,7 +2853,7 @@ fi
AC_MSG_CHECKING([whether to treat the installation as read-only])
if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = YES \) -o \
if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = TRUE \) -o \
"$enable_extensions" != yes; then
enable_readonly_installset=yes
fi
......
......@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
$(eval $(call gb_CppunitTest_use_ure,smoketest))
ifeq ($(ENABLE_MACOSX_SANDBOX),YES)
ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE)
userinstallation=$(shell $(gb_DEVINSTALLROOT)/MacOS/soffice --nstemporarydirectory)
else
userinstallation=$(WORKDIR)/CustomTarget/smoketest
......
......@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_check_targets,smoketest,\
))
endif
ifneq (MACOSX/YES,$(OS)/$(ENABLE_MACOSX_SANDBOX))
ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
CppunitTest_smoketest \
))
......
......@@ -68,7 +68,7 @@ done
#
# At this stage we also attach the entitlements in the sandboxing case
if test $ENABLE_MACOSX_SANDBOX = YES; then
if test $ENABLE_MACOSX_SANDBOX = TRUE; then
entitlements="--entitlements $BUILDDIR/lo.xcent"
fi
......
......@@ -450,7 +450,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
CoreFoundation \
))
ifneq ($(ENABLE_MACOSX_SANDBOX),YES)
ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call gb_Library_use_libraries,vcl,\
AppleRemote \
))
......
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