[Libreoffice-commits] .: 6 commits - config_host.mk.in configure.in desktop/branding set_soenv.in solenv/bin solenv/inc
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Jan 1 14:07:34 PST 2012
config_host.mk.in | 203 ++++++++++++++++++++++++++++++++++++++++++++--
configure.in | 5 +
desktop/branding/Makefile | 4
set_soenv.in | 197 --------------------------------------------
solenv/bin/linkoo | 29 ------
solenv/inc/unitools.mk | 6 -
6 files changed, 212 insertions(+), 232 deletions(-)
New commits:
commit ea5d18a1c7c5916be0f97db1ecba07db5b9cb5cd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Jan 1 16:05:16 2012 -0600
move UDP and fix linkoo to look for INPATH and UPD in config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index b17207d..8077384 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -360,6 +360,7 @@ export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@"
export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
+export UPD="@UPD@"
export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
export USE_XINERAMA="@USE_XINERAMA@"
export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
diff --git a/set_soenv.in b/set_soenv.in
index 4276058..fafc9ed 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1327,7 +1327,6 @@ if ("@WITH_VC_REDIST@" eq "TRUE") {
ToFile( "WITH_VC_REDIST", "TRUE", "e" );
}
ToFile( "PERL", $PERL, "e" );
-ToFile( "UPD", $UPD, "e" );
ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
ToFile( "SOLARVER", $SOLARVER, "e" );
ToFile( "SOLARVERSION", $SOLARVERSION, "e" );
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index ade1ee7..06a103d 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -141,35 +141,10 @@ my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsql
sub sniff_target($)
{
my $build_dir = shift;
- my ($dirhandle, $fname);
my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); # defaults
- opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
- while ($fname = readdir ($dirhandle)) {
- if ($fname =~ /Host.sh$/) {
- my $file;
- open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
- while (<$file>) {
- /\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
- if ($1 eq 'UPD') {
- $libver = $2;
- }
- }
- close ($file);
- } elsif ($fname =~ /host.mk$/) {
- my $file;
- open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
- while (<$file>) {
- /\s*export\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
- if ($1 eq 'INPATH') {
- $target = $2;
- }
- }
- close ($file);
- }
- }
-
- closedir ($dirhandle);
+ chomp($target=`cat $build_dir/config_host.mk | grep INPATH= | sed -e 's/.*=//' | sed -e 's/"//g'`);
+ chomp($libver=`cat $build_dir/config_host.mk | grep UPD= | sed -e 's/.*=//' | sed -e 's/"//g'`);
print "Sniffed target: $target, $libver\n";
commit 49319b288f40ba13b24799136caa97863d523e39
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Jan 1 02:43:30 2012 -0600
migrate non-conditional straight from configure.in var out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index ebd3d46..b17207d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,14 +4,33 @@
#
export SRC_ROOT="@SRC_ROOT@"
+ at x_ICU@ export ICU_MAJOR="@ICU_MAJOR@"
+ at x_ICU@ export ICU_MICRO="@ICU_MICRO@"
+ at x_ICU@ export ICU_MINOR="@ICU_MINOR@"
export ABOUT_BITMAP="@ABOUT_BITMAP@"
+export ALIGNOF_DOUBLE="@ALIGNOF_DOUBLE@"
+export ALIGNOF_INT="@ALIGNOF_INT@"
+export ALIGNOF_LONG="@ALIGNOF_LONG@"
+export ALIGNOF_SHORT="@ALIGNOF_SHORT@"
+export ALLOC="@ALLOC@"
export ANCIENT_BISON="@ANCIENT_BISON@"
export AR="@AR@"
+export AWTLIB='@AWTLIB@'
+export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@"
export BSH_JAR="@BSH_JAR@"
+export BUILD_DMAKE="@BUILD_DMAKE@"
+export BUILD_EPM="@BUILD_EPM@"
+export BUILD_MOZAB="@BUILD_MOZAB@"
+export BUILD_NCPUS="@BUILD_NCPUS@"
+export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@"
+export BUILD_STAX="@BUILD_STAX@"
+export BUILD_UNOWINREG="@BUILD_UNOWINREG@"
+export BUILD_VER_STRING="@BUILD_VER_STRING@"
export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
export CAIRO_LIBS="@CAIRO_LIBS@"
export CDR_CFLAGS="@CDR_CFLAGS@"
export CDR_LIBS="@CDR_LIBS@"
+export CL_X64="@CL_X64@"
export COM="@COM@"
export COMMONS_CODEC_JAR="@COMMONS_CODEC_JAR@"
export COMMONS_HTTPCLIENT_JAR="@COMMONS_HTTPCLIENT_JAR@"
@@ -25,14 +44,26 @@ export CPUNAME="@CPUNAME@"
export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
export CROSS_COMPILING="@CROSS_COMPILING@"
+export CT2N_EXTENSION_PACK="@CT2N_EXTENSION_PACK@"
export CURL_CFLAGS="@CURL_CFLAGS@"
export CURL_LIBS="@CURL_LIBS@"
+export DATADIR="@DATADIR@"
export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
export DBUSMENUGTK_LIBS="@DBUSMENUGTK_LIBS@"
export DBUS_CFLAGS="@DBUS_CFLAGS@"
export DBUS_LIBS="@DBUS_LIBS@"
+export DB_CPPLIB="@DB_CPPLIB@"
+export DB_LIB="@DB_LIB@"
+export DEFAULT_TO_ENGLISH_FOR_PACKING="yes"
+export DIAGRAM_EXTENSION_PACK="@DIAGRAM_EXTENSION_PACK@"
+export DICT_SYSTEM_DIR="@DICT_SYSTEM_DIR@"
+export DISABLE_LINKOO="@DISABLE_LINKOO@"
export DISABLE_NEON="@DISABLE_NEON@"
+export DISABLE_PYTHON="@DISABLE_PYTHON@"
+export DISABLE_STRIP="@DISABLE_STRIP@"
export DLLTOOL="@DLLTOOL@"
+export DOCDIR="@DOCDIR@"
+export DO_FETCH_TARBALLS="@DO_FETCH_TARBALLS@"
export DPKG="@DPKG@"
export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
@@ -82,11 +113,17 @@ export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
export FREETYPE_LIBS="@FREETYPE_LIBS@"
+export GIT_LINK_SRC="@GIT_LINK_SRC@"
+export GIT_REPO_NAMES="@GIT_REPO_NAMES@"
+export GMAKE_MODULE_PARALLELISM="@GMAKE_MODULE_PARALLELISM@"
+export GMAKE_PARALLELISM="@GMAKE_PARALLELISM@"
export GNUCOPY="@GNUCP@"
export GNUMAKE="@GNUMAKE@"
export GNUTAR="@GNUTAR@"
export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
export GOBJECT_LIBS="@GOBJECT_LIBS@"
+export GOOGLE_DOCS_EXTENSION_PACK="@GOOGLE_DOCS_EXTENSION_PACK@"
+export GPERF="@GPERF@"
export GPERF="@GPERF@"
export GRAPHITE_CFLAGS="@GRAPHITE_CFLAGS@"
export GRAPHITE_LIBS="@GRAPHITE_LIBS@"
@@ -104,11 +141,28 @@ export GUI="@GUI@"
export GUIBASE="@GUIBASE@"
export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
+export HAVE_CXX0X="@HAVE_CXX0X@"
+export HAVE_GCC_AVX="@HAVE_GCC_AVX@"
+export HAVE_GCC_NO_LONG_DOUBLE="@HAVE_GCC_NO_LONG_DOUBLE@"
+export HAVE_GCC_VISIBILITY_BROKEN="@HAVE_GCC_VISIBILITY_BROKEN@"
+export HAVE_GCC_VISIBILITY_FEATURE="@HAVE_GCC_VISIBILITY_FEATURE@"
+export HAVE_GETOPT="@HAVE_GETOPT@"
+export HAVE_LD_BSYMBOLIC_FUNCTIONS="@HAVE_LD_BSYMBOLIC_FUNCTIONS@"
+export HAVE_LD_HASH_STYLE="@HAVE_LD_HASH_STYLE@"
+export HAVE_POSIX_FALLOCATE="@HAVE_POSIX_FALLOCATE@"
+export HAVE_READDIR_R="@HAVE_READDIR_R@"
+export HAVE_THREADSAFE_STATICS="@HAVE_THREADSAFE_STATICS@"
export HSQLDB_JAR="@HSQLDB_JAR@"
+export HUNART_EXTENSION_PACK="@HUNART_EXTENSION_PACK@"
export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
+export HYPHEN_LIB="@HYPHEN_LIB@"
+export HYPH_SYSTEM_DIR="@HYPH_SYSTEM_DIR@"
+export ICU_RECLASSIFIED_CLOSE_PARENTHESIS="@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@"
export INPATH="@INPATH@"
export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
+export INSTALLDIR="@INSTALLDIR@"
+export INSTALLDIRNAME="@INSTALLDIRNAME@"
export INTRO_BIPMAP="@INTRO_BITMAP@"
export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
export KDE4_CFLAGS="@KDE4_CFLAGS@"
@@ -116,17 +170,20 @@ 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_HAVE_GLIB="@KDE_HAVE_GLIB@"
export KDE_LIBS="@KDE_LIBS@"
export LFS_CFLAGS="@LFS_CFLAGS@"
export LIBBASE_JAR="@LIBBASE_JAR@"
export LIBCMIS_CFLAGS="@LIBCMIS_CFLAGS@"
export LIBCMIS_LIBS="@LIBCMIS_LIBS@"
+export LIBDIR="@LIBDIR@"
export LIBEXTTEXTCAT_CFLAGS="@LIBEXTTEXTCAT_CFLAGS@"
export LIBEXTTEXTCAT_LIBS="@LIBEXTTEXTCAT_LIBS@"
export LIBFONTS_JAR="@LIBFONTS_JAR@"
export LIBFORMULA_JAR="@LIBFORMULA_JAR@"
export LIBLAYOUT_JAR="@LIBLAYOUT_JAR@"
export LIBLOADER_JAR="@LIBLOADER_JAR@"
+export LIBMYSQL_PATH="@LIBMYSQL_PATH@"
export LIBPNG_CFLAGS="@LIBPNG_CFLAGS@"
export LIBPNG_LIBS="@LIBPNG_LIBS@"
export LIBREPOSITORY_JAR="@LIBREPOSITORY_JAR@"
@@ -138,31 +195,71 @@ export LIBXSLT_CFLAGS="@LIBXSLT_CFLAGS@"
export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
export LUCENE_ANALYZERS_JAR="@LUCENE_ANALYZERS_JAR@"
export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
+export MANDIR="@MANDIR@"
export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
+export MERGELIBS="@MERGELIBS@"
+export MINGWCXX="@MINGWCXX@"
+export MINGWSTRIP="@MINGWSTRIP@"
+export MINGW_EXTERNAL_DLLS="@MINGW_EXTERNAL_DLLS@"
+export MKDEPENDSOLVER="TRUE"
+export ML_EXE="@ML_EXE@"
+export MOC4="@MOC4@"
+export MOC="@MOC@"
+export MOZILLABUILD="@MOZILLABUILD@"
export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
+export MOZ_FLAVOUR="@MOZ_FLAVOUR@"
+export MOZ_INC="@MOZ_INC@"
export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
+export MOZ_LIB="@MOZ_LIB@"
+export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@"
+export MYSQL_DEFINES="@MYSQL_DEFINES@"
+export MYSQL_INC="@MYSQL_INC@"
+export MYSQL_LIB="@MYSQL_LIB@"
export MYTHES_CFLAGS="@MYTHES_CFLAGS@"
export MYTHES_LIBS="@MYTHES_LIBS@"
export NEON_CFLAGS="@NEON_CFLAGS@"
export NEON_LIBS="@NEON_LIBS@"
+export NEON_VERSION="@NEON_VERSION@"
export NM="@NM@"
export NSS_CFLAGS="@NSS_CFLAGS@"
export NSS_LIBS="@NSS_LIBS@"
+export NUMBERTEXT_EXTENSION_PACK="@NUMBERTEXT_EXTENSION_PACK@"
export OBJDUMP="@OBJDUMP@"
+export OOOBLOGGER_EXTENSION_PACK="@OOOBLOGGER_EXTENSION_PACK@"
+export OOODMAKEMODE="YES"
+export OOOP_FONTS_PACK="@OOOP_FONTS_PACK@"
+export OOOP_GALLERY_PACK="@OOOP_GALLERY_PACK@"
+export OOOP_SAMPLES_PACK="@OOOP_SAMPLES_PACK@"
+export OOOP_TEMPLATES_PACK="@OOOP_TEMPLATES_PACK@"
export OOO_JUNIT_JAR="@OOO_JUNIT_JAR@"
+export OOO_VENDOR="@OOO_VENDOR@"
export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
export OPENSSL_LIBS="@OPENSSL_LIBS@"
export OS="@OS@"
export OS_FOR_BUILD="@OS_FOR_BUILD@"
export OUTPATH="@OUTPATH@"
export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
+export OXYGENOFFICE_PACK="@OXYGENOFFICE_PACK@"
export PATH_SEPERATOR="@P_SEP@"
+export PKGFORMAT="@PKGFORMAT@"
export PKGMK="@PKGMK@"
export PKG_CONFIG="@PKG_CONFIG@"
export POPPLER_CFLAGS="@POPPLER_CFLAGS@"
export POPPLER_LIBS="@POPPLER_LIBS@"
+export POSTGRESQL_INC="@POSTGRESQL_INC@"
+export POSTGRESQL_LIB="@POSTGRESQL_LIB@"
+export PREFIXDIR="@PREFIXDIR@"
+export PRODUCT="@PRODUCT@"
+export PRODUCTNAME="@PRODUCTNAME@"
+export PRODUCTVERSION="@PRODUCTVERSION@"
+export PROGRESSBARCOLOR="@PROGRESSBARCOLOR@"
+export PROGRESSFRAMECOLOR="@PROGRESSFRAMECOLOR@"
+export PROGRESSPOSITION="@PROGRESSPOSITION@"
+export PROGRESSSIZE="@PROGRESSSIZE@"
+export PSPRINT="TRUE"
export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
export PTHREAD_LIBS="@PTHREAD_LIBS@"
+export PYTHON="@PYTHON@"
export PYTHON_CFLAGS="@PYTHON_CFLAGS@"
export PYTHON_LIBS="@PYTHON_LIBS@"
export RANLIB="@RANLIB@"
@@ -174,6 +271,7 @@ export SAL_ENABLE_FILE_LOCKING="1"
export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
export SAMPLEICC_LIBS="@SAMPLEICC_LIBS@"
export SAXON_JAR="@SAXON_JAR@"
+export SCPDEFS='@SCPDEFS@'
export SERVLETAPI_JAR="@SERVLETAPI_JAR@"
export SIZEOF_DOUBLE="@SIZEOF_DOUBLE@"
export SIZEOF_INT="@SIZEOF_INT@"
@@ -181,7 +279,20 @@ export SIZEOF_LONG="@SIZEOF_LONG@"
export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
export SIZEOF_POINTER="@SIZEOF_POINTER@"
export SIZEOF_SHORT="@SIZEOF_SHORT@"
+export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
+export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
+export STARTCENTER_LEFT_BITMAP="@STARTCENTER_LEFT_BITMAP@"
+export STARTCENTER_RIGHT_BITMAP="@STARTCENTER_RIGHT_BITMAP@"
+export STARTCENTER_RTL_LEFT_BITMAP="@STARTCENTER_RTL_LEFT_BITMAP@"
+export STARTCENTER_RTL_RIGHT_BITMAP="@STARTCENTER_RTL_RIGHT_BITMAP@"
+export STARTCENTER_SPACE_BITMAP="@STARTCENTER_SPACE_BITMAP@"
export STRIP="@STRIP@"
+export SUNTEMPLATES_DE_PACK="@SUNTEMPLATES_DE_PACK@"
+export SUNTEMPLATES_EN_US_PACK="@SUNTEMPLATES_EN_US_PACK@"
+export SUNTEMPLATES_ES_PACK="@SUNTEMPLATES_ES_PACK@"
+export SUNTEMPLATES_FR_PACK="@SUNTEMPLATES_FR_PACK@"
+export SUNTEMPLATES_HU_PACK="@SUNTEMPLATES_HU_PACK@"
+export SUNTEMPLATES_IT_PACK="@SUNTEMPLATES_IT_PACK@"
export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
export SYSTEM_BOOST="@SYSTEM_BOOST@"
export SYSTEM_BSH="@SYSTEM_BSH@"
@@ -220,10 +331,13 @@ export SYSTEM_LIBWPD="@SYSTEM_LIBWPD@"
export SYSTEM_LIBWPG="@SYSTEM_LIBWPG@"
export SYSTEM_LIBWPS="@SYSTEM_LIBWPS@"
export SYSTEM_LIBXML="@SYSTEM_LIBXML@"
+export SYSTEM_LIBXSLT="@SYSTEM_LIBXSLT@"
export SYSTEM_LPSOLVE="@SYSTEM_LPSOLVE@"
export SYSTEM_LUCENE="@SYSTEM_LUCENE@"
export SYSTEM_MDDS="@SYSTEM_MDDS@"
export SYSTEM_MESA_HEADERS="@SYSTEM_MESA_HEADERS@"
+export SYSTEM_MOZILLA="@SYSTEM_MOZILLA@"
+export SYSTEM_MOZILLA_HEADERS="@SYSTEM_MOZILLA_HEADERS@"
export SYSTEM_MYSQL="@SYSTEM_MYSQL@"
export SYSTEM_MYSQL_CPPCONN="@SYSTEM_MYSQL_CPPCONN@"
export SYSTEM_MYTHES="@SYSTEM_MYTHES@"
@@ -234,6 +348,7 @@ export SYSTEM_OPENSSL="@SYSTEM_OPENSSL@"
export SYSTEM_PANGO="@SYSTEM_PANGO@"
export SYSTEM_POPPLER="@SYSTEM_POPPLER@"
export SYSTEM_POSTGRESQL="@SYSTEM_POSTGRESQL@"
+export SYSTEM_PYTHON="@SYSTEM_PYTHON@"
export SYSTEM_REDLAND="@SYSTEM_REDLAND@"
export SYSTEM_SAMPLEICC="@SYSTEM_SAMPLEICC@"
export SYSTEM_SANE_HEADER="@SYSTEM_SANE_HEADER@"
@@ -242,16 +357,50 @@ export SYSTEM_SERVLETAPI="@SYSTEM_SERVLETAPI@"
export SYSTEM_STDLIBS="@SYSTEM_STDLIBS@"
export SYSTEM_VIGRA="@SYSTEM_VIGRA@"
export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
+export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@"
+export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
+export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
+export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
+export USE_XINERAMA="@USE_XINERAMA@"
export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
+export VALIDATOR_EXTENSION_PACK="@VALIDATOR_EXTENSION_PACK@"
+export VERBOSE="@VERBOSE@"
export VISIO_CFLAGS="@VISIO_CFLAGS@"
export VISIO_LIBS="@VISIO_LIBS@"
+export WATCH_WINDOW_EXTENSION_PACK="@WATCH_WINDOW_EXTENSION_PACK@"
export WINDRES="@WINDRES@"
+export WITHOUT_AFMS="@WITHOUT_AFMS@"
+export WITHOUT_PPDS="@WITHOUT_PPDS@"
+export WITH_AGFA_MONOTYPE_FONTS="@WITH_AGFA_MONOTYPE_FONTS@"
+export WITH_BINFILTER="@WITH_BINFILTER@"
+export WITH_COMPAT_OOWRAPPERS="@WITH_COMPAT_OOWRAPPERS@"
+export WITH_EXTENSION_INTEGRATION="@WITH_EXTENSION_INTEGRATION@"
+export WITH_EXTRA_FONT="@WITH_EXTRA_FONT@"
+export WITH_EXTRA_GALLERY="@WITH_EXTRA_GALLERY@"
+export WITH_EXTRA_SAMPLE="@WITH_EXTRA_SAMPLE@"
+export WITH_EXTRA_TEMPLATE="@WITH_EXTRA_TEMPLATE@"
+export WITH_FONTS="@WITH_FONTS@"
+export WITH_GSSAPI="@WITH_GSSAPI@"
+export WITH_HELPPACK_INTEGRATION="@WITH_HELPPACK_INTEGRATION@"
+export WITH_KRB5="@WITH_KRB5@"
+export WITH_LANG="@WITH_LANG@"
+export WITH_LANG_LIST="@WITH_LANG_LIST@"
+export WITH_LDAP="@WITH_LDAP@"
+export WITH_LINKER_HASH_STYLE="@WITH_LINKER_HASH_STYLE@"
+export WITH_MOZILLA="@WITH_MOZILLA@"
+export WITH_MYSPELL_DICTS="@WITH_MYSPELL_DICTS@"
+export WITH_OPENLDAP="@WITH_OPENLDAP@"
+export WITH_STLPORT="@WITH_STLPORT@"
+export WITH_THEMES="@WITH_THEMES@"
+export WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
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 XINERAMA_LINK="@XINERAMA_LINK@"
export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
+export XRANDR_DLOPEN="@XRANDR_DLOPEN@"
export XRANDR_LIBS="@XRANDR_LIBS@"
export XSLTPROC="@XSLTPROC@"
diff --git a/configure.in b/configure.in
index ab10538..71b5eb0 100644
--- a/configure.in
+++ b/configure.in
@@ -6598,6 +6598,8 @@ dnl ===================================================================
SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
+# x_ICU us used to comment-out ICU_MAJOR/MINOR/MICRO in config_host.mk
+x_ICU=
ICU_MAJOR=
ICU_MINOR=
ICU_MICRO=
@@ -6652,10 +6654,13 @@ if test "$with_system_icu" = "yes"; then
MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll"
else
AC_MSG_RESULT([internal])
+ x_ICU=[\#]
SYSTEM_ICU="NO"
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
BUILD_TYPE="$BUILD_TYPE ICU"
fi
+
+AC_SUBST(x_ICU)
AC_SUBST(SYSTEM_ICU)
AC_SUBST(SYSTEM_GENBRK)
AC_SUBST(SYSTEM_GENCCODE)
diff --git a/set_soenv.in b/set_soenv.in
index f8853e8..4276058 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1223,7 +1223,6 @@ ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" );
ToFile( "ANT", PathFormat("@ANT@"), "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" );
ToFile( "ASM_PATH", $ASM_PATH, "e" );
-ToFile( "ML_EXE", "@ML_EXE@", "e" );
ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" );
ToFile( "Empty", $empty, "n" );
@@ -1232,20 +1231,6 @@ ToFile( "Empty", $empty, "n" );
# (c = comment, e = environment variable, a = alias )
ToFile( "Platform independent constant values.", $empty, "c" );
# Languages
-ToFile( "WITH_LANG", "@WITH_LANG@", "e" );
-ToFile( "WITH_LANG_LIST", "@WITH_LANG_LIST@", "e" );
-ToFile( "PROGRESSBARCOLOR", "@PROGRESSBARCOLOR@", "e" );
-ToFile( "PROGRESSSIZE", "@PROGRESSSIZE@", "e" );
-ToFile( "PROGRESSPOSITION", "@PROGRESSPOSITION@", "e" );
-ToFile( "PROGRESSFRAMECOLOR","@PROGRESSFRAMECOLOR@", "e" );
-ToFile( "STARTCENTER_LEFT_BITMAP", "@STARTCENTER_LEFT_BITMAP@", "e" );
-ToFile( "STARTCENTER_RIGHT_BITMAP", "@STARTCENTER_RIGHT_BITMAP@", "e" );
-ToFile( "STARTCENTER_RTL_LEFT_BITMAP", "@STARTCENTER_RTL_LEFT_BITMAP@", "e" );
-ToFile( "STARTCENTER_RTL_RIGHT_BITMAP", "@STARTCENTER_RTL_RIGHT_BITMAP@", "e" );
-ToFile( "STARTCENTER_SPACE_BITMAP", "@STARTCENTER_SPACE_BITMAP@", "e" );
-ToFile( "OOO_VENDOR", "@OOO_VENDOR@", "e" );
-ToFile( "OOODMAKEMODE", "YES", "e" );
-ToFile( "PRODUCTVERSION", "@PRODUCTVERSION@", "e" );
ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
@@ -1254,44 +1239,15 @@ ToFile( "debug", "true", "e" );
if ("@ENABLE_WERROR@" eq "FALSE") {
ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" );
}
-ToFile( "PRODUCT", "@PRODUCT@", "e" );
ToFile( "PROEXT", $PROEXT, "e" );
-ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" );
-ToFile( "UNIXWRAPPERNAME", "@UNIXWRAPPERNAME@","e" );
-ToFile( "PRODUCTNAME", "@PRODUCTNAME@", "e" );
-ToFile( "INSTALLDIRNAME", "@INSTALLDIRNAME@", "e" );
-ToFile( "PREFIXDIR", "@PREFIXDIR@", "e" );
-ToFile( "INSTALLDIR", "@INSTALLDIR@", "e" );
-ToFile( "LIBDIR", "@LIBDIR@", "e" );
-ToFile( "DATADIR", "@DATADIR@", "e" );
-ToFile( "MANDIR", "@MANDIR@", "e" );
-ToFile( "DOCDIR", "@DOCDIR@", "e" );
-ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
-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( "SYSTEM_MOZILLA_HEADERS", "@SYSTEM_MOZILLA_HEADERS@", "e" );
-ToFile( "MOZILLABUILD", "@MOZILLABUILD@", "e" );
-ToFile( "BUILD_VER_STRING", "@BUILD_VER_STRING@", "e" );
if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
-ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
-ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
-ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
-ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
-ToFile( "WITH_HELPPACK_INTEGRATION", "@WITH_HELPPACK_INTEGRATION@", "e");
-ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e");
-ToFile( "MOC", "@MOC@", "e" );
-ToFile( "MOC4", "@MOC4@", "e" );
-ToFile( "KDE_HAVE_GLIB", "@KDE_HAVE_GLIB@", "e" );
-ToFile( "PSPRINT", "TRUE", "e" );
-ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
ToFile( "nodep", "@nodep@", "e" );
ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" );
-ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@", "e" );
-ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@", "e" );
#
# Writing the platform dependent constant values to file.
@@ -1389,7 +1345,6 @@ if ( $JDK ne "gcj" ) {
else {
ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" );
}
-ToFile( "AWTLIB", '@AWTLIB@', "e" );
if ( '@JDK@' ne '' )
{
ToFile( "JDK", "@JDK@", "e" );
@@ -1402,7 +1357,6 @@ if ( '@JDK@' ne '' )
ToFile( "JAVADOC", PathFormat("@JAVADOC@"), "e" );
ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
}
-ToFile( "SCPDEFS", '@SCPDEFS@', "e" );
ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" );
ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" );
if ( '@CROSS_COMPILING@' eq 'YES' )
@@ -1453,120 +1407,14 @@ else
ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB, "e" );
ToFile( "WORKDIR_FOR_BUILD", $WORKDIR, "e" );
}
-ToFile( "BUILD_NCPUS", "@BUILD_NCPUS@", "e" );
-ToFile( "GMAKE_PARALLELISM", "@GMAKE_PARALLELISM@", "e" );
-ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" );
-ToFile( "ALIGNOF_SHORT", "@ALIGNOF_SHORT@", "e" );
-ToFile( "ALIGNOF_INT", "@ALIGNOF_INT@", "e" );
-ToFile( "ALIGNOF_LONG", "@ALIGNOF_LONG@", "e" );
-ToFile( "ALIGNOF_DOUBLE", "@ALIGNOF_DOUBLE@", "e" );
-ToFile( "WORDS_BIGENDIAN", "@WORDS_BIGENDIAN@", "e" );
-ToFile( "HAVE_GCC_NO_LONG_DOUBLE", "@HAVE_GCC_NO_LONG_DOUBLE@", "e" );
-ToFile( "HAVE_GCC_AVX", "@HAVE_GCC_AVX@", "e" );
-ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
- "@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
-ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
- "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
-ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
-ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
-ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
- "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
-ToFile( "HAVE_THREADSAFE_STATICS", "@HAVE_THREADSAFE_STATICS@", "e" );
-ToFile( "HAVE_CXX0X", "@HAVE_CXX0X@", "e" );
ToFile( "CXX", $CXX, "e" );
-ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
-ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );
-ToFile( "WITH_STLPORT", "@WITH_STLPORT@", "e" );
-ToFile( "ALLOC", "@ALLOC@", "e" );
-ToFile( "DISABLE_LINKOO", "@DISABLE_LINKOO@", "e" );
-ToFile( "DISABLE_STRIP", "@DISABLE_STRIP@", "e" );
-ToFile( "CL_X64", "@CL_X64@", "e");
-ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
-ToFile( "DICT_SYSTEM_DIR", "@DICT_SYSTEM_DIR@", "e");
-ToFile( "HYPH_SYSTEM_DIR", "@HYPH_SYSTEM_DIR@", "e");
-ToFile( "THES_SYSTEM_DIR", "@THES_SYSTEM_DIR@", "e");
-ToFile( "WITH_LDAP", "@WITH_LDAP@", "e" );
-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( "MOZ_INC", "@MOZ_INC@", "e" );
-ToFile( "MOZ_LIB", "@MOZ_LIB@", "e" );
-ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "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" );
-ToFile( "OOOP_SAMPLES_PACK", "@OOOP_SAMPLES_PACK@","e" );
-ToFile( "CT2N_EXTENSION_PACK", "@CT2N_EXTENSION_PACK@","e" );
-ToFile( "BARCODE_EXTENSION_PACK", "@BARCODE_EXTENSION_PACK@","e" );
-ToFile( "DIAGRAM_EXTENSION_PACK", "@DIAGRAM_EXTENSION_PACK@","e" );
-ToFile( "VALIDATOR_EXTENSION_PACK", "@VALIDATOR_EXTENSION_PACK@","e" );
-ToFile( "WATCH_WINDOW_EXTENSION_PACK", "@WATCH_WINDOW_EXTENSION_PACK@","e" );
-ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
-ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
-ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
-ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
-ToFile( "OOOBLOGGER_EXTENSION_PACK", "@OOOBLOGGER_EXTENSION_PACK@","e" );
-ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
-ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
-ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
-ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
-ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
-ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
-ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
-ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
-ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
-ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" );
-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( "BUILD_TYPE", "$BUILD_TYPE", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
ToFile( "LINKFLAGSRUNPATH",'', "e" );
}
ToFile( "EPM_FLAGS", $EPM_FLAGS, "e" );
-ToFile( "BUILD_EPM", "@BUILD_EPM@", "e" );
-ToFile( "GPERF", "@GPERF@", "e" );
-ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" );
-ToFile( "DISABLE_PYTHON", "@DISABLE_PYTHON@", "e" );
-ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
-ToFile( "PYTHON", "@PYTHON@", "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( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" );
-ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "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" );
-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( "MYSQL_INC", "@MYSQL_INC@", "e" );
-ToFile( "MYSQL_LIB", "@MYSQL_LIB@", "e" );
-ToFile( "MYSQL_DEFINES", "@MYSQL_DEFINES@", "e" );
-ToFile( "LIBMYSQL_PATH", "@LIBMYSQL_PATH@", "e" );
-ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
-ToFile( "NEON_VERSION", "@NEON_VERSION@", "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( "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( "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( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
-ToFile( "MERGELIBS", "@MERGELIBS@", "e" );
if ($platform !~ m/cygwin/) {
if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
@@ -1607,7 +1455,6 @@ if ($platform =~ m/solaris|darwin|freebsd/)
{
ToFile( "GNUPATCH", "@GNUPATCH@", "e");
}
-ToFile( "GNUCOPY", "@GNUCP@", "e");
ToFile( "ENV_SCRIPT", "$outfile", "e" );
#
commit 8bfd2b6af998d1949edcb7573bdf93cfcbbcff31
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Jan 1 00:15:51 2012 -0600
move mostly program locator variables out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index 2705eb4..ebd3d46 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -5,6 +5,8 @@
export SRC_ROOT="@SRC_ROOT@"
export ABOUT_BITMAP="@ABOUT_BITMAP@"
+export ANCIENT_BISON="@ANCIENT_BISON@"
+export AR="@AR@"
export BSH_JAR="@BSH_JAR@"
export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
export CAIRO_LIBS="@CAIRO_LIBS@"
@@ -22,6 +24,7 @@ export CPU="@CPU@"
export CPUNAME="@CPUNAME@"
export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
+export CROSS_COMPILING="@CROSS_COMPILING@"
export CURL_CFLAGS="@CURL_CFLAGS@"
export CURL_LIBS="@CURL_LIBS@"
export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
@@ -29,6 +32,8 @@ export DBUSMENUGTK_LIBS="@DBUSMENUGTK_LIBS@"
export DBUS_CFLAGS="@DBUS_CFLAGS@"
export DBUS_LIBS="@DBUS_LIBS@"
export DISABLE_NEON="@DISABLE_NEON@"
+export DLLTOOL="@DLLTOOL@"
+export DPKG="@DPKG@"
export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
export ENABLE_DBUS="@ENABLE_DBUS@"
@@ -71,13 +76,18 @@ export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
export ENABLE_UGLY="@ENABLE_UGLY@"
export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export EPM="@EPM@"
export FLUTE_JAR="@FLUTE_JAR@"
export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
export FREETYPE_LIBS="@FREETYPE_LIBS@"
+export GNUCOPY="@GNUCP@"
+export GNUMAKE="@GNUMAKE@"
+export GNUTAR="@GNUTAR@"
export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
export GOBJECT_LIBS="@GOBJECT_LIBS@"
+export GPERF="@GPERF@"
export GRAPHITE_CFLAGS="@GRAPHITE_CFLAGS@"
export GRAPHITE_LIBS="@GRAPHITE_LIBS@"
export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
@@ -135,8 +145,10 @@ export MYTHES_CFLAGS="@MYTHES_CFLAGS@"
export MYTHES_LIBS="@MYTHES_LIBS@"
export NEON_CFLAGS="@NEON_CFLAGS@"
export NEON_LIBS="@NEON_LIBS@"
+export NM="@NM@"
export NSS_CFLAGS="@NSS_CFLAGS@"
export NSS_LIBS="@NSS_LIBS@"
+export OBJDUMP="@OBJDUMP@"
export OOO_JUNIT_JAR="@OOO_JUNIT_JAR@"
export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
export OPENSSL_LIBS="@OPENSSL_LIBS@"
@@ -145,14 +157,18 @@ export OS_FOR_BUILD="@OS_FOR_BUILD@"
export OUTPATH="@OUTPATH@"
export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
export PATH_SEPERATOR="@P_SEP@"
+export PKGMK="@PKGMK@"
+export PKG_CONFIG="@PKG_CONFIG@"
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 RANLIB="@RANLIB@"
export REDLAND_CFLAGS="@REDLAND_CFLAGS@"
export REDLAND_LIBS="@REDLAND_LIBS@"
+export RPM="@RPM@"
export SAC_JAR="@SAC_JAR@"
export SAL_ENABLE_FILE_LOCKING="1"
export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
@@ -165,6 +181,7 @@ export SIZEOF_LONG="@SIZEOF_LONG@"
export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
export SIZEOF_POINTER="@SIZEOF_POINTER@"
export SIZEOF_SHORT="@SIZEOF_SHORT@"
+export STRIP="@STRIP@"
export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
export SYSTEM_BOOST="@SYSTEM_BOOST@"
export SYSTEM_BSH="@SYSTEM_BSH@"
@@ -228,6 +245,7 @@ export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
export VISIO_CFLAGS="@VISIO_CFLAGS@"
export VISIO_LIBS="@VISIO_LIBS@"
+export WINDRES="@WINDRES@"
export WPD_CFLAGS="@WPD_CFLAGS@"
export WPD_LIBS="@WPD_LIBS@"
export WPG_CFLAGS="@WPG_CFLAGS@"
diff --git a/set_soenv.in b/set_soenv.in
index 488eaff..f8853e8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1371,12 +1371,6 @@ if ("@WITH_VC_REDIST@" eq "TRUE") {
ToFile( "WITH_VC_REDIST", "TRUE", "e" );
}
ToFile( "PERL", $PERL, "e" );
-ToFile( "RPM", "@RPM@", "e" );
-ToFile( "DPKG", "@DPKG@", "e" );
-ToFile( "PKGMK", "@PKGMK@", "e" );
-ToFile( "GNUMAKE", "@GNUMAKE@", "e" );
-ToFile( "GNUTAR", "@GNUTAR@", "e" );
-ToFile( "ANCIENT_BISON", "@ANCIENT_BISON@", "e" );
ToFile( "UPD", $UPD, "e" );
ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
ToFile( "SOLARVER", $SOLARVER, "e" );
@@ -1433,15 +1427,6 @@ else
{ $SYSBASE = '';
}
ToFile( "SYSBASE", "$SYSBASE", "e" );
-ToFile( "CROSS_COMPILING", "@CROSS_COMPILING@","e" );
-ToFile( "AR", "@AR@", "e" );
-ToFile( "DLLTOOL", "@DLLTOOL@", "e" );
-ToFile( "NM", "@NM@", "e" );
-ToFile( "OBJDUMP", "@OBJDUMP@", "e" );
-ToFile( "PKG_CONFIG", "@PKG_CONFIG@", "e" );
-ToFile( "RANLIB", "@RANLIB@", "e" );
-ToFile( "STRIP", "@STRIP@", "e" );
-ToFile( "WINDRES", "@WINDRES@", "e" );
ToFile( "BUILD_PLATFORM", "@build@", "e" );
ToFile( "HOST_PLATFORM", "@host@", "e" );
if ( '@CROSS_COMPILING@' eq 'YES' )
@@ -1539,7 +1524,6 @@ ToFile( "VERBOSE", "@VERBOSE@", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
ToFile( "LINKFLAGSRUNPATH",'', "e" );
}
-ToFile( "EPM", "@EPM@", "e" );
ToFile( "EPM_FLAGS", $EPM_FLAGS, "e" );
ToFile( "BUILD_EPM", "@BUILD_EPM@", "e" );
ToFile( "GPERF", "@GPERF@", "e" );
commit 465b99f614e63edea8daf7b3fe17f37e86f06e2c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 31 22:47:53 2011 -0600
migrate *_JAR out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index 7634c5b..2705eb4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -5,18 +5,23 @@
export SRC_ROOT="@SRC_ROOT@"
export ABOUT_BITMAP="@ABOUT_BITMAP@"
+export BSH_JAR="@BSH_JAR@"
export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
export CAIRO_LIBS="@CAIRO_LIBS@"
export CDR_CFLAGS="@CDR_CFLAGS@"
export CDR_LIBS="@CDR_LIBS@"
export COM="@COM@"
+export COMMONS_CODEC_JAR="@COMMONS_CODEC_JAR@"
+export COMMONS_HTTPCLIENT_JAR="@COMMONS_HTTPCLIENT_JAR@"
+export COMMONS_LANG_JAR="@COMMONS_LANG_JAR@"
+export COMMONS_LOGGING_JAR="@COMMONS_LOGGING_JAR@"
export COM_FOR_BUILD="@COM_FOR_BUILD@"
export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
export CPU="@CPU@"
-export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
export CPUNAME="@CPUNAME@"
export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
+export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
export CURL_CFLAGS="@CURL_CFLAGS@"
export CURL_LIBS="@CURL_LIBS@"
export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
@@ -66,6 +71,7 @@ export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
export ENABLE_UGLY="@ENABLE_UGLY@"
export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export FLUTE_JAR="@FLUTE_JAR@"
export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
@@ -78,21 +84,23 @@ export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
export GSTREAMER_LIBS="@GSTREAMER_LIBS@"
export GTHREAD_CFLAGS="@GTHREAD_CFLAGS@"
export GTHREAD_LIBS="@GTHREAD_LIBS@"
-export GUI="@GUI@"
-export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
-export GUIBASE="@GUIBASE@"
-export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
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 GUI="@GUI@"
+export GUIBASE="@GUIBASE@"
+export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
+export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
+export HSQLDB_JAR="@HSQLDB_JAR@"
export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
export INPATH="@INPATH@"
export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
export INTRO_BIPMAP="@INTRO_BITMAP@"
+export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
export KDE4_CFLAGS="@KDE4_CFLAGS@"
export KDE4_LIBS="@KDE4_LIBS@"
export KDE_CFLAGS="@KDE_CFLAGS@"
@@ -100,16 +108,26 @@ 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 LIBBASE_JAR="@LIBBASE_JAR@"
export LIBCMIS_CFLAGS="@LIBCMIS_CFLAGS@"
export LIBCMIS_LIBS="@LIBCMIS_LIBS@"
export LIBEXTTEXTCAT_CFLAGS="@LIBEXTTEXTCAT_CFLAGS@"
export LIBEXTTEXTCAT_LIBS="@LIBEXTTEXTCAT_LIBS@"
+export LIBFONTS_JAR="@LIBFONTS_JAR@"
+export LIBFORMULA_JAR="@LIBFORMULA_JAR@"
+export LIBLAYOUT_JAR="@LIBLAYOUT_JAR@"
+export LIBLOADER_JAR="@LIBLOADER_JAR@"
export LIBPNG_CFLAGS="@LIBPNG_CFLAGS@"
export LIBPNG_LIBS="@LIBPNG_LIBS@"
+export LIBREPOSITORY_JAR="@LIBREPOSITORY_JAR@"
+export LIBSERIALIZER_JAR="@LIBSERIALIZER_JAR@"
export LIBXML_CFLAGS="@LIBXML_CFLAGS@"
+export LIBXML_JAR="@LIBXML_JAR@"
export LIBXML_LIBS="@LIBXML_LIBS@"
export LIBXSLT_CFLAGS="@LIBXSLT_CFLAGS@"
export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
+export LUCENE_ANALYZERS_JAR="@LUCENE_ANALYZERS_JAR@"
+export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
@@ -119,6 +137,7 @@ export NEON_CFLAGS="@NEON_CFLAGS@"
export NEON_LIBS="@NEON_LIBS@"
export NSS_CFLAGS="@NSS_CFLAGS@"
export NSS_LIBS="@NSS_LIBS@"
+export OOO_JUNIT_JAR="@OOO_JUNIT_JAR@"
export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
export OPENSSL_LIBS="@OPENSSL_LIBS@"
export OS="@OS@"
@@ -134,9 +153,12 @@ export PYTHON_CFLAGS="@PYTHON_CFLAGS@"
export PYTHON_LIBS="@PYTHON_LIBS@"
export REDLAND_CFLAGS="@REDLAND_CFLAGS@"
export REDLAND_LIBS="@REDLAND_LIBS@"
+export SAC_JAR="@SAC_JAR@"
export SAL_ENABLE_FILE_LOCKING="1"
export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
export SAMPLEICC_LIBS="@SAMPLEICC_LIBS@"
+export SAXON_JAR="@SAXON_JAR@"
+export SERVLETAPI_JAR="@SERVLETAPI_JAR@"
export SIZEOF_DOUBLE="@SIZEOF_DOUBLE@"
export SIZEOF_INT="@SIZEOF_INT@"
export SIZEOF_LONG="@SIZEOF_LONG@"
@@ -212,6 +234,6 @@ export WPG_CFLAGS="@WPG_CFLAGS@"
export WPG_LIBS="@WPG_LIBS@"
export WPS_CFLAGS="@WPS_CFLAGS@"
export WPS_LIBS="@WPS_LIBS@"
-export XSLTPROC="@XSLTPROC@"
export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
export XRANDR_LIBS="@XRANDR_LIBS@"
+export XSLTPROC="@XSLTPROC@"
diff --git a/set_soenv.in b/set_soenv.in
index 464727d..488eaff 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1283,23 +1283,6 @@ ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
ToFile( "WITH_HELPPACK_INTEGRATION", "@WITH_HELPPACK_INTEGRATION@", "e");
ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e");
-ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
-ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
-ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" );
-ToFile( "FLUTE_JAR", "@FLUTE_JAR@", "e" );
-ToFile( "JFREEREPORT_JAR", "@JFREEREPORT_JAR@", "e" );
-ToFile( "LIBLAYOUT_JAR", "@LIBLAYOUT_JAR@", "e" );
-ToFile( "LIBLOADER_JAR", "@LIBLOADER_JAR@", "e" );
-ToFile( "LIBFORMULA_JAR", "@LIBFORMULA_JAR@", "e" );
-ToFile( "LIBREPOSITORY_JAR", "@LIBREPOSITORY_JAR@","e" );
-ToFile( "LIBBASE_JAR", "@LIBBASE_JAR@", "e" );
-ToFile( "LIBFONTS_JAR", "@LIBFONTS_JAR@", "e" );
-ToFile( "LIBSERIALIZER_JAR", "@LIBSERIALIZER_JAR@","e" );
-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( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" );
ToFile( "MOC", "@MOC@", "e" );
ToFile( "MOC4", "@MOC4@", "e" );
ToFile( "KDE_HAVE_GLIB", "@KDE_HAVE_GLIB@", "e" );
@@ -1581,11 +1564,6 @@ ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" );
ToFile( "MYSQL_LIB", "@MYSQL_LIB@", "e" );
ToFile( "MYSQL_DEFINES", "@MYSQL_DEFINES@", "e" );
ToFile( "LIBMYSQL_PATH", "@LIBMYSQL_PATH@", "e" );
-ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
-ToFile( "LUCENE_CORE_JAR", "@LUCENE_CORE_JAR@", "e" );
-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( "NEON_VERSION", "@NEON_VERSION@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
commit 004df8153c15be4c3c27ffae4b8eb12a63f77d4b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 31 22:13:14 2011 -0600
migrate XSLTPROC out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index c60b08e..7634c5b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -212,5 +212,6 @@ export WPG_CFLAGS="@WPG_CFLAGS@"
export WPG_LIBS="@WPG_LIBS@"
export WPS_CFLAGS="@WPS_CFLAGS@"
export WPS_LIBS="@WPS_LIBS@"
+export XSLTPROC="@XSLTPROC@"
export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
export XRANDR_LIBS="@XRANDR_LIBS@"
diff --git a/set_soenv.in b/set_soenv.in
index 6bb81f7..464727d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1587,7 +1587,6 @@ 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( "XSLTPROC", "@XSLTPROC@", "e" );
ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index c07e5c3..3f8fc9e 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -35,11 +35,13 @@ AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl
GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck
+.IF "$(XSLTPROC)"=""
.IF "$(SYSTEM_LIBXSLT)"!="YES"
-XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
+XSLTPROC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
.ELSE # "$(SYSTEM_LIBXSLT)"!="YES"
-XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
+XSLTPROC=$(AUGMENT_LIBRARY_PATH) xsltproc
.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES"
+.ENDIF
ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
commit 804a69656027a4b6cbee299ffb271e83d7e46f5c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Dec 31 22:06:44 2011 -0600
migrate ABOUT_BITMAP and INTRO_BITMAP out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index 1776165..c60b08e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,6 +4,7 @@
#
export SRC_ROOT="@SRC_ROOT@"
+export ABOUT_BITMAP="@ABOUT_BITMAP@"
export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
export CAIRO_LIBS="@CAIRO_LIBS@"
export CDR_CFLAGS="@CDR_CFLAGS@"
@@ -91,6 +92,7 @@ export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
export INPATH="@INPATH@"
export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
+export INTRO_BIPMAP="@INTRO_BITMAP@"
export KDE4_CFLAGS="@KDE4_CFLAGS@"
export KDE4_LIBS="@KDE4_LIBS@"
export KDE_CFLAGS="@KDE_CFLAGS@"
diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile
index 7b062a3..46ca14d 100644
--- a/desktop/branding/Makefile
+++ b/desktop/branding/Makefile
@@ -27,11 +27,11 @@
SRCDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/../..)
-ifndef ABOUT_BITMAP
+ifeq ($(strip $(ABOUT_BITMAP)),)
ABOUT_BITMAP := $(SRCDIR)/default_images/brand/about.png
endif
-ifndef INTRO_BITMAP
+ifeq ($(strip $(INTRO_BITMAP)),)
INTRO_BITMAP := $(SRCDIR)/default_images/brand/intro.png
endif
diff --git a/set_soenv.in b/set_soenv.in
index e63e44c..6bb81f7 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1234,12 +1234,10 @@ ToFile( "Platform independent constant values.", $empty, "c" );
# Languages
ToFile( "WITH_LANG", "@WITH_LANG@", "e" );
ToFile( "WITH_LANG_LIST", "@WITH_LANG_LIST@", "e" );
-ToFile( "INTRO_BITMAP", "@INTRO_BITMAP@", "e" );
ToFile( "PROGRESSBARCOLOR", "@PROGRESSBARCOLOR@", "e" );
ToFile( "PROGRESSSIZE", "@PROGRESSSIZE@", "e" );
ToFile( "PROGRESSPOSITION", "@PROGRESSPOSITION@", "e" );
ToFile( "PROGRESSFRAMECOLOR","@PROGRESSFRAMECOLOR@", "e" );
-ToFile( "ABOUT_BITMAP", "@ABOUT_BITMAP@", "e" );
ToFile( "STARTCENTER_LEFT_BITMAP", "@STARTCENTER_LEFT_BITMAP@", "e" );
ToFile( "STARTCENTER_RIGHT_BITMAP", "@STARTCENTER_RIGHT_BITMAP@", "e" );
ToFile( "STARTCENTER_RTL_LEFT_BITMAP", "@STARTCENTER_RTL_LEFT_BITMAP@", "e" );
More information about the Libreoffice-commits
mailing list