[Libreoffice-commits] .: configure.in instsetoo_native/util set_soenv.in

[Andras Timar]

 configure.in                      |   19 +++++++++++++++++++
 instsetoo_native/util/makefile.mk |    8 ++++++++
 set_soenv.in                      |    1 +
 3 files changed, 28 insertions(+)

New commits:
commit 70a55ac39511fba746db26cede8ce97bc01af461
Author: Andras Timar <atimar at novell.com>
Date:   Fri Apr 29 23:33:26 2011 +0200

    introducing --enable-release-build configure switch - fdo#36437
    
    and default is dev build

diff --git a/configure.in b/configure.in
index a23eaa3..d777527 100755
--- a/configure.in
+++ b/configure.in
@@ -477,6 +477,12 @@ AC_ARG_ENABLE(lomenubar,
 	[Enable global menu support.]),
 ,)
 
+AC_ARG_ENABLE(release-build,
+    AS_HELP_STRING([--enable-release-build],
+        [Enable release build.
+         See http://wiki.documentfoundation.org/DevBuild]),
+,)
+
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
 dnl ===================================================================
@@ -7424,6 +7430,19 @@ fi
 AC_SUBST(ENABLE_LOMENUBAR)
 
 dnl ===================================================================
+dnl Test whether build target is Release Build
+dnl ===================================================================
+AC_MSG_CHECKING([whether build target is Release Build])
+if test "z$enable_release_build" = "z" -o "z$enable_release_build" = "zno" ; then
+  AC_MSG_RESULT([no])
+  ENABLE_RELEASE_BUILD="FALSE"
+else
+  AC_MSG_RESULT([yes])
+  ENABLE_RELEASE_BUILD="TRUE"
+fi
+AC_SUBST(ENABLE_RELEASE_BUILD)
+
+dnl ===================================================================
 dnl Test whether to enable ActiveX embedding
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e8b757c..5672bf2 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -88,11 +88,19 @@ ALLTAR  : $(LOCALPYFILES)
     @echo "No EPM: do no packaging at this stage"
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
 ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack)
 .ELSE
 ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
 .ENDIF
+.ELSE
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack)
+.ELSE
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
+.ENDIF
+.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
diff --git a/set_soenv.in b/set_soenv.in
index a34b802..6816cbb 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1803,6 +1803,7 @@ ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
 ToFile( "ENABLE_ZENITY",           "@ENABLE_ZENITY@",          "e" );
 ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
 ToFile( "ENABLE_UGLY",       "@ENABLE_UGLY@",      "e" );
+ToFile( "ENABLE_RELEASE_BUILD", "@ENABLE_RELEASE_BUILD@", "e" );
 ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
 ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {