migrate a bunch of mostly windows related variables + clean-up in set_soenv

1 files changed, 48 insertions, 0 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 7ae412336269..4bb228863cb2 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -10,6 +10,9 @@ export ALIGNOF_INT="@ALIGNOF_INT@"
 export ALIGNOF_LONG="@ALIGNOF_LONG@"
 export ALIGNOF_SHORT="@ALIGNOF_SHORT@"
 export ALLOC="@ALLOC@"
+export ANT="@ANT@"
+export ANT_HOME="@ANT_HOME@"
+export ANT_LIB="@ANT_LIB@"
 export ANCIENT_BISON="@ANCIENT_BISON@"
 export ANDROID_NDK_HOME="@ANDROID_NDK_HOME@"
 export ANDROID_SDK_HOME="@ANDROID_SDK_HOME@"
@@ -23,13 +26,17 @@ export BUILD_DMAKE="@BUILD_DMAKE@"
 export BUILD_EPM="@BUILD_EPM@"
 export BUILD_MOZAB="@BUILD_MOZAB@"
 export BUILD_NCPUS="@BUILD_NCPUS@"
+export BUILD_PLATFORM="@build@"
 export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@"
 export BUILD_STAX="@BUILD_STAX@"
 export BUILD_TYPE="@BUILD_TYPE@"
 export BUILD_UNOWINREG="@BUILD_UNOWINREG@"
 export BUILD_VER_STRING="@BUILD_VER_STRING@"
+export BUILD_X64="@BUILD_X64@"
 export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
 export CAIRO_LIBS="@CAIRO_LIBS@"
+export CC="@CC@"
+export CC_FOR_BUILD="@CC_FOR_BUILD@"
 export CDR_CFLAGS="@CDR_CFLAGS@"
 export CDR_LIBS="@CDR_LIBS@"
 export CL_X64="@CL_X64@"
@@ -40,6 +47,7 @@ export COMMONS_HTTPCLIENT_JAR="@COMMONS_HTTPCLIENT_JAR@"
 export COMMONS_LANG_JAR="@COMMONS_LANG_JAR@"
 export COMMONS_LOGGING_JAR="@COMMONS_LOGGING_JAR@"
 export COMPATH="@COMPATH@"
+export COMP_ENV="@OUTPATH@"
 export COM_FOR_BUILD="@COM_FOR_BUILD@"
 export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
 export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
@@ -51,6 +59,9 @@ export CROSS_COMPILING="@CROSS_COMPILING@"
 export CT2N_EXTENSION_PACK="@CT2N_EXTENSION_PACK@"
 export CURL_CFLAGS="@CURL_CFLAGS@"
 export CURL_LIBS="@CURL_LIBS@"
+export CXX="@CXX@"
+export CXX_FOR_BUILD="@CXX_FOR_BUILD@"
+export CXX_X64_BINARY="@CXX_X64_BINARY@"
 export DATADIR="@DATADIR@"
 export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
 export DBUSMENUGTK_LIBS="@DBUSMENUGTK_LIBS@"
@@ -63,11 +74,15 @@ export DEFAULT_MOZILLA_TOOLKIT="@MOZILLA_TOOLKIT@"
 export DEFAULT_TO_ENGLISH_FOR_PACKING="yes"
 export DIAGRAM_EXTENSION_PACK="@DIAGRAM_EXTENSION_PACK@"
 export DICT_SYSTEM_DIR="@DICT_SYSTEM_DIR@"
+export DIRECTXSDK_LIB="@DIRECTXSDK_LIB@"
+export DISABLE_ACTIVEX="@DISABLE_ACTIVEX@"
+export DISABLE_ATL="@DISABLE_ATL@"
 export DISABLE_LINKOO="@DISABLE_LINKOO@"
 export DISABLE_NEON="@DISABLE_NEON@"
 export DISABLE_PYTHON="@DISABLE_PYTHON@"
 export DISABLE_STRIP="@DISABLE_STRIP@"
 export DLLTOOL="@DLLTOOL@"
+export DMAKEROOT="@SRC_ROOT@/solenv/inc/startup"
 export DOCDIR="@DOCDIR@"
 export DOXYGEN="@DOXYGEN@"
 export DO_FETCH_TARBALLS="@DO_FETCH_TARBALLS@"
@@ -118,6 +133,7 @@ export ENABLE_ZENITY="@ENABLE_ZENITY@"
 export EPM="@EPM@"
 export EPM_FLAGS="@EPM_FLAGS@"
 export EXTERNAL_WARNINGS_NOT_ERRORS="@EXTERNAL_WARNINGS_NOT_ERRORS@"
+@x_Cygwin@ export FIND="@WIN_FIND@"
 export FLUTE_JAR="@FLUTE_JAR@"
 export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
 export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
@@ -136,6 +152,7 @@ export GNOMEVFS_CFLAGS="@GNOMEVFS_CFLAGS@"
 export GNOMEVFS_LIBS="@GNOMEVFS_LIBS@"
 @x_GNUCP@ export GNUCOPY="@GNUCP@"
 export GNUMAKE="@GNUMAKE@"
+export GNUPATCH="@GNUPATCH@"
 export GNUTAR="@GNUTAR@"
 export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
 export GOBJECT_LIBS="@GOBJECT_LIBS@"
@@ -144,6 +161,7 @@ export GPERF="@GPERF@"
 export GPERF="@GPERF@"
 export GRAPHITE_CFLAGS="@GRAPHITE_CFLAGS@"
 export GRAPHITE_LIBS="@GRAPHITE_LIBS@"
+@x_Cygwin@ export GREP="@WIN_GREP@"
 export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
 export GSTREAMER_LIBS="@GSTREAMER_LIBS@"
 export GTHREAD_CFLAGS="@GTHREAD_CFLAGS@"
@@ -158,6 +176,7 @@ export GUI="@GUI@"
 export GUIBASE="@GUIBASE@"
 export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
 export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
+export GXX_INCLUDE_PATH="@GXX_INCLUDE_PATH@"
 export HAVE_CXX0X="@HAVE_CXX0X@"
 export HAVE_GCC_AVX="@HAVE_GCC_AVX@"
 export HAVE_GCC_NO_LONG_DOUBLE="@HAVE_GCC_NO_LONG_DOUBLE@"
@@ -169,6 +188,7 @@ 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 HOST_PLATFORM="@host@"
 export HSQLDB_JAR="@HSQLDB_JAR@"
 export HUNART_EXTENSION_PACK="@HUNART_EXTENSION_PACK@"
 export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
@@ -179,14 +199,26 @@ export ICU_MAJOR="@ICU_MAJOR@"
 export ICU_MICRO="@ICU_MICRO@"
 export ICU_MINOR="@ICU_MINOR@"
 export ICU_RECLASSIFIED_CLOSE_PARENTHESIS="@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@"
+export ILIB="@ILIB@"
+@x_Cygwin@ export INCLUDE=""
 export INPATH="@INPATH@"
 export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
 export INSTALLDIR="@INSTALLDIR@"
 export INSTALLDIRNAME="@INSTALLDIRNAME@"
 export INTRO_BIPMAP="@INTRO_BITMAP@"
+export JAVAFLAGS="@JAVAFLAGS@"
+export JAVAIFLAGS="@JAVAIFLAGS@"
+export JAVAINTERPRETER="@JAVAINTERPRETER@"
+export JAVACOMPILER="@JAVACOMPILER@"
+export JAVADOC="@JAVADOC@"
 @x_JAVALIB@ export JAVALIB="@JAVALIB@"
+export JAVA_SOURCE_VER="@JAVA_SOURCE_VER@"
+export JAVA_TARGET_VER="@JAVA_TARGET_VER@"
+export JDK="@JDK@"
+@x_JDKLIB@ export JDKLIB="@JDKLIB@"
 export JITC_PROCESSOR_TYPE="@JITC_PROCESSOR_TYPE@"
 export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
+export JVM_ONE_PATH_CHECK="@JVM_ONE_PATH_CHECK@"
 export KDE4_CFLAGS="@KDE4_CFLAGS@"
 export KDE4_LIBS="@KDE4_LIBS@"
 export KDE_CFLAGS="@KDE_CFLAGS@"
@@ -206,6 +238,7 @@ export LIBFONTS_JAR="@LIBFONTS_JAR@"
 export LIBFORMULA_JAR="@LIBFORMULA_JAR@"
 export LIBLAYOUT_JAR="@LIBLAYOUT_JAR@"
 export LIBLOADER_JAR="@LIBLOADER_JAR@"
+export LIBMGR_X64_BINARY="@LIBMGR_X64_BINARY@"
 export LIBMYSQL_PATH="@LIBMYSQL_PATH@"
 export LIBPNG_CFLAGS="@LIBPNG_CFLAGS@"
 export LIBPNG_LIBS="@LIBPNG_LIBS@"
@@ -216,6 +249,8 @@ export LIBXML_JAR="@LIBXML_JAR@"
 export LIBXML_LIBS="@LIBXML_LIBS@"
 export LIBXSLT_CFLAGS="@LIBXSLT_CFLAGS@"
 export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
+export LINK_X64_BINARY="@LINK_X64_BINARY@"
+@x_Cygwin@ export LS="@WIN_LS@"
 export LUCENE_ANALYZERS_JAR="@LUCENE_ANALYZERS_JAR@"
 export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
 export MANDIR="@MANDIR@"
@@ -230,7 +265,13 @@ export MFC_INCLUDE="@MFC_INCLUDE@"
 export MFC_LIB="@MFC_LIB@"
 export MINGWCXX="@MINGWCXX@"
 export MINGWSTRIP="@MINGWSTRIP@"
+export MINGW_CLIB_DIR="@MINGW_CLIB_DIR@"
 export MINGW_EXTERNAL_DLLS="@MINGW_EXTERNAL_DLLS@"
+export MINGW_GCCDLL="@MINGW_GCCDLL@"
+export MINGW_GXXDLL="@MINGW_GXXDLL@"
+export MINGW_SHARED_GCCLIB="@MINGW_SHARED_GCCLIB@"
+export MINGW_SHARED_GXXLIB="@MINGW_SHARED_GXXLIB@"
+export MINGW_SHARED_LIBSTDCPP="@MINGW_SHARED_LIBSTDCPP@"
 export MKDEPENDSOLVER="TRUE"
 export ML_EXE="@ML_EXE@"
 export MOC4="@MOC4@"
@@ -252,6 +293,7 @@ export NEON_CFLAGS="@NEON_CFLAGS@"
 export NEON_LIBS="@NEON_LIBS@"
 export NEON_VERSION="@NEON_VERSION@"
 export NM="@NM@"
+export nodep="@nodep@"
 export NSS_CFLAGS="@NSS_CFLAGS@"
 export NSS_LIBS="@NSS_LIBS@"
 export NUMBERTEXT_EXTENSION_PACK="@NUMBERTEXT_EXTENSION_PACK@"
@@ -263,6 +305,7 @@ 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_SHELL="@BASH@"
 export OOO_VENDOR="@OOO_VENDOR@"
 export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
 export OPENSSL_LIBS="@OPENSSL_LIBS@"
@@ -320,6 +363,9 @@ export SOLARINC="@SOLARINC@"
 export SOLARINC_FOR_BUILD="@SOLARINC_FOR_BUILD@"
 export SOLARLIB="@SOLARLIB@"
 export SOLARLIB_FOR_BUILD="@SOLARLIB_FOR_BUILD@"
+export SOLAR_JAVA="@SOLAR_JAVA@"
+export SOLARVER="@SRC_ROOT@/solver"
+export SOLARVERSION="@SRC_ROOT@/solver"
 export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
 export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
 export SRCDIR="@SRC_ROOT@"
@@ -375,6 +421,7 @@ export SYSTEM_LIBWPG="@SYSTEM_LIBWPG@"
 export SYSTEM_LIBWPS="@SYSTEM_LIBWPS@"
 export SYSTEM_LIBXML="@SYSTEM_LIBXML@"
 export SYSTEM_LIBXSLT="@SYSTEM_LIBXSLT@"
+export SYSTEM_LIBXSLT_FOR_BUILD="@SYSTEM_LIBXSLT_FOR_BUILD@"
 export SYSTEM_LPSOLVE="@SYSTEM_LPSOLVE@"
 export SYSTEM_LUCENE="@SYSTEM_LUCENE@"
 export SYSTEM_MDDS="@SYSTEM_MDDS@"
@@ -414,6 +461,7 @@ export VERBOSE="@VERBOSE@"
 export VISIO_CFLAGS="@VISIO_CFLAGS@"
 export VISIO_LIBS="@VISIO_LIBS@"
 export WATCH_WINDOW_EXTENSION_PACK="@WATCH_WINDOW_EXTENSION_PACK@"
+export WINDOWS_SDK_HOME="@WINDOWS_SDK_HOME@"
 export WINDRES="@WINDRES@"
 export WITHOUT_AFMS="@WITHOUT_AFMS@"
 export WITHOUT_PPDS="@WITHOUT_PPDS@"