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

ENABLE_RELEASE_BUILD Harmonize ENABLE_* variable to TRUE/<nothing>

Change-Id: I7387ff3d3adf9a4e7c15466076e9d84d4892bb3e
Reviewed-on: https://gerrit.libreoffice.org/5703Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst d5d721a1
...@@ -1983,10 +1983,10 @@ dnl =================================================================== ...@@ -1983,10 +1983,10 @@ dnl ===================================================================
AC_MSG_CHECKING([whether build target is Release Build]) AC_MSG_CHECKING([whether build target is Release Build])
if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_RELEASE_BUILD="FALSE" ENABLE_RELEASE_BUILD=
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_RELEASE_BUILD="TRUE" ENABLE_RELEASE_BUILD=TRUE
fi fi
AC_SUBST(ENABLE_RELEASE_BUILD) AC_SUBST(ENABLE_RELEASE_BUILD)
...@@ -5112,11 +5112,11 @@ find_msms() ...@@ -5112,11 +5112,11 @@ find_msms()
msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -d "$msmdir"`
msmdir=`cygpath -u "$msmdir"` msmdir=`cygpath -u "$msmdir"`
if test -z "$msmdir"; then 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]) AC_MSG_WARN([Merge modules not found in $msmdir])
msmdir="" msmdir=""
else
AC_MSG_ERROR([Merge modules not found in $msmdir])
fi fi
else else
msms="Microsoft_VC${VCVER}_CRT_x86.msm" msms="Microsoft_VC${VCVER}_CRT_x86.msm"
...@@ -11191,7 +11191,7 @@ AC_MSG_CHECKING([which themes to include]) ...@@ -11191,7 +11191,7 @@ AC_MSG_CHECKING([which themes to include])
# if none given use default subset of available themes # if none given use default subset of available themes
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
with_theme="crystal default hicontrast oxygen tango sifr" 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 fi
WITH_THEMES="" WITH_THEMES=""
......
...@@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR))) ...@@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\
$(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
$(if $(filter intro.png,$(image)),\ $(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) \ brand/$(image) \
) \ ) \
) \ ) \
......
...@@ -79,7 +79,7 @@ $(foreach pkgformat,$(5),\ ...@@ -79,7 +79,7 @@ $(foreach pkgformat,$(5),\
&& $(PERL) -w $< \ && $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ -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) \ -u $(instsetoo_OUT) \
-buildid $(LIBO_VERSION_PATCH) \ -buildid $(LIBO_VERSION_PATCH) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
...@@ -97,12 +97,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: ...@@ -97,12 +97,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT) rm -rf $(instsetoo_OUT)
ifeq (TRUE,$(LIBO_DEV_INSTALL)) ifeq (TRUE,$(LIBO_DEV_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive) $(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 mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) $(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 \ mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
$(DEVINSTALLDIR)/opt/ $(DEVINSTALLDIR)/opt/
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
......
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