apple_remote/Module_apple_remote.mk | 2 +- configure.ac | 10 +++++----- scp2/source/extensions/directory_extensions.scp | 2 +- scp2/source/extensions/file_extensions.scp | 2 +- scp2/source/extensions/module_extensions.scp | 2 +- sdext/Module_sdext.mk | 2 +- smoketest/CppunitTest_smoketest.mk | 2 +- smoketest/Module_smoketest.mk | 2 +- solenv/bin/macosx-codesign-app-bundle | 2 +- vcl/Library_vcl.mk | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit 5b7dff553cf51ecc3d21a2231861390d16ccf0eb Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 14:29:14 2013 -0500 ENABLE_MACOSX_SANDBOX Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: Ice05796a9887c4ff311b78fcddd9820e0f06e7f1 Reviewed-on: https://gerrit.libreoffice.org/5708 Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> Tested-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk index 5313df3..d534ad2 100644 --- a/apple_remote/Module_apple_remote.mk +++ b/apple_remote/Module_apple_remote.mk @@ -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 \ )) diff --git a/configure.ac b/configure.ac index d828288..f613f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 3ab4ce5..1bc9dae 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -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 diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 52962a2..ab06c82 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -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 \ )) diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index cbe9fa0..e00b1b5 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -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 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e37ec15..f82fd87 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -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 \ )) commit aa05e128de6a8dd0382d0c324676c728dc347ac0 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 13:40:33 2013 -0500 ENABLE_MINIMIZER Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I10c52844c6e83f6b88cf736c03d93e710a69432a Reviewed-on: https://gerrit.libreoffice.org/5705 Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> Tested-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/configure.ac b/configure.ac index eecd4d4..d828288 100644 --- a/configure.ac +++ b/configure.ac @@ -10230,11 +10230,11 @@ AC_SUBST(ENABLE_OPENCL) AC_MSG_CHECKING([whether to build the Presentation Minimizer extension]) if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then AC_MSG_RESULT([yes]) - ENABLE_MINIMIZER=YES + ENABLE_MINIMIZER=TRUE + SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MINIMIZER" else AC_MSG_RESULT([no]) - ENABLE_MINIMIZER=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER" + ENABLE_MINIMIZER= fi AC_SUBST(ENABLE_MINIMIZER) diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 75951f2..ebad203 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -24,7 +24,7 @@ /* ** Presentation Minimizer ** */ -#ifndef WITHOUT_EXTENSION_MINIMIZER +#ifdef WITH_EXTENSION_MINIMIZER Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer ParentID = gid_Brand_Dir_Share_Extensions; diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 29ecc21..01ea8b1 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -24,7 +24,7 @@ /* ** Presentation Minimizer ** */ -#ifndef WITHOUT_EXTENSION_MINIMIZER +#ifdef WITH_EXTENSION_MINIMIZER File gid_File_Oxt_Presentation_Minimizer TXT_FILE_BODY; diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 1c7c7c7..c024341 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -33,7 +33,7 @@ End /* ** Presentation Minimizer ** */ -#ifndef WITHOUT_EXTENSION_MINIMIZER +#ifdef WITH_EXTENSION_MINIMIZER Module gid_Module_Optional_Extensions_MINIMIZER PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER); diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 60d74fc..c6e48d6 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,sdext,\ Library_PresenterScreen \ )) -ifeq ($(ENABLE_MINIMIZER),YES) +ifeq ($(ENABLE_MINIMIZER),TRUE) $(eval $(call gb_Module_add_targets,sdext,\ Configuration_minimizer \ Extension_minimizer \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits