configure.ac | 26 +++++++++++++------------- desktop/Package_branding.mk | 2 +- instsetoo_native/CustomTarget_install.mk | 6 +++--- swext/Module_swext.mk | 2 +- xsltml/Module_xsltml.mk | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-)
New commits: commit c871c0695cd4683327188d9c7e4daeba7d55d795 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 13:28:48 2013 -0500 ENABLE_MEDIAWIKI Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I4561c2cd3b937cbd0085d1e94930d5f458281d11 Reviewed-on: https://gerrit.libreoffice.org/5704 Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> Tested-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/configure.ac b/configure.ac index b2ab0ef1..eecd4d4 100644 --- a/configure.ac +++ b/configure.ac @@ -10281,19 +10281,19 @@ AC_SUBST(POPPLER_LIBS) AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then AC_MSG_RESULT([yes]) - ENABLE_MEDIAWIKI=YES + ENABLE_MEDIAWIKI=TRUE BUILD_TYPE="$BUILD_TYPE XSLTML" if test "x$with_java" = "xno"; then AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.]) fi else AC_MSG_RESULT([no]) - ENABLE_MEDIAWIKI=NO + ENABLE_MEDIAWIKI= SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI" fi AC_SUBST(ENABLE_MEDIAWIKI) -if test "$ENABLE_MEDIAWIKI" = "YES"; then +if test "$ENABLE_MEDIAWIKI" = "TRUE"; then AC_MSG_CHECKING([which Servlet API Jar to use]) if test "$with_system_servlet_api" = "yes"; then AC_MSG_RESULT([external]) @@ -10506,12 +10506,12 @@ AC_SUBST(LIBSERIALIZER_JAR) # this has to be here because both the Wiki Publisher and the SRB use # commons-logging -if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then +if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES AC_MSG_RESULT([external]) - if test "$ENABLE_MEDIAWIKI" = "YES"; then + if test "$ENABLE_MEDIAWIKI" = "TRUE"; then if test -z $COMMONS_CODEC_JAR; then AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar, [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ], @@ -10557,7 +10557,7 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) fi fi - if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then + if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then if test -z $COMMONS_LOGGING_JAR; then AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], @@ -11800,7 +11800,7 @@ EOF AC_MSG_ERROR([no, you need at least Ant >= $ant_minver]) fi - if test "$ENABLE_MEDIAWIKI" = "YES"; then + if test "$ENABLE_MEDIAWIKI" = "TRUE"; then AC_MSG_CHECKING([whether Ant supports mapper type="regexp"]) rm -rf confdir mkdir confdir diff --git a/swext/Module_swext.mk b/swext/Module_swext.mk index 0d48229..0a5462c 100644 --- a/swext/Module_swext.mk +++ b/swext/Module_swext.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,swext)) -ifeq ($(ENABLE_MEDIAWIKI),YES) +ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,swext,\ Jar_mediawiki \ Configuration_mediawiki \ diff --git a/xsltml/Module_xsltml.mk b/xsltml/Module_xsltml.mk index 68de9f2..2f2bd12 100644 --- a/xsltml/Module_xsltml.mk +++ b/xsltml/Module_xsltml.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,xsltml)) -ifeq ($(ENABLE_MEDIAWIKI),YES) +ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,xsltml,\ ExternalPackage_xsltml \ commit ac5f2f3481a318cadd7c59e7ea89401f81e9a259 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 13:18:04 2013 -0500 ENABLE_RELEASE_BUILD Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I7387ff3d3adf9a4e7c15466076e9d84d4892bb3e Reviewed-on: https://gerrit.libreoffice.org/5703 Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> Tested-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/configure.ac b/configure.ac index be7ddd7..b2ab0ef1 100644 --- a/configure.ac +++ b/configure.ac @@ -1983,10 +1983,10 @@ dnl =================================================================== AC_MSG_CHECKING([whether build target is Release Build]) if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then AC_MSG_RESULT([no]) - ENABLE_RELEASE_BUILD="FALSE" + ENABLE_RELEASE_BUILD= else AC_MSG_RESULT([yes]) - ENABLE_RELEASE_BUILD="TRUE" + ENABLE_RELEASE_BUILD=TRUE fi AC_SUBST(ENABLE_RELEASE_BUILD) @@ -5112,11 +5112,11 @@ find_msms() msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -u "$msmdir"` if test -z "$msmdir"; then - if test "$ENABLE_RELEASE_BUILD" = "FALSE" ; then + if test "$ENABLE_RELEASE_BUILD" = "TRUE" ; then + AC_MSG_ERROR([Merge modules not found in $msmdir]) + else AC_MSG_WARN([Merge modules not found in $msmdir]) msmdir="" - else - AC_MSG_ERROR([Merge modules not found in $msmdir]) fi else msms="Microsoft_VC${VCVER}_CRT_x86.msm" @@ -11191,7 +11191,7 @@ AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then with_theme="crystal default hicontrast oxygen tango sifr" - test "$ENABLE_RELEASE_BUILD" = "FALSE" && with_theme="$with_theme tango_testing" + test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing" fi WITH_THEMES="" diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index c8739fa..5d7dbf5 100644 --- a/desktop/Package_branding.mk +++ b/desktop/Package_branding.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR))) $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\ $(if $(filter intro.png,$(image)),\ - $(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\ + $(if $(ENABLE_RELEASE_BUILD),brand,brand_dev)/$(image),\ brand/$(image) \ ) \ ) \ diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 5045b5a..0aeb5f7 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -79,7 +79,7 @@ $(foreach pkgformat,$(5),\ && $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \ + -p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \ -u $(instsetoo_OUT) \ -buildid $(LIBO_VERSION_PATCH) \ $(if $(filter WNT,$(OS)), \ @@ -97,12 +97,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_DEV_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt rmdir $(DEVINSTALLDIR)/LibreOffice*_archive ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(DEVINSTALLDIR)/opt/ rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits