[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.in connectivity/qa set_soenv.in
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Fri Dec 30 14:08:26 PST 2011
config_host.mk.in | 88 +++++++++++++++++++++++++
configure.in | 81 +++++++++++------------
connectivity/qa/connectivity/tools/makefile.mk | 7 +
connectivity/qa/makefile.mk | 6 +
set_soenv.in | 88 -------------------------
5 files changed, 142 insertions(+), 128 deletions(-)
New commits:
commit 665386630cebe26c2e8667e359bebc7b499f4bf5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Dec 30 16:01:03 2011 -0600
move PRODUCT and PROEXT determination earlier in configure.
the is a prep work to migrate IN/OUTPATH out of set_soenv.in
diff --git a/configure.in b/configure.in
index 6842771..27f5373 100644
--- a/configure.in
+++ b/configure.in
@@ -2219,6 +2219,47 @@ printf ("hello world\n");
fi
AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
+dnl Set the ENABLE_DBGUTIL variable
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build with additional debug utilities])
+if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
+ PROEXT=""
+ PRODUCT=""
+
+ AC_MSG_RESULT([yes])
+ # cppunit and graphite expose STL in public headers
+ if test "$with_system_cppunit" = "yes"; then
+ AC_MSG_ERROR([--with-system-cppunit conflicts with DBG_UTIL build])
+ else
+ with_system_cppunit=no
+ fi
+ if test "$with_system_graphite" = "yes"; then
+ AC_MSG_ERROR([--with-system-graphite conflicts with DBG_UTIL build])
+ else
+ with_system_graphite=no
+ fi
+ if test "$with_system_mysql_cppconn" = "yes"; then
+ AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with DBG_UTIL build])
+ else
+ with_system_mysql_cppconn=no
+ fi
+ if test $_os = WINNT -a \
+ \( "$enable_mozilla" != no -o \
+ "$enable_build_mozilla" != no \); then
+ # We can't build against the Mozilla stuff if using _DEBUG, will get linking errors
+ # See connectivity/drivers/mozab
+ AC_MSG_WARN([Also disabling Mozilla stuff then])
+ enable_mozilla=no
+ enable_build_mozilla=no
+ fi
+else
+ PRODUCT="full"
+ PROEXT=".pro"
+ AC_MSG_RESULT([no, full product build])
+fi
+AC_SUBST(PRODUCT)
+AC_SUBST(PROEXT)
+
dnl ===================================================================
dnl Set up a different compiler to produce tools to run on the build
dnl machine when doing cross-compilation
@@ -2427,46 +2468,6 @@ else
fi
AC_SUBST(ENABLE_DEBUG)
-dnl Set the ENABLE_DBGUTIL variable
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build with additional debug utilities])
-if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
- PROEXT=""
- PRODUCT=""
-
- AC_MSG_RESULT([yes])
- # cppunit and graphite expose STL in public headers
- if test "$with_system_cppunit" = "yes"; then
- AC_MSG_ERROR([--with-system-cppunit conflicts with DBG_UTIL build])
- else
- with_system_cppunit=no
- fi
- if test "$with_system_graphite" = "yes"; then
- AC_MSG_ERROR([--with-system-graphite conflicts with DBG_UTIL build])
- else
- with_system_graphite=no
- fi
- if test "$with_system_mysql_cppconn" = "yes"; then
- AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with DBG_UTIL build])
- else
- with_system_mysql_cppconn=no
- fi
- if test $_os = WINNT -a \
- \( "$enable_mozilla" != no -o \
- "$enable_build_mozilla" != no \); then
- # We can't build against the Mozilla stuff if using _DEBUG, will get linking errors
- # See connectivity/drivers/mozab
- AC_MSG_WARN([Also disabling Mozilla stuff then])
- enable_mozilla=no
- enable_build_mozilla=no
- fi
-else
- PRODUCT="full"
- PROEXT=".pro"
- AC_MSG_RESULT([no, full product build])
-fi
-AC_SUBST(PRODUCT)
-AC_SUBST(PROEXT)
dnl Determine whether to use linkoo for the smoketest installation
dnl ===================================================================
commit e5bbb4ea87c36e14128bb920c7c81e1de6f58d88
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Dec 30 15:45:55 2011 -0600
move *_CFLAGS and *_LIBS to config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index 7d33cb8..b80abce 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,6 +4,19 @@
#
export SRC_ROOT="@SRC_ROOT@"
+export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
+export CAIRO_LIBS="@CAIRO_LIBS@"
+export CDR_CFLAGS="@CDR_CFLAGS@"
+export CDR_LIBS="@CDR_LIBS@"
+export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
+export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
+export CURL_CFLAGS="@CURL_CFLAGS@"
+export CURL_LIBS="@CURL_LIBS@"
+export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
+export DBUSMENUGTK_LIBS="@DBUSMENUGTK_LIBS@"
+export DBUS_CFLAGS="@DBUS_CFLAGS@"
+export DBUS_LIBS="@DBUS_LIBS@"
+export DISABLE_NEON="@DISABLE_NEON@"
export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
export ENABLE_DBUS="@ENABLE_DBUS@"
@@ -46,7 +59,65 @@ export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
export ENABLE_UGLY="@ENABLE_UGLY@"
export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
+export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
+export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
+export FREETYPE_LIBS="@FREETYPE_LIBS@"
+export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
+export GOBJECT_LIBS="@GOBJECT_LIBS@"
+export GRAPHITE_CFLAGS="@GRAPHITE_CFLAGS@"
+export GRAPHITE_LIBS="@GRAPHITE_LIBS@"
+export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
+export GSTREAMER_LIBS="@GSTREAMER_LIBS@"
+export GTHREAD_CFLAGS="@GTHREAD_CFLAGS@"
+export GTHREAD_LIBS="@GTHREAD_LIBS@"
+export GTK3_CFLAGS="@GTK3_CFLAGS@"
+export GTK3_LIBS="@GTK3_LIBS@"
+export GTK_CFLAGS="@GTK_CFLAGS@"
+export GTK_LIBS="@GTK_LIBS@"
+export GTK_PRINT_CFLAGS="@GTK_PRINT_CFLAGS@"
+export GTK_PRINT_LIBS="@GTK_PRINT_LIBS@"
+export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
+export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
+export KDE4_CFLAGS="@KDE4_CFLAGS@"
+export KDE4_LIBS="@KDE4_LIBS@"
+export KDE_CFLAGS="@KDE_CFLAGS@"
+export KDE_GLIB_CFLAGS="@KDE_GLIB_CFLAGS@"
+export KDE_GLIB_LIBS="@KDE_GLIB_LIBS@"
+export KDE_LIBS="@KDE_LIBS@"
+export LFS_CFLAGS="@LFS_CFLAGS@"
+export LIBCMIS_CFLAGS="@LIBCMIS_CFLAGS@"
+export LIBCMIS_LIBS="@LIBCMIS_LIBS@"
+export LIBEXTTEXTCAT_CFLAGS="@LIBEXTTEXTCAT_CFLAGS@"
+export LIBEXTTEXTCAT_LIBS="@LIBEXTTEXTCAT_LIBS@"
+export LIBPNG_CFLAGS="@LIBPNG_CFLAGS@"
+export LIBPNG_LIBS="@LIBPNG_LIBS@"
+export LIBXML_CFLAGS="@LIBXML_CFLAGS@"
+export LIBXML_LIBS="@LIBXML_LIBS@"
+export LIBXSLT_CFLAGS="@LIBXSLT_CFLAGS@"
+export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
+export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
+export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
+export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
+export MYTHES_CFLAGS="@MYTHES_CFLAGS@"
+export MYTHES_LIBS="@MYTHES_LIBS@"
+export NEON_CFLAGS="@NEON_CFLAGS@"
+export NEON_LIBS="@NEON_LIBS@"
+export NSS_CFLAGS="@NSS_CFLAGS@"
+export NSS_LIBS="@NSS_LIBS@"
+export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
+export OPENSSL_LIBS="@OPENSSL_LIBS@"
+export POPPLER_CFLAGS="@POPPLER_CFLAGS@"
+export POPPLER_LIBS="@POPPLER_LIBS@"
+export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
+export PTHREAD_LIBS="@PTHREAD_LIBS@"
+export PYTHON_CFLAGS="@PYTHON_CFLAGS@"
+export PYTHON_LIBS="@PYTHON_LIBS@"
+export REDLAND_CFLAGS="@REDLAND_CFLAGS@"
+export REDLAND_LIBS="@REDLAND_LIBS@"
export SAL_ENABLE_FILE_LOCKING="1"
+export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
+export SAMPLEICC_LIBS="@SAMPLEICC_LIBS@"
export SIZEOF_DOUBLE="@SIZEOF_DOUBLE@"
export SIZEOF_INT="@SIZEOF_INT@"
export SIZEOF_LONG="@SIZEOF_LONG@"
@@ -113,3 +184,14 @@ export SYSTEM_SERVLETAPI="@SYSTEM_SERVLETAPI@"
export SYSTEM_STDLIBS="@SYSTEM_STDLIBS@"
export SYSTEM_VIGRA="@SYSTEM_VIGRA@"
export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
+export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
+export VISIO_CFLAGS="@VISIO_CFLAGS@"
+export VISIO_LIBS="@VISIO_LIBS@"
+export WPD_CFLAGS="@WPD_CFLAGS@"
+export WPD_LIBS="@WPD_LIBS@"
+export WPG_CFLAGS="@WPG_CFLAGS@"
+export WPG_LIBS="@WPG_LIBS@"
+export WPS_CFLAGS="@WPS_CFLAGS@"
+export WPS_LIBS="@WPS_LIBS@"
+export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
+export XRANDR_LIBS="@XRANDR_LIBS@"
diff --git a/set_soenv.in b/set_soenv.in
index 2b6142b..e7938f3 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1380,7 +1380,6 @@ ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" );
}
ToFile( "PRODUCT", "@PRODUCT@", "e" );
ToFile( "PROEXT", $PROEXT, "e" );
-ToFile( "VALGRIND_CFLAGS", "@VALGRIND_CFLAGS@","e" );
ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" );
ToFile( "UNIXWRAPPERNAME", "@UNIXWRAPPERNAME@","e" );
ToFile( "PRODUCTNAME", "@PRODUCTNAME@", "e" );
@@ -1396,7 +1395,6 @@ ToFile( "BUILD_MOZAB", "@BUILD_MOZAB@", "e" );
ToFile( "PREBUILD_MOZAB", $PREBUILD_MOZAB, "e" );
ToFile( "MOZILLA_VERSION", $MOZILLA_VERSION, "e" );
ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
-ToFile( "MOZILLA_HEADERS_CFLAGS", "@MOZILLA_HEADERS_CFLAGS@", "e" );
ToFile( "SYSTEM_MOZILLA_HEADERS", "@SYSTEM_MOZILLA_HEADERS@", "e" );
ToFile( "MOZILLABUILD", "@MOZILLABUILD@", "e" );
ToFile( "BUILD_VER_STRING", "@BUILD_VER_STRING@", "e" );
@@ -1404,12 +1402,6 @@ if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
-ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
-ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
-ToFile( "GTK3_CFLAGS", "@GTK3_CFLAGS@", "e" );
-ToFile( "GTK3_LIBS", "@GTK3_LIBS@", "e" );
-ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" );
-ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
@@ -1431,21 +1423,9 @@ ToFile( "COMMONS_CODEC_JAR", "@COMMONS_CODEC_JAR@","e" );
ToFile( "COMMONS_LANG_JAR", "@COMMONS_LANG_JAR@", "e" );
ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
-ToFile( "SAMPLEICC_CFLAGS", "@SAMPLEICC_CFLAGS@", "e" );
-ToFile( "SAMPLEICC_LIBS", "@SAMPLEICC_LIBS@", "e" );
ToFile( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" );
-ToFile( "DBUS_CFLAGS", "@DBUS_CFLAGS@", "e" );
-ToFile( "DBUS_LIBS", "@DBUS_LIBS@", "e" );
-ToFile( "GTK_PRINT_CFLAGS", "@GTK_PRINT_CFLAGS@", "e" );
-ToFile( "GTK_PRINT_LIBS", "@GTK_PRINT_LIBS@", "e" );
-ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
-ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" );
ToFile( "MOC", "@MOC@", "e" );
-ToFile( "KDE4_CFLAGS", "@KDE4_CFLAGS@", "e" );
-ToFile( "KDE4_LIBS", "@KDE4_LIBS@", "e" );
ToFile( "MOC4", "@MOC4@", "e" );
-ToFile( "KDE_GLIB_CFLAGS", "@KDE_GLIB_CFLAGS@", "e" );
-ToFile( "KDE_GLIB_LIBS", "@KDE_GLIB_LIBS@", "e" );
ToFile( "KDE_HAVE_GLIB", "@KDE_HAVE_GLIB@", "e" );
ToFile( "PSPRINT", "TRUE", "e" );
ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
@@ -1467,8 +1447,6 @@ ToFile( "GUI", $GUI, "e" );
ToFile( "GUIBASE", $GUIBASE, "e" );
ToFile( "OS", $OS, "e" );
ToFile( "OSVERSION", $OSVERSION, "e" );
-ToFile( "PTHREAD_CFLAGS", "@PTHREAD_CFLAGS@", "e" );
-ToFile( "PTHREAD_LIBS", "@PTHREAD_LIBS@", "e" );
ToFile( "OUTPATH", $OUTPATH, "e" );
ToFile( "INPATH", $INPATH, "e" );
ToFile( "PATH_SEPERATOR", $PATH_SEPERATOR, "e" );
@@ -1683,11 +1661,6 @@ ToFile( "WITH_STLPORT", "@WITH_STLPORT@", "e" );
ToFile( "ALLOC", "@ALLOC@", "e" );
ToFile( "DISABLE_LINKOO", "@DISABLE_LINKOO@", "e" );
ToFile( "DISABLE_STRIP", "@DISABLE_STRIP@", "e" );
-ToFile( "LFS_CFLAGS", "@LFS_CFLAGS@", "e" );
-ToFile( "FONTCONFIG_LIBS", "@FONTCONFIG_LIBS@", "e");
-ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
-ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e");
-ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e");
ToFile( "CL_X64", "@CL_X64@", "e");
ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
ToFile( "DICT_SYSTEM_DIR", "@DICT_SYSTEM_DIR@", "e");
@@ -1698,12 +1671,9 @@ ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" );
ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );
ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" );
ToFile( "MOZ_FLAVOUR", "@MOZ_FLAVOUR@", "e" );
-ToFile( "NSS_LIBS", "@NSS_LIBS@", "e" );
-ToFile( "NSS_CFLAGS", "@NSS_CFLAGS@", "e" );
ToFile( "MOZ_INC", "@MOZ_INC@", "e" );
ToFile( "MOZ_LIB", "@MOZ_LIB@", "e" );
ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" );
-ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" );
ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" );
ToFile( "OOOP_FONTS_PACK", "@OOOP_FONTS_PACK@","e" );
@@ -1732,8 +1702,6 @@ ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" );
ToFile( "BUILD_TYPE", "$BUILD_TYPE", "e" );
ToFile( "MINGW_EXTERNAL_DLLS","@MINGW_EXTERNAL_DLLS@","e");
ToFile( "VERBOSE", "@VERBOSE@", "e" );
-ToFile( "GOBJECT_CFLAGS", "@GOBJECT_CFLAGS@", "e" );
-ToFile( "GOBJECT_LIBS", "@GOBJECT_LIBS@", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
ToFile( "LINKFLAGSRUNPATH",'', "e" );
}
@@ -1742,47 +1710,15 @@ ToFile( "EPM_FLAGS", $EPM_FLAGS, "e" );
ToFile( "BUILD_EPM", "@BUILD_EPM@", "e" );
ToFile( "GPERF", "@GPERF@", "e" );
ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" );
-ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
-ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
ToFile( "DISABLE_PYTHON", "@DISABLE_PYTHON@", "e" );
ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
ToFile( "PYTHON", "@PYTHON@", "e" );
-ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
-ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" );
ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" );
ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" );
ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" );
-ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" );
-ToFile( "FREETYPE_LIBS", "@FREETYPE_LIBS@", "e" );
-ToFile( "POPPLER_CFLAGS", "@POPPLER_CFLAGS@", "e" );
-ToFile( "POPPLER_LIBS", "@POPPLER_LIBS@", "e" );
-ToFile( "GSTREAMER_CFLAGS", "@GSTREAMER_CFLAGS@", "e" );
-ToFile( "GSTREAMER_LIBS", "@GSTREAMER_LIBS@", "e" );
-ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" );
-ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" );
-ToFile( "XRANDR_CFLAGS", "@XRANDR_CFLAGS@", "e" );
-ToFile( "XRANDR_LIBS", "@XRANDR_LIBS@", "e" );
ToFile( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" );
-ToFile( "LIBPNG_CFLAGS", "@LIBPNG_CFLAGS@", "e" );
-ToFile( "LIBPNG_LIBS", "@LIBPNG_LIBS@", "e" );
-ToFile( "WPD_CFLAGS", "@WPD_CFLAGS@", "e" );
-ToFile( "WPD_LIBS", "@WPD_LIBS@", "e" );
-ToFile( "WPS_CFLAGS", "@WPS_CFLAGS@", "e" );
-ToFile( "WPS_LIBS", "@WPS_LIBS@", "e" );
-ToFile( "WPG_CFLAGS", "@WPG_CFLAGS@", "e" );
-ToFile( "WPG_LIBS", "@WPG_LIBS@", "e" );
-ToFile( "VISIO_CFLAGS", "@VISIO_CFLAGS@", "e" );
-ToFile( "VISIO_LIBS", "@VISIO_LIBS@", "e" );
-ToFile( "CDR_CFLAGS", "@CDR_CFLAGS@", "e" );
-ToFile( "CDR_LIBS", "@CDR_LIBS@", "e" );
-ToFile( "LIBCMIS_CFLAGS", "@LIBCMIS_CFLAGS@", "e" );
-ToFile( "LIBCMIS_LIBS", "@LIBCMIS_LIBS@", "e" );
-ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" );
-ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" );
ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "e" );
-ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" );
-ToFile( "LIBXML_LIBS", "@LIBXML_LIBS@", "e" );
ToFile( "WITH_EXTRA_GALLERY","@WITH_EXTRA_GALLERY@", "e" );
ToFile( "WITH_EXTRA_TEMPLATE","@WITH_EXTRA_TEMPLATE@", "e" );
ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@", "e" );
@@ -1790,8 +1726,6 @@ ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" );
ToFile( "OXYGENOFFICE_PACK","@OXYGENOFFICE_PACK@","e" );
ToFile( "DB_LIB", "@DB_LIB@", "e" );
ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" );
-ToFile( "DBUSMENUGTK_CFLAGS", "@DBUSMENUGTK_CFLAGS@", "e" );
-ToFile( "DBUSMENUGTK_LIBS", "@DBUSMENUGTK_LIBS@", "e" );
ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" );
ToFile( "MYSQL_LIB", "@MYSQL_LIB@", "e" );
ToFile( "MYSQL_DEFINES", "@MYSQL_DEFINES@", "e" );
@@ -1802,38 +1736,22 @@ ToFile( "LUCENE_ANALYZERS_JAR", "@LUCENE_ANALYZERS_JAR@", "e" );
ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
ToFile( "SAXON_JAR", "@SAXON_JAR@", "e" );
ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
-ToFile( "LIBXSLT_CFLAGS", "@LIBXSLT_CFLAGS@", "e" );
-ToFile( "LIBXSLT_LIBS", "@LIBXSLT_LIBS@", "e" );
ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
-ToFile( "CURL_CFLAGS", "@CURL_CFLAGS@", "e" );
-ToFile( "CURL_LIBS", "@CURL_LIBS@", "e" );
-ToFile( "MDDS_CPPFLAGS", "@MDDS_CPPFLAGS@", "e" );
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( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
-ToFile( "REDLAND_CFLAGS", "@REDLAND_CFLAGS@", "e" );
-ToFile( "REDLAND_LIBS", "@REDLAND_LIBS@", "e" );
ToFile( "WITH_KRB5", "@WITH_KRB5@", "e" );
ToFile( "WITH_GSSAPI", "@WITH_GSSAPI@", "e" );
ToFile( "BUILD_POSTGRESQL_SDBC", "@BUILD_POSTGRESQL_SDBC@", "e" );
ToFile( "POSTGRESQL_INC", "@POSTGRESQL_INC@", "e" );
ToFile( "POSTGRESQL_LIB", "@POSTGRESQL_LIB@", "e" );
-ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
-ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );
ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );
ToFile( "HAVE_POSIX_FALLOCATE", "@HAVE_POSIX_FALLOCATE@", "e" );
ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
-ToFile( "MYTHES_CFLAGS", "@MYTHES_CFLAGS@", "e" );
-ToFile( "MYTHES_LIBS", "@MYTHES_LIBS@", "e" );
-ToFile( "LIBEXTTEXTCAT_CFLAGS", "@LIBEXTTEXTCAT_CFLAGS@", "e" );
-ToFile( "LIBEXTTEXTCAT_LIBS", "@LIBEXTTEXTCAT_LIBS@", "e" );
ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
ToFile( "MERGELIBS", "@MERGELIBS@", "e" );
commit 930f5f1729f9972fb93746b875938e7a3b8c2584
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Dec 30 14:30:06 2011 -0600
now that QADEVOOO build_type exist we need to use it...
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index d77da7f..897a85f 100755
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -38,6 +38,11 @@ all:
@echo "Java not available. Build skipped"
.ELSE
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
+all:
+ @echo "QADEVOO not set. Build skipped"
+.ELSE
+
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
@@ -56,6 +61,8 @@ ALL : ALLTAR
ALL: ALLDEP
.ENDIF
+.ENDIF # QADEVOOO option
.ENDIF # "$(SOLAR_JAVA)" == ""
.INCLUDE : target.mk
+
diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
index 3081a75..76028ad 100755
--- a/connectivity/qa/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -33,6 +33,10 @@ PACKAGE = complex/connectivity
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
+all:
+ @echo "QADEVOO not set. Build skipped"
+.ELSE
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
@@ -65,6 +69,7 @@ ALL : ALLTAR
.ELSE
ALL: ALLDEP
.ENDIF
+.ENDIF # QADEVOOO option
.INCLUDE : target.mk
@@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
run_%: $(CLASSDIR)$/$(JARTARGET)
+$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
+
commit 878828757a25978a9c22371f6ccfd5729ce04ea4
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Dec 30 12:14:16 2011 -0600
move SIZEOF_* to config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index 494ed92..7d33cb8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -47,6 +47,12 @@ export ENABLE_UGLY="@ENABLE_UGLY@"
export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
export ENABLE_ZENITY="@ENABLE_ZENITY@"
export SAL_ENABLE_FILE_LOCKING="1"
+export SIZEOF_DOUBLE="@SIZEOF_DOUBLE@"
+export SIZEOF_INT="@SIZEOF_INT@"
+export SIZEOF_LONG="@SIZEOF_LONG@"
+export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
+export SIZEOF_POINTER="@SIZEOF_POINTER@"
+export SIZEOF_SHORT="@SIZEOF_SHORT@"
export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
export SYSTEM_BOOST="@SYSTEM_BOOST@"
export SYSTEM_BSH="@SYSTEM_BSH@"
diff --git a/set_soenv.in b/set_soenv.in
index 9dd385b..2b6142b 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1659,12 +1659,6 @@ else
ToFile( "BUILD_NCPUS", "@BUILD_NCPUS@", "e" );
ToFile( "GMAKE_PARALLELISM", "@GMAKE_PARALLELISM@", "e" );
ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" );
-ToFile( "SIZEOF_SHORT", "@SIZEOF_SHORT@", "e" );
-ToFile( "SIZEOF_INT", "@SIZEOF_INT@", "e" );
-ToFile( "SIZEOF_LONG", "@SIZEOF_LONG@", "e" );
-ToFile( "SIZEOF_LONGLONG", "@SIZEOF_LONGLONG@", "e" );
-ToFile( "SIZEOF_DOUBLE", "@SIZEOF_DOUBLE@", "e" );
-ToFile( "SIZEOF_POINTER", "@SIZEOF_POINTER@", "e" );
ToFile( "ALIGNOF_SHORT", "@ALIGNOF_SHORT@", "e" );
ToFile( "ALIGNOF_INT", "@ALIGNOF_INT@", "e" );
ToFile( "ALIGNOF_LONG", "@ALIGNOF_LONG@", "e" );
More information about the Libreoffice-commits
mailing list