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

3 files changed, 138 insertions, 246 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@"
diff --git a/configure.in b/configure.in
index 842a801630db..18292dea0eae 100644
--- a/configure.in
+++ b/configure.in
@@ -3178,11 +3178,9 @@ AC_SUBST(CPU_FOR_BUILD)
 AC_SUBST(CPUNAME_FOR_BUILD)
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CXX_FOR_BUILD)
-AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
 AC_SUBST(INPATH_FOR_BUILD)
 AC_SUBST(OUTPATH_FOR_BUILD)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
-AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
 
 AC_SUBST(OUTDIR_FOR_BUILD)
 AC_SUBST(PATH_FOR_BUILD)
@@ -3986,6 +3984,8 @@ if test "$GXX" = "yes"; then
         with_gxx_include_path="NO_GXX_INCLUDE"
         AC_MSG_RESULT([none])
     else
+        PathFormat "$with_gxx_include_path"
+        with_gxx_include_path="$formatted_path"
         AC_MSG_RESULT([$with_gxx_include_path])
     fi
 else
@@ -4833,6 +4833,8 @@ _ACEOF
             echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
         fi
     fi
+    PathFormat "$JAVA_HOME"
+    JAVA_HOME="$formatted_path"
 fi
 
 AWTLIB=
@@ -5751,6 +5753,11 @@ else
     fi
 fi
 AC_SUBST(SYSTEM_LIBXSLT)
+if test -z "$SYSTEM_LIBXSLT_FOR_BUILD" ; then
+    SYSTEM_LIBXSLT_FOR_BUILD="$SYSTEM_LIBXSLT"
+fi
+AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
+
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)
 AC_SUBST(XSLTPROC)
@@ -7759,6 +7766,8 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
     else
         DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
     fi
+    PathFormat "$DIRECTXSDK_LIB"
+    DIRECTXSDK_LIB="$formatted_path"
 
     if test -f "$DIRECTXSDK_LIB/ddraw.lib" -o -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
         HAVE_DIRECTXSDK_LIB="yes"
@@ -7833,6 +7842,8 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
     else
         AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
     fi
+else
+    GNUPATCH=$PATCH
 fi
 
 dnl We also need to check for --with-gnu-cp
@@ -9996,6 +10007,11 @@ EOF
     fi
     if test -z "$ANT_HOME"; then
         ANT_HOME="NO_ANT_HOME"
+    else
+        PathFormat "$ANT_HOME"
+        ANT_HOME="$formatted_path"
+        PathFormat "$ANT"
+        ANT="$ANT"
     fi
     AC_SUBST(ANT_HOME)
 
@@ -10027,6 +10043,8 @@ EOF
                 fi
             fi
         fi
+        PathFormat "$ANT_LIB"
+        ANT_LIB="$formatted_path"
         AC_MSG_RESULT([Ant lib directory found.])
     fi
     AC_SUBST(ANT_LIB)
@@ -10580,6 +10598,39 @@ fi
 AC_MSG_RESULT([$BUILD_NCPUS])
 AC_SUBST(BUILD_NCPUS)
 
+#
+# Set up ILIB for windows build
+#
+if test "$build_os" = "cygwin"; then
+    ILIB="."
+    WinPath "$SRC_ROOT/solver/$INPATH/lib"
+    ILIB="$ILIB;$formatted_path"
+    if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME" ; then
+        WinPath "$JAVA_HOME/lib"
+        ILIB="$ILIB;$formatted_path"
+    fi
+    if test "$CL_X64" = "TRUE" ; then
+        WinPath "$COMPATH/lib"
+        ILIB="$ILIB;$formatted_path"
+        WinPath "$WINDOWS_SDK_HOME/lib"
+        ILIB="$ILIB;$formatted_path"
+    else
+        WinPath "$COMPATH/lib/amd64"
+        ILIB="$ILIB;$formatted_path"
+        WinPath "$WINDOWS_SDK_HOME/lib64"
+        ILIB="$ILIB;$formatted_path"
+    fi
+    WinPath "$DOTNET_FRAMEWORK_HOME/lib"
+    ILIB="$ILIB;$formatted_path"
+
+    if test "$ENABLE_DIRECTX" = "TRUE" ; then
+        WinPath "$DIRECTXSDK_LIB"
+        ILIB="$ILIB;$formatted_path"
+    fi
+    AC_SUBST(ILIB)
+fi
+
+
 # ===================================================================
 # Creating bigger shared library to link against
 # ===================================================================
@@ -10666,6 +10717,14 @@ if test "$build_os" = "cygwin" ; then
         ATL_LIB="$ATL_LIB/amd64"
         MFC_LIB="$MFC_LIB/amd64"
     fi
+    PathFormat "/usr/bin/grep.exe"
+    WIN_GREP="$formatted_path"
+    PathFormat "/usr/bin/find.exe"
+    WIN_FIND="$formatted_path"
+    PathFormat "/usr/bin/ls.exe"
+    WIN_LS="$formatted_path"
+    PathFormat "/usr/bin/touch.exe"
+    WIN_TOUCH="$formatted_path"
 fi
 
 AC_SUBST(ATL_INCLUDE)
diff --git a/set_soenv.in b/set_soenv.in
index 15435e3dc228..219f96f1ff8f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -35,7 +35,7 @@ use File::Basename;
 #
 my ( $outfile, $newline, $comment,
      $ds, $ps,
-     $wps, $cur_dir, $par_dir, $I, $L, $tmp,
+     $wps, $cur_dir, $par_dir, $tmp,
      $platform,
      $empty,
      $warnfile, $Warning, $result, $unsetvars, $exportvars);
@@ -45,39 +45,33 @@ my ( $outfile, $newline, $comment,
 #-------------------------------------------------
 #
 # Platform independent constant values.
-my ( $SOLAR_JAVA,
-     $CC, $CXX);
+my ( $CC );
 #
 # Platform dependent constant values.
 my (
       $OUTPATH, $INPATH,
+      );
 #
 #-------------------------------------------
 # IIc. Declaring the environment variables.
 #-------------------------------------------
 #
 # Help variables.
-my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
-     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
-     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
-     $CYGWIN_PATH, $language, @languages, $ASM_PATH, $PERL_PATH, $CL_X64 );
+my ( $BIN, $LIB,
+     $ASM_PATH, $PERL_PATH, $CL_X64 );
 
 # Environment variables.
-my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
-     $L10N_MODULE, $WITH_POOR_HELP_LOCALIZATIONS,
+my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK,
      $UPD,
-     $SOLARSRC, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG,
-     $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
+     $SOLARENV,
+     $CLASSPATH, $XCLASSPATH, $COMPATH,
      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SHOWINCLUDES_PREFIX,
-     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
-     $SOLARINC, $FRAMEWORKSHOME, $PERL,
-     $COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
-     $USE_DIRECTX5, $TMPDIR,
-     $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
-     $WIN_GNUCOPY, $WIN_TOUCH,
-     $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
-     $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA,
-     $SYSBASE);
+     $PATH,
+     $PERL,
+     $COMP_ENV, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
+     $TMPDIR,
+     $GNUMAKE,
+     );
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -89,7 +83,6 @@ my ( $dmake, $build, $mkout, $deliver, $zipdep );
 $INPATH="@INPATH@";
 $OUTPATH="@OUTPATH@";
 $COMPATH="@COMPATH@";
-$FRAMEWORKSHOME="@FRAMEWORKSHOME@";
 #-------------------------------------------------------------
 # IIIa. Initialising constants.
 #-------------------------------------------------------------
@@ -105,21 +98,11 @@ $ps             = ":";              # path separator
 $wps            = ":";              # path separator, will be set to ';' for windows later.
 $cur_dir        = ".";              # current directory
 $par_dir        = "..";             # parrent directory
-$I              = " -I";            # include search path
-$L              = " -L";            # library search path
 $empty          = "";               # used as argument
 $warnfile       = "warn";           # logfile configure warnings.
 $Warning        = "";               # container for warning messages
-$SYSTEM_PYTHON	= '@SYSTEM_PYTHON@';
-if ($SYSTEM_PYTHON eq "NO") {
-    $PYTHON              = "python";
-}
-$SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
 $JDK 		= '@JDK@';
-$JAVAFLAGS 		= '@JAVAFLAGS@';
 $CC             = '@CC@';            # C compiler
-$CXX            = '@CXX@';           # C++ compiler
-$PROEXT         = "@PROEXT@";
 $CL_X64 = '@CL_X64@';
 $GNUMAKE        = "@GNUMAKE@";
 
@@ -155,8 +138,6 @@ chomp( $oldPATH );                  # cut off new line
 # C. Setting the constant values.
 #
 # Setting platform independent constant values.
-# NB: Language options now set at 'ToFile' stage.
-$SOLAR_JAVA           = "@SOLAR_JAVA@";
 $comment              = "#";           # UNIX script comment character
 
 # Setting platform dependent constant values.
@@ -166,14 +147,11 @@ if ( $platform =~ m/cygwin|mingw32/ )
     $MIDL_PATH      = PathFormat('@MIDL_PATH@');
     $CSC_PATH       = PathFormat('@CSC_PATH@');
     $SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
-    $WINDOWS_SDK_HOME      = PathFormat('@WINDOWS_SDK_HOME@');
-    $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
+    $WINDOWS_SDK_HOME      = "@WINDOWS_SDK_HOME@";
     $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
     $wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
 }
-elsif ( $platform =~ m/darwin/ )
-{
-}
+
 
 print "done\n";
 
@@ -187,9 +165,6 @@ $SRC_ROOT = $ENV{"SRC_ROOT"};
 CheckPathExist( $SRC_ROOT );
 
 
-# 3. bash path.
-$OOO_SHELL = '@BASH@';
-
 # ml.exe assembler path for Windows users.
 if ($platform =~ m/cygwin/)
 {
@@ -200,79 +175,15 @@ if ($platform =~ m/cygwin/)
 # E. Determining the envionment values based on the information
 #    that was gathered earlier on.
 
-$USR                  = $ds."usr";
-$ETC                  = $ds."etc";
 $BIN                  = $ds."bin";
 $LIB                  = $ds."lib";
-$LIB64                = $ds."lib";
-$LIB64               .= "64" if ($platform =~ m/x86_64-.*-linux/);
-$LIB64               .= "64" if (($platform =~ m/powerpc64-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
-$LIB64               .= "64" if (($platform =~ m/s390x-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
-$LIB64               .= $ds."x64" if ($platform =~ m/cygwin/);
-$INC                  = $ds."inc";
-$INCLUDE              = $ds."include";
-$DEV                  = $ds."dev";
-$OPT                  = $ds."opt";
-$LOCAL                = $ds."local";
-$SOLENV               = $ds."solenv";
-$SOLVER               = $ds."solver";
-$DEFIMGS              = $ds."icon-themes/galaxy";
-$CONFIG               = $ds."config";
-$USR_BIN              = $USR.$BIN;
-$USR_LIB              = $USR.$LIB64;
-$USR_LOCAL            = $USR.$ds."local";
-$USR_CCS              = $USR.$ds."ccs";
-$USR_OPENWIN          = $USR.$ds."openwin";
-$USR_DT               = $USR.$ds."dt";
-$COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
-
-# Windows NT only variables
-if ($platform =~ m/cygwin/)
-{
-   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-   {
-      $JAVA_LIB             = $JAVA_HOME.$LIB;
-   }
-   # Import SystemDrive enviroment variable
-   use Env qw(SYSTEMDRIVE);
-   # Change $SYSTEMDRIVE to lower case.
-   $SYSTEMDRIVE          = lc $SYSTEMDRIVE;
-   use Env qw(SYSTEMROOT);
-   $CYGWIN_PATH          = PathFormat('/usr/bin'); # Windows bash path
-   $WIN_GREP             = '$CYGWIN_PATH'.$ds."grep.exe";
-   $WIN_FIND             = '$CYGWIN_PATH'.$ds."find.exe";
-   $WIN_LS               = '$CYGWIN_PATH'.$ds."ls.exe";
-   $WIN_GNUCOPY          = '$CYGWIN_PATH'.$ds."cp.exe";
-   $WIN_TOUCH            = '$CYGWIN_PATH'.$ds."touch.exe";
-}
-
-if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-{
-   $JAVA_BIN             = $JAVA_HOME.$BIN;
-   $JAVA_INCLUDE         = $JAVA_HOME.$INCLUDE;
-}
-
 
 $PERL                 = PathFormat('@PERL@'); # Perl program
 $PERL_PATH            = dirname('@PERL@'); # Perl Path
-$XLIB                 = PathFormat('@XLIB@'); # X11 libraries
-$XINC                 = PathFormat('@XINC@'); # X11 includes
-
 
 #
-$SOLARENV             = PathFormat($SRC_ROOT.$SOLENV);
-# Location of the solver tree.
-$SOLARVER             = $SRC_ROOT.$SOLVER;
+$SOLARENV             = PathFormat("$SRC_ROOT/solenv");
 
-#Location of Solar version.
-$SOLARVERSION         = '$SOLARVER';
-
-#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
-
-
-$SOLARENVINC          = '$SOLARENV'.$INC;
-# Location of dmake resource.
-$DMAKEROOT            = '$SOLARENVINC'.$ds."startup";
 # Location of JDK classes .zip file.
 # but in jdk 1.2 it is called rt.jar and it lives in jre/lib
 $CLASSPATH            = '';
@@ -285,29 +196,7 @@ $XCLASSPATH           = $CLASSPATH;
 
 # Windows NT only variables
 if ($platform =~ m/cygwin/)
-{  $COMP_ENV          = $OUTPATH;
-
-   $JAVAHOME          = $JAVA_HOME;
-
-   $ILIB             = $cur_dir;
-
-   $ILIB       .=    $wps.$SOLARVER.$ds.$INPATH.$LIB;
-   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" ) {
-       $ILIB   .= $wps.$JAVA_HOME.$LIB;
-   }
-   if ( $CL_X64 ne "TRUE" ) {
-       $ILIB   .= $wps.$COMPATH.$LIB.
-                  $wps.$WINDOWS_SDK_HOME.$LIB;
-   } else {
-       $ILIB   .= $wps.$COMPATH.$LIB.$ds."amd64".
-                  $wps.$WINDOWS_SDK_HOME.$LIB64;
-   }
-   $ILIB       .= $wps.$DOTNET_FRAMEWORK_HOME.$LIB;
-   if ( '@ENABLE_DIRECTX@' ne "" ) {
-       $ILIB   .= $wps.$DIRECTXSDK_LIB;
-   }
-   # ILIB needs to use '\' directory seperators;
-   $ILIB = WinPath( $ILIB, ";" );
+{
 
    $JAVAHOME          = $JAVA_HOME;
 
@@ -320,7 +209,7 @@ if ($platform =~ m/linux|netbsd|freebsd|aix|solaris|openbsd|dragonfly/)
                         $ps.'$SOLARENV'.$BIN;
 
    if ($platform =~ m/solaris/) {
-	$PATH .= $ps.$USR_CCS.$BIN;
+	$PATH .= $ps."/usr/ccs/bin";
    }
 
    $PATH             .= $ps.$oldPATH;
@@ -491,51 +380,10 @@ open( OUT, ">$SRC_ROOT/$outfile" ) ||
 # Write file header.
 CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
 
-ToFile( "OOO_SHELL",         $OOO_SHELL,         "e" );
 ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
-ToFile( "L10N_MODULE",       $L10N_MODULE,       "e" );
-ToFile( "ANT_HOME",          PathFormat("@ANT_HOME@"), "e" );
-ToFile( "ANT_LIB",           PathFormat("@ANT_LIB@"), "e" );
-ToFile( "ANT",               PathFormat("@ANT@"), "e" );
-ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
-ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
-ToFile( "Empty",             $empty,             "n" );
-
-#
-# Writing the platform independent constant values to file.
-# (c = comment, e = environment variable, a = alias )
-ToFile( "Platform independent constant values.", $empty, "c" );
-
-}
-ToFile( "nodep",             "@nodep@",          "e" );
-
-#
-# Writing the platform dependent constant values to file.
-# (c = comment, e = environment variable, a = alias )
-ToFile( "Platform dependent constant values.", $empty, "c" );
-ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
 
-#
-# Writing the variables to file.
-# (c = comment, e = environment variable, a = alias, n = newline )
-ToFile( "Variable values.",  $empty,             "c" );
 if ( $platform =~ m/cygwin/ )
-{  ToFile( "CYGWIN_PATH",       $CYGWIN_PATH,       "e" );
-   ToFile( "WINDOWS_SDK_HOME",  $WINDOWS_SDK_HOME,  "e" );
-   ToFile( "DIRECTXSDK_LIB",    $DIRECTXSDK_LIB,    "e" );
-   ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
-   ToFile( "DISABLE_ATL",   "@DISABLE_ATL@","e" );
-   ToFile( "INCLUDE",           "",                 "e" );
-   # Variables used when building the parts that needs to be available
-   # also as 64-bit versions in a 32-bit LibreOffice build, like
-   # the Explorer extension. If the configure script hasn't
-   # found the 64-bit (cross-)compiler, then @BUILD_X64@ will be empty.
-   ToFile( "BUILD_X64",         "@BUILD_X64@",      "e" );
-   if ( "@BUILD_X64@" eq "TRUE" ) {
-       ToFile( "CXX_X64_BINARY","@CXX_X64_BINARY@", "e" );
-       ToFile( "LINK_X64_BINARY","@LINK_X64_BINARY@","e" );
-       ToFile( "LIBMGR_X64_BINARY","@LIBMGR_X64_BINARY@","e" );
-   }
+{
 
    # Hack around dmake's mktmp not generating DOS paths.
    my $tmpdir = qx{cygpath -m "/tmp"};
@@ -547,24 +395,17 @@ if ( $platform =~ m/cygwin/ )
       ToFile( "TMP", "$ENV{'TMP'}", "e" );
    }
 }
-elsif ( $platform =~ m/mingw32/ )
-{  ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
-   ToFile( "DISABLE_ATL",       "@DISABLE_ATL@",    "e" );
-   ToFile( "MINGW_CLIB_DIR",    "@MINGW_CLIB_DIR@", "e" );
-   ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" );
-   ToFile( "MINGW_SHARED_GXXLIB", "@MINGW_SHARED_GXXLIB@", "e" );
-   ToFile( "MINGW_SHARED_LIBSTDCPP", "@MINGW_SHARED_LIBSTDCPP@", "e" );
-   ToFile( "MINGW_GCCDLL",      "@MINGW_GCCDLL@",   "e" );
-   ToFile( "MINGW_GXXDLL",      "@MINGW_GXXDLL@",   "e" );
-
+else
+{
+   if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
+      ToFile( "TMPDIR",      "/tmp",               "e" );
+   } else {
+      ToFile( "TMPDIR",      "$ENV{'TMPDIR'}",     "e" );
+   }
 }
 
 ToFile( "PERL",              $PERL,              "e" );
-ToFile( "SOLARVER",          $SOLARVER,          "e" );
-ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );
 ToFile( "SOLARENV",          $SOLARENV,          "e" );
-ToFile( "SOLARENVINC",       $SOLARENVINC,       "e" );
-ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
 if ( $JDK ne "gcj" ) {
    ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
    ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
@@ -573,18 +414,7 @@ if ( $JDK ne "gcj" ) {
 else {
    ToFile( "JAVACISGCJ",       '@JAVACISGCJ@',      "e" );
 }
-if ( '@JDK@' ne '' )
-{
-   ToFile( "JDK",             "@JDK@",           "e" );
-   ToFile( "JAVAFLAGS",             "@JAVAFLAGS@",           "e" );
-   ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
-   ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
-   ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
-   ToFile( "JAVAIFLAGS",      "@JAVAIFLAGS@",    "e" );
-   ToFile( "JAVACOMPILER",    PathFormat("@JAVACOMPILER@"), "e" );
-   ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
-   ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
-}
+
 if ( '@CROSS_COMPILING@' eq 'YES' )
 {
    # Obviously we shouldn't set PATH to contain host binaries
@@ -593,48 +423,9 @@ if ( '@CROSS_COMPILING@' eq 'YES' )
 else
 {
    ToFile( "PATH",           $PATH,              "e" );
-}
-ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
-ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
-ToFile( "CC",                $CC,                "e" );
-ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
-ToFile( "HOST_PLATFORM",     "@host@",           "e" );
-if ( '@CROSS_COMPILING@' eq 'YES' )
-{
-   ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
-   ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
-   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
-   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
-}
-else
-{
-   ToFile( "CC_FOR_BUILD",      $CC,             "e" );
-   ToFile( "CXX_FOR_BUILD",     $CXX,            "e" );
-   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
-   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" );
    ToFile( "PATH_FOR_BUILD",    $PATH,           "e" );
 }
-ToFile( "CXX",               $CXX,               "e" );
-ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );
-ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
-
-if ($platform !~ m/cygwin/) {
-   if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
-      ToFile( "TMPDIR",      "/tmp",               "e" );
-   } else {
-      ToFile( "TMPDIR",      "$ENV{'TMPDIR'}",     "e" );
-   }
-}
-
-if ( $platform =~ m/cygwin/ )
-{
-   ToFile( "ILIB",              $ILIB,              "e" );
-   ToFile( "GREP",              $WIN_GREP,          "e" );
-   ToFile( "FIND",              $WIN_FIND,          "e" );
-   ToFile( "LS",                $WIN_LS,            "e" );
-   ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
-   ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
-}
+ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 
 
 #
@@ -647,12 +438,6 @@ ToFile( "alias deliver",     $deliver,           "a" );
 ToFile( "alias build",       $build,             "a" );
 ToFile( "alias zipdep",      $zipdep,            "a" );
 
-# on Solaris, MacOSX and FreeBSD, set GNUCOPY and GNUPATCH
-if ($platform =~ m/solaris|darwin|freebsd/)
-{
-  ToFile( "GNUPATCH",   "@GNUPATCH@",	"e");
-}
-
 #
 # Writing unset variables you might not need to file.
 #