You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2011/11/14 14:35:07 UTC
svn commit: r1201696 - in /incubator/ooo/trunk/main: ./ neon/
postprocess/packcomponents/ scp2/source/ooo/ ucb/prj/
ucb/source/ucp/webdav/ xmlsecurity/prj/
Author: jsc
Date: Mon Nov 14 13:35:07 2011
New Revision: 1201696
URL: http://svn.apache.org/viewvc?rev=1201696&view=rev
Log:
118584: remove internal neon and dependencies, build webdav ucp only if system neon is enabled
Removed:
incubator/ooo/trunk/main/neon/
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/ucb/prj/build.lst
incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk
incubator/ooo/trunk/main/xmlsecurity/prj/build.lst
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Nov 14 13:35:07 2011
@@ -526,9 +526,6 @@ AC_ARG_WITH(system-mdds,
AC_ARG_WITH(system-vigra,
[ --with-system-vigra Use vigra already on system
],,)
-AC_ARG_ENABLE(neon,
-[ --disable-neon Disable neon and the compilation of webdav binding
-],,)
AC_ARG_ENABLE(Xaw,
[ --disable-Xaw Disables the use of Xaw for the Netscape/Mozilla
plugin
@@ -1240,13 +1237,11 @@ if test "$enable_copyleft" != "yes"; the
enable_nss_module="no"
enable_gstreamer="no"
with_myspell_dicts="no"
- enable_neon="no"
DISABLE_HUNSPELL="TRUE"
DISABLE_HYPHEN="TRUE"
DISABLE_LIBWPD="TRUE"
DISABLE_SAXON="TRUE"
- DISABLE_NEON="TRUE"
BUILD_EPM="NO"
@@ -1258,7 +1253,6 @@ else
DISABLE_HYPHEN=
DISABLE_LIBWPD=
DISABLE_SAXON=
- DISABLE_NEON=
AC_MSG_RESULT([no])
@@ -1267,7 +1261,6 @@ AC_SUBST(DISABLE_HUNSPELL)
AC_SUBST(DISABLE_HYPHEN)
AC_SUBST(DISABLE_LIBWPD)
AC_SUBST(DISABLE_SAXON)
-AC_SUBST(DISABLE_NEON)
AC_SUBST(BUILD_EPM)
@@ -5020,19 +5013,9 @@ AC_SUBST(XRANDR_LIBS)
AC_SUBST(ENABLE_RANDR)
dnl ===================================================================
-dnl Check for building neon
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use neon])
-if test "$enable_neon" = "no"; then
- AC_MSG_RESULT([no])
- DISABLE_NEON=TRUE
- AC_SUBST(DISABLE_NEON)
-else
- AC_MSG_RESULT([yes])
-dnl ===================================================================
dnl Check for system neon
dnl ===================================================================
-AC_MSG_CHECKING([which neon to use])
+AC_MSG_CHECKING([which neon is used])
if test -n "$with_system_neon" -o -n "$with_system_libs" && \
test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external])
@@ -5040,18 +5023,11 @@ if test -n "$with_system_neon" -o -n "$w
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
-else
- AC_MSG_RESULT([internal])
- SYSTEM_NEON=NO
- NEON_LIBS=-lneon
- NEON_CFLAGS=
- BUILD_TYPE="$BUILD_TYPE NEON"
-fi
+fi
AC_SUBST(SYSTEM_NEON)
AC_SUBST(NEON_VERSION)
AC_SUBST(NEON_LIBS)
AC_SUBST(NEON_CFLAGS)
-fi
dnl ===================================================================
dnl Check for system openssl
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Mon Nov 14 13:35:07 2011
@@ -58,7 +58,6 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleI
831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
-ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Mon Nov 14 13:35:07 2011
@@ -214,7 +214,7 @@ my_components += wpft
my_components += emboleobj
.END
-.IF "$(DISABLE_NEON)" != "TRUE"
+.IF "$(SYSTEM_NEON)" == "YES"
my_components += ucpdav1
.END
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Nov 14 13:35:07 2011
@@ -1396,11 +1396,8 @@ File gid_File_Lib_Ucpchelp1
Styles = (PACKED);
End
-#ifndef DISABLE_NEON
+#ifdef SYSTEM_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
- #ifndef SYSTEM_NEON
- SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
- #endif
#endif
SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Mon Nov 14 13:35:07 2011
@@ -223,9 +223,6 @@ SCPDEFS+=\
SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
-.IF "$(DISABLE_NEON)" == "TRUE"
-SCPDEFS+=-DDISABLE_NEON
-.ENDIF
.IF "$(SYSTEM_NEON)" == "YES"
SCPDEFS+=-DSYSTEM_NEON
.ENDIF
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Nov 14 13:35:07 2011
@@ -1971,7 +1971,6 @@ ToFile( "SYSTEM_LIBJPEG", "@SYSTEM_LI
ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" );
ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" );
ToFile( "NEON_CFLAGS", "@NEON_CFLAGS@", "e" );
-ToFile( "DISABLE_NEON", "@DISABLE_NEON@", "e" );
ToFile( "DISABLE_XAW", "@DISABLE_XAW@", "e" );
ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" );
ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
Modified: incubator/ooo/trunk/main/ucb/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/prj/build.lst?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/prj/build.lst (original)
+++ incubator/ooo/trunk/main/ucb/prj/build.lst Mon Nov 14 13:35:07 2011
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
uc ucb usr1 - all uc_mkout NULL
uc ucb\inc nmake - all uc_inc NULL
uc ucb\source\regexp nmake - all uc_regexp uc_inc NULL
Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk Mon Nov 14 13:35:07 2011
@@ -48,10 +48,10 @@ NO_BSYMBOLIC=TRUE
.INCLUDE: settings.mk
.IF "$(L10N_framework)"==""
-.IF "$(DISABLE_NEON)" == "TRUE"
+.IF "$(SYSTEM_NEON)" != "YES"
@all:
- @echo "neon disabled...."
+ @echo "no system neon is used...."
.ELSE
Modified: incubator/ooo/trunk/main/xmlsecurity/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmlsecurity/prj/build.lst?rev=1201696&r1=1201695&r2=1201696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmlsecurity/prj/build.lst (original)
+++ incubator/ooo/trunk/main/xmlsecurity/prj/build.lst Mon Nov 14 13:35:07 2011
@@ -1,4 +1,4 @@
-xs xmlsecurity : L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
+xs xmlsecurity : L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
xs xmlsecurity usr1 - all xs_mkout NULL
xs xmlsecurity\inc nmake - all xs_inc NULL
xs xmlsecurity\source\framework nmake - all xs_fw xs_inc NULL