You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/02/24 06:01:22 UTC
svn commit: r1293078 - in /incubator/ooo/trunk/main: configure.in
extensions/source/update/check/makefile.mk
postprocess/packcomponents/makefile.mk postprocess/packregistry/makefile.mk
scp2/source/ooo/common_brand.scp scp2/util/makefile.mk set_soenv.in
Author: arielch
Date: Fri Feb 24 05:01:22 2012
New Revision: 1293078
URL: http://svn.apache.org/viewvc?rev=1293078&view=rev
Log:
Enable or disable Online Update in configure
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk
incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk
incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
incubator/ooo/trunk/main/scp2/util/makefile.mk
incubator/ooo/trunk/main/set_soenv.in
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Feb 24 05:01:22 2012
@@ -46,6 +46,9 @@ AC_ARG_ENABLE(graphite,
AC_ARG_WITH(system-graphite,
[ --with-system-graphite use graphite library already installed on system
],,)
+AC_ARG_ENABLE(online-update,
+[ --disable-online-update Disables the Online Update feature.
+],,enable_online_update=yes)
AC_ARG_ENABLE(ldap,
[ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
or OpenLDAP LDAP SDK
@@ -1342,6 +1345,20 @@ fi
# gstreamer is used only via pre-installed libraries: not a problem
+dnl ===================================================================
+dnl Online Update
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable the Online Update support])
+if test "$enable_online_update" = "yes" -o "$enable_online_update" = "TRUE"; then
+ ENABLE_ONLINE_UPDATE="YES"
+ SCPDEFS="$SCPDEFS -DENABLE_ONLINE_UPDATE"
+ AC_MSG_RESULT([yes])
+else
+ ENABLE_ONLINE_UPDATE=""
+ AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_ONLINE_UPDATE)
+
AC_MSG_CHECKING([whether to enable native CUPS support])
if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
Modified: incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk (original)
+++ incubator/ooo/trunk/main/extensions/source/update/check/makefile.mk Fri Feb 24 05:01:22 2012
@@ -26,6 +26,12 @@ PRJNAME=extensions
TARGET=updchk
PACKAGE=org.openoffice.Office
+
+.IF "$(ENABLE_ONLINE_UPDATE)" != "YES"
+@all:
+ @echo "Online Update disabled."
+.ELSE
+
LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
@@ -140,3 +146,5 @@ $(MISC)/updchk.uno.component .ERRREMOVE
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
+
+.ENDIF # "$(ENABLE_ONLINE_UPDATE)" == "YES"
Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Fri Feb 24 05:01:22 2012
@@ -163,7 +163,6 @@ my_components = \
ucptdoc1 \
updatefeed \
updchk \
- updchk.uno \
utl \
uui \
vbaevents \
@@ -187,6 +186,10 @@ my_components += component/vcl/vcl.unx
.ENDIF
.ENDIF
+.IF "$(ENABLE_ONLINE_UPDATE)"=="YES"
+my_components += updchk.uno
+.END
+
.IF "$(BUILD_SPECIAL)" != ""
my_components += oooimprovement
.END
Modified: incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packregistry/makefile.mk Fri Feb 24 05:01:22 2012
@@ -42,7 +42,6 @@ MY_XCDS = \
$(MISC)/lingucomponent.xcd \
$(MISC)/main.xcd \
$(MISC)/math.xcd \
- $(MISC)/onlineupdate.xcd \
$(MISC)/oooimprovement.xcd \
$(MISC)/palm.xcd \
$(MISC)/pocketexcel.xcd \
@@ -51,6 +50,10 @@ MY_XCDS = \
$(MISC)/w4w.xcd \
$(MISC)/writer.xcd \
$(MISC)/xsltfilter.xcd
+.IF "$(ENABLE_ONLINE_UPDATE)" == "YES"
+MY_XCDS += \
+ $(MISC)/onlineupdate.xcd
+.END
MY_DEPS_base = main
MY_FILES_base = \
Modified: incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp Fri Feb 24 05:01:22 2012
@@ -1006,7 +1006,7 @@ ProfileItem gid_Brand_Profileitem_Versio
Section = "Version";
Order = 15;
Key = "UpdateURL";
- #if defined(BUILD_SPECIAL)
+ #if defined(ENABLE_ONLINE_UPDATE)
#ifdef WNT
Value = "${UPDATEURL}";
#else // defined WNT
Modified: incubator/ooo/trunk/main/scp2/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/util/makefile.mk?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/util/makefile.mk Fri Feb 24 05:01:22 2012
@@ -182,7 +182,7 @@ SCP1FILES += cairocanvas.par
SCP1FILES += layout.par
.ENDIF # ENABLE_LAYOUT == TRUE
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)" != ""
SCP1FILES += \
module_onlineupdate.par \
file_onlineupdate.par
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1293078&r1=1293077&r2=1293078&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Fri Feb 24 05:01:22 2012
@@ -1716,6 +1716,7 @@ ToFile( "TARFILE_LOCATION", $TARFILE_LO
ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
ToFile( "CUSTOM_PACK_LIST", "@CUSTOM_PACK_LIST@", "e" );
ToFile( "USE_PACKAGER", "@USE_PACKAGER@", "e" );
+ToFile( "ENABLE_ONLINE_UPDATE", "@ENABLE_ONLINE_UPDATE@", "e" );
#
# Writing the platform dependent constant values to file.
# (c = comment, e = environment variable, a = alias )