diff options
| -rwxr-xr-x | configure | 114 | ||||
| -rw-r--r-- | configure.in | 63 | ||||
| -rw-r--r-- | set_soenv.in | 30 | ||||
| -rw-r--r-- | soldep/util/perl.mk | 5 | ||||
| -rwxr-xr-x | solenv/bin/receditor | 2 | ||||
| -rwxr-xr-x | solenv/config/sdev300.ini | 32 | ||||
| -rw-r--r-- | solenv/config/ssolar.cmn | 3 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 29 | ||||
| -rw-r--r-- | solenv/inc/startup/AIX/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/FREEBSD/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/HPUX/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/LINUX/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/MACOSX/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/NETBSD/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/OS2/macros.mk | 55 | ||||
| -rw-r--r-- | solenv/inc/startup/Readme | 3 | ||||
| -rw-r--r-- | solenv/inc/startup/SOLARIS/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/UNIX/macros.mk | 19 | ||||
| -rw-r--r-- | solenv/inc/startup/startup.mk | 27 | ||||
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 23 | ||||
| -rw-r--r-- | solenv/inc/tg_ext.mk | 24 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 22 | ||||
| -rw-r--r-- | soltools/testhxx/create.pl | 22 | ||||
| -rw-r--r-- | soltools/testhxx/makefile.mk | 14 | ||||
| -rw-r--r-- | stlport/makefile.mk | 12 |
25 files changed, 69 insertions, 444 deletions
diff --git a/configure b/configure index a2acba4c3c71..ab15718130e3 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1399,7 +1399,7 @@ Optional Packages: Usage: --with-zip-home=<path to zip executable> --with-mingwin For Windows users, use the mingwin32 compiler within - cygwin environment, this implies --with-use-shell=tcsh + cygwin environment Usage: --with-mingwin=yes @@ -1409,14 +1409,6 @@ Optional Packages: Usage: --with-mingwin=i586-mingw32msvc-g++ - --with-use-shell Use this option to override the default shell to be - used for the build environment. - Supported options: - tcsh (default) - bash - - Usage: --with-use-shell=tcsh|bash - --with-build-version Allows the builder to add a custom version tag that will appear in the Help/About box for QA purposes. @@ -2867,14 +2859,6 @@ else WITH_MINGWIN=0 fi; -# Check whether --with-use-shell or --without-use-shell was given. -if test "${with_use_shell+set}" = set; then - withval="$with_use_shell" - with_use_shell=$withval -else - with_use_shell="tcsh" -fi; - # Check whether --with-build-version or --without-build-version was given. if test "${with_build_version+set}" = set; then withval="$with_build_version" @@ -3721,14 +3705,9 @@ fi -echo "$as_me:$LINENO: checking which shell to use" >&5 -echo $ECHO_N "checking which shell to use... $ECHO_C" >&6 if test $_os = "WINNT"; then - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then - { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 -echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} - { (exit 1); exit 1; }; } - fi + echo "$as_me:$LINENO: checking Windows build environment sanity" >&5 +echo $ECHO_N "checking Windows build environment sanity... $ECHO_C" >&6 if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic @@ -3745,32 +3724,15 @@ link, and copy the program to the name of the link." >&2;} WITH_MINGWIN="yes" fi fi - if test "$WITH_MINGWIN" = "yes" ; then - if test "x$with_use_shell" = "x"; then - with_use_shell="tcsh" - fi + if test "$WITH_MINGWIN" = "yes" ; then if test -z "$CC"; then CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" fi fi -elif test $_os = "OS2"; then - if test "$with_use_shell" != "tcsh"; then - { { echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5 -echo "$as_me: error: only \"tcsh\" is supported options" >&2;} - { (exit 1); exit 1; }; } - fi -else - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then - { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 -echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} - { (exit 1); exit 1; }; } - fi + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi -USE_SHELL="$with_use_shell" -echo "$as_me:$LINENO: result: $USE_SHELL" >&5 -echo "${ECHO_T}$USE_SHELL" >&6 - if test "$_os" = "WINNT" ; then @@ -3787,55 +3749,7 @@ echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} fi -if test "$with_use_shell" = "tcsh"; then - # Extract the first word of "tcsh", so it can be a program name with args. -set dummy tcsh; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_SHELLPATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $SHELLPATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_SHELLPATH="$SHELLPATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -SHELLPATH=$ac_cv_path_SHELLPATH - -if test -n "$SHELLPATH"; then - echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -echo "${ECHO_T}$SHELLPATH" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test -z "$SHELLPATH"; then - { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 -echo "$as_me: error: tcsh not found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - else - SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"` - fi -elif test "$with_use_shell" = "bash"; then - # Extract the first word of "bash", so it can be a program name with args. +# Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -3874,17 +3788,12 @@ else echo "${ECHO_T}no" >&6 fi - if test -z "$SHELLPATH"; then - { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 +if test -z "$SHELLPATH"; then + { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 echo "$as_me: error: bash not found in \$PATH" >&2;} { (exit 1); exit 1; }; } - else - SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` - fi else - { echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5 -echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} - SHELLPATH="NO_SHELLPATH_NEEDED" + SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` fi @@ -29002,7 +28911,6 @@ s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t -s,@USE_SHELL@,$USE_SHELL,;t t s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t s,@SHELLPATH@,$SHELLPATH,;t t s,@GCC_HOME@,$GCC_HOME,;t t diff --git a/configure.in b/configure.in index 8219a5f7c508..815069f42977 100644 --- a/configure.in +++ b/configure.in @@ -753,7 +753,7 @@ AC_ARG_WITH(zip-home, ],,) AC_ARG_WITH(mingwin, [ --with-mingwin For Windows users, use the mingwin32 compiler within - cygwin environment, this implies --with-use-shell=tcsh + cygwin environment Usage: --with-mingwin=yes @@ -763,15 +763,6 @@ AC_ARG_WITH(mingwin, Usage: --with-mingwin=i586-mingw32msvc-g++ ],WITH_MINGWIN=$withval,WITH_MINGWIN=0) -AC_ARG_WITH(use-shell, -[ --with-use-shell Use this option to override the default shell to be - used for the build environment. - Supported options: - tcsh (default) - bash - - Usage: --with-use-shell=tcsh|bash -],with_use_shell=$withval,with_use_shell="tcsh") AC_ARG_WITH(build-version, [ --with-build-version Allows the builder to add a custom version tag that will appear in the Help/About box for QA @@ -1296,16 +1287,8 @@ AC_SUBST(DICT_SYSTEM_DIR) AC_SUBST(HYPH_SYSTEM_DIR) AC_SUBST(THES_SYSTEM_DIR) -dnl =================================================================== -dnl all O/S use tcsh or bash. -dnl The following sets the with_use_shell variable. -dnl =================================================================== -AC_MSG_CHECKING([which shell to use]) if test $_os = "WINNT"; then - dnl =================================================================== - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then - AC_MSG_ERROR([only "tcsh" or "bash" are supported options]) - fi + AC_MSG_CHECKING([Windows build environment sanity]) dnl =================================================================== dnl Sanity check! Native windows programs cannot use cygwin symlinks! dnl =================================================================== @@ -1333,32 +1316,14 @@ link, and copy the program to the name of the link.]) fi fi dnl =================================================================== - dnl If using Mingwin32 then don't use 4NT - dnl =================================================================== if test "$WITH_MINGWIN" = "yes" ; then - if test "x$with_use_shell" = "x"; then - with_use_shell="tcsh" - fi if test -z "$CC"; then CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" fi fi -elif test $_os = "OS2"; then - if test "$with_use_shell" != "tcsh"; then - AC_MSG_ERROR([only "tcsh" is supported options]) - fi -else - dnl =================================================================== - dnl All other operating systems use tcsh or bash. - dnl =================================================================== - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then - AC_MSG_ERROR([only "tcsh" or "bash" are supported options]) - fi + AC_MSG_RESULT([ok]) fi -USE_SHELL="$with_use_shell" -AC_MSG_RESULT([$USE_SHELL]) -AC_SUBST(USE_SHELL) AC_SUBST(WITH_MINGWIN) dnl =================================================================== @@ -1377,25 +1342,13 @@ fi dnl =================================================================== -dnl Check whether the chosen shell can be used. +dnl Check whether the bash shell can be used. dnl =================================================================== -if test "$with_use_shell" = "tcsh"; then - AC_PATH_PROG(SHELLPATH, tcsh) - if test -z "$SHELLPATH"; then - AC_MSG_ERROR([tcsh not found in \$PATH]) - else - SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"` - fi -elif test "$with_use_shell" = "bash"; then - AC_PATH_PROG(SHELLPATH, bash) - if test -z "$SHELLPATH"; then - AC_MSG_ERROR([bash not found in \$PATH]) - else - SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` - fi +AC_PATH_PROG(SHELLPATH, bash) +if test -z "$SHELLPATH"; then + AC_MSG_ERROR([bash not found in \$PATH]) else - AC_MSG_WARN([Windows/OS/2 4NT builds don't test for the shell]) - SHELLPATH="NO_SHELLPATH_NEEDED" + SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` fi AC_SUBST(SHELLPATH) diff --git a/set_soenv.in b/set_soenv.in index 4d3e41383a38..512e92cf8505 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -72,12 +72,12 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE, # Help variables. my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, - $SOLARENVINC, $USR_DT, $USR_OPENWIN, $SHELL_PATH, $XLIB, $XINC, + $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC, $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); # Environment variables. -my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL, +my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, @@ -794,21 +794,7 @@ if ( $platform =~ m/cygwin|os2/ ) { $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any. } # 3. shell path. -# Check whether autoconf found a valid shell path. -if ("@USE_SHELL@" eq "tcsh") -{ # SHELL as argument from autoconf. - $SHELL_PATH = '@SHELLPATH@'; - $SHELL = '@SHELLPATH@'."\/tcsh"; -} -elsif ("@USE_SHELL@" eq "bash") -{ - $SHELL_PATH = '@SHELLPATH@'; - $SHELL = '@SHELLPATH@'."\/bash"; -} -else { - die "Not a recognized shell: @USE_SHELL@ !"; -} - +$OOO_SHELL = '@SHELLPATH@'."\/bash"; if ( '@STLPORT4@' eq $no_stl ) { @@ -1092,7 +1078,6 @@ if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/) $PATH = GetCorrectPath ($PATH, $COMPATH, $CC, $PERL_PATH, 'perl', - $SHELL_PATH, '@USE_SHELL@', @javaBits); } @@ -1178,11 +1163,6 @@ elsif ($platform =~ m/cygwin/) { $PATH .= $ps.$tmppath; } - # Check if $SHELL_PATH is already set in PATH - $tmppath = CygFormat($SHELL_PATH); - if ( ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) ) - { $PATH .= $ps.$tmppath; - } # Check if $CYGWIN_PATH is already set in PATH $tmppath = CygFormat($CYGWIN_PATH); if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) { @@ -1498,7 +1478,7 @@ CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" ); CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" ); ToFile( "SRC_ROOT", $SRC_ROOT, "e" ); -ToFile( "SHELL", $SHELL, "e" ); +ToFile( "OOO_SHELL", $OOO_SHELL, "e" ); ToFile( "JAVA_HOME", $JAVA_HOME, "e" ); ToFile( "ANT_HOME", PathFormat("@ANT_HOME@"), "e" ); ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" ); @@ -1932,8 +1912,6 @@ ToFile( "DELIVER", $perlpre."deliver.pl", "e" ); ToFile( "MKOUT", $perlpre."mkout.pl", "e" ); ToFile( "ZIPDEP", $perlpre."zipdep.pl", "e" ); -ToFile( "USE_SHELL", '@USE_SHELL@', "e" ); - # # Writing the aliases to file. ToFile( "Aliases.", $empty, "c" ); diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk index 21591d1b1ecb..7eefded99e1d 100644 --- a/soldep/util/perl.mk +++ b/soldep/util/perl.mk @@ -30,13 +30,8 @@ #************************************************************************* .IF "$(GUI)"=="WNT" -.IF "$(USE_SHELL)"=="4nt" -SOLARINC+=-I$(BUILD_TOOLS)$/perl$/lib$/core -PERL_LIB=$(BUILD_TOOLS)$/perl$/lib$/core$/perl58.lib -.ELSE # "$(USE_SHELL)"=="4nt" SOLARINC+=-I$(BUILD_TOOLS)$/..$/perl$/lib$/core PERL_LIB=$(BUILD_TOOLS)$/..$/perl$/lib$/core$/perl58.lib -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF .IF "$(OS)$(CPU)" == "LINUXI" diff --git a/solenv/bin/receditor b/solenv/bin/receditor index 1011aeb5d826..1b4046010485 100755 --- a/solenv/bin/receditor +++ b/solenv/bin/receditor @@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then echo No environment found, please use 'configure' or 'setsolar' exit 1 fi -exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL= -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar +exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 821a12eff822..efc7055bd8fc 100755 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -35,6 +35,7 @@ common NEW_JAR_PACK TRUE NO_REC_RES TRUE OOODMAKEMODE YES + OOO_SHELL /bin/bash PCLEAN_PATH xxx RES_ENUS TRUE RES_GER TRUE @@ -104,11 +105,6 @@ common { LU_RFLAG r_only } - shell - { - SHELL %STAR_USE_SHELL% - USE_SHELL %STAR_USE_SHELL% - } tmp { SOL_TMP %SOL_TMP_DIR% @@ -125,7 +121,7 @@ common SRC_ROOT UPDATER } - order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource + order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource reset { ALT_L10N_MODULE @@ -169,7 +165,6 @@ common pro maxproc MAXPROCESS r_only - shell STAR_USE_SHELL tmp SOL_TMP_DIR verbose VERBOSE } @@ -2192,7 +2187,6 @@ unxubti8 SOLAR_PLUGIN TRUE SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% - USE_SHELL tcsh VBA_EXTENSION NO WITH_LANG en-US de XAU_LIBS -lXau @@ -2272,10 +2266,6 @@ unxubti8 { PROSWITCH -DPRODUCT } - shell - { - USE_SHELL STAR_USE_SHELL - } sourceroot:0 IF X%SOURCE_ROOT%X != XX { SOLAR_SOURCE_ROOT %SOURCE_ROOT% @@ -2416,7 +2406,6 @@ wntgcci1 { SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL bash } common1 { @@ -2522,10 +2511,6 @@ wntgcci1 { PSDK %STAR_PSDK% } - shell - { - USE_SHELL STAR_USE_SHELL - } sourceroot:0 if X%SOURCE_ROOT%X != XX { SOLAR_SOURCE_ROOT %SOURCE_ROOT% @@ -2603,7 +2588,6 @@ wntgcci1 l10n L10N_framework pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot } } @@ -2693,7 +2677,6 @@ wntmsci11 BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL 4nt } common1 { @@ -2803,10 +2786,6 @@ wntmsci11 { PSDK %STAR_PSDK% } - shell - { - use_shell STAR_USE_SHELL - } sourceroot:0 if X%SOURCE_ROOT%X != XX { SOLAR_SOURCE_ROOT %SOURCE_ROOT% @@ -2859,7 +2838,6 @@ wntmsci11 l10n L10N_framework pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot } } @@ -2969,8 +2947,6 @@ wntmsci12 BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL bash - STAR_USE_SHELL bash BTOOLDIR %WORK_STAMP%$/cygtools PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl } @@ -3202,7 +3178,6 @@ wntmsci12 ojdk16path pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot tmp SOL_TMP_DIR } @@ -3313,8 +3288,6 @@ wntmsci13 BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL bash - STAR_USE_SHELL bash BTOOLDIR %WORK_STAMP%$/cygtools PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl } @@ -3546,7 +3519,6 @@ wntmsci13 ojdk16path pro psdk STAR_PSDK - shell STAR_USE_SHELL sourceroot tmp SOL_TMP_DIR } diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 877d82e566a5..f783527391f6 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -157,6 +157,7 @@ common ODBCPATH ODBCVER OLD_CHAOS + OOO_SHELL PACKMS PCLEAN_PATH PKGCONFIG_ROOT @@ -237,7 +238,6 @@ common USE_MAPFILES USE_NEW_SDK USE_PCH - USE_SHELL USE_SYSTEM_STL use_cygcp use_shl_versions @@ -274,7 +274,6 @@ common SOLAR_PLUGIN URE_BOOTSTRAP USE_FT_EMBOLDEN - USE_SHELL USE_XINERAMA VBA_EXTENSION XINERAMA_LINK diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9aa3ee5ab077..2977f5f0a1d2 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -42,11 +42,6 @@ force_dmake_to_error # --- common tool makros -------------------------------------- -# moved temporary wrapper here as it is used in unitools.mk -.IF "$(USE_SHELL)"!="" -use_shell*=$(USE_SHELL) -.ENDIF - .IF "$(USE_PCH)"!="" ENABLE_PCH=TRUE .ENDIF # "$(USE_PCH)"!="" @@ -59,13 +54,6 @@ NETWORK_BUILD:=TRUE .INCLUDE : unitools.mk -#have SCRIPTEXT already defined in product.mk but available for all -.IF "$(USE_SHELL)"=="4NT" -SCRIPTEXT=.bat -.ELSE # "$(GUI)"=="WNT" -SCRIPTEXT= -.ENDIF # "$(GUI)"=="WNT" - .INCLUDE : minor.mk .INCLUDE .IGNORE : rtlbootstrap.mk @@ -1034,26 +1022,11 @@ LNTFLAGSOUTOBJ=-os # path (LD_LIBRARY_PATH, PATH, etc.; there is no real reason to prefer adding at # the end over adding at the start); the ": &&" in the bash case enables this to # work at the start of a recipe line that is not prefixed by "+" as well as in -# the middle of an existing && chain; the tcsh case is somewhat imprecise in -# that it potentially affects multiple commands following on the recipe line: -.IF "$(USE_SHELL)" == "bash" +# the middle of an existing && chain: AUGMENT_LIBRARY_PATH = : && \ $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(SOLARSHAREDBIN)) AUGMENT_LIBRARY_PATH_LOCAL = : && \ $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN)) -.ELSE -AUGMENT_LIBRARY_PATH = if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ - eval 'setenv $(OOO_LIBRARY_PATH_VAR) \ - "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(normpath, $(SOLARSHAREDBIN))"' \ - && if ($$?$(OOO_LIBRARY_PATH_VAR) == 0) \ - setenv $(OOO_LIBRARY_PATH_VAR) "$(normpath, $(SOLARSHAREDBIN))" && -AUGMENT_LIBRARY_PATH_LOCAL = if ($$?$(OOO_LIBRARY_PATH_VAR) == 1) \ - eval 'setenv $(OOO_LIBRARY_PATH_VAR) \ - "$${{$(OOO_LIBRARY_PATH_VAR)}}:$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))"' \ - && if ($$?$(OOO_LIBRARY_PATH_VAR) == 0) \ - setenv $(OOO_LIBRARY_PATH_VAR) \ - "$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))" && -.END .END # remove if .Net 2003 support has expired diff --git a/solenv/inc/startup/AIX/macros.mk b/solenv/inc/startup/AIX/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/AIX/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/FREEBSD/macros.mk b/solenv/inc/startup/FREEBSD/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/FREEBSD/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/HPUX/macros.mk b/solenv/inc/startup/HPUX/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/HPUX/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/LINUX/macros.mk b/solenv/inc/startup/LINUX/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/LINUX/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/MACOSX/macros.mk b/solenv/inc/startup/MACOSX/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/MACOSX/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/NETBSD/macros.mk b/solenv/inc/startup/NETBSD/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/NETBSD/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/OS2/macros.mk b/solenv/inc/startup/OS2/macros.mk index 08d2be3f9a48..2f1447e6e714 100644 --- a/solenv/inc/startup/OS2/macros.mk +++ b/solenv/inc/startup/OS2/macros.mk @@ -4,22 +4,6 @@ # Process release-specific refinements, if any. # YD .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk -# Execution environment configuration. -# Grab the current setting of COMSPEC. -# -.IMPORT .IGNORE : COMSPEC - -# First check if SHELL is defined to be something other than COMSPEC. -# If it is assume that SHELL is a Korn compatible shell like MKS's -.IF $(SHELL) == $(NULL) - .IF $(COMSPEC) == $(NULL) - SHELL *:= $(ROOTDIR)$/bin$/sh$E - .ELSE - SHELL *:= $(COMSPEC) - .END -.END -GROUPSHELL *:= $(SHELL) - # Directory entries are case incensitive .DIRCACHERESPCASE *:= no @@ -35,39 +19,12 @@ P *:= .pas # Pascal S *:= .asm # Assembler sources V *:= # RCS suffix -# Now set the remaining arguments depending on which SHELL we -# are going to use. COMSPEC (assumed to be command.com) or -# MKS Korn shell. -.IF $(SHELL) == $(COMSPEC) - SHELLFLAGS *:= $(SWITCHAR)c - GROUPFLAGS *:= $(SHELLFLAGS) - SHELLMETAS *:= <>|*?& - GROUPSUFFIX *:= .bat - DIVFILE *= $(TMPFILE:s,/,\\,) - RM *= rm - RMFLAGS *= -f - MV *= rename - __.DIVSEP-sh-yes *:= \\ - __.DIVSEP-sh-no *:= \\ - DIRSEPSTR := \\ -# See iz61212 for the reason why PWD is overwritten -# PWD:=$(shell +echo %_cwd:s,/,\\,) -# PWD:=$(shell +cd) -#.EXPORT : PWD - -.ELSE - SHELLFLAGS *:= -c - GROUPFLAGS *:= - SHELLMETAS *:= *"?<>|()&][$$\#`' - GROUPSUFFIX *:= .ksh - .MKSARGS *:= yes - RM *= $(ROOTDIR)$/bin$/rm - RMFLAGS *= -f - MV *= $(ROOTDIR)$/bin$/mv - DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}}) - __.DIVSEP-sh-yes !:= \\\ - __.DIVSEP-sh-no !:= \\ -.ENDIF +.MKSARGS *:= yes +RM *= $(ROOTDIR)$/bin$/rm +MV *= $(ROOTDIR)$/bin$/mv +DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}}) +__.DIVSEP-sh-yes !:= \\\ +__.DIVSEP-sh-no !:= \\ NAMEMAX = 256 diff --git a/solenv/inc/startup/Readme b/solenv/inc/startup/Readme index d0c38c7c75d5..63a023d10d3e 100644 --- a/solenv/inc/startup/Readme +++ b/solenv/inc/startup/Readme @@ -1,9 +1,6 @@ here are some hints about our use of the startup directory. -because our variable "OS" was already in use, we don't use the default -subtrees of startup. for example "wntmsci3" uses the subtree "WNT". - the .INCLUDEDIRS line in startup.mk gives you the oportunity of switching to your own set of central makefiles. diff --git a/solenv/inc/startup/SOLARIS/macros.mk b/solenv/inc/startup/SOLARIS/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/SOLARIS/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/UNIX/macros.mk b/solenv/inc/startup/UNIX/macros.mk deleted file mode 100644 index 7fa2f1b77d35..000000000000 --- a/solenv/inc/startup/UNIX/macros.mk +++ /dev/null @@ -1,19 +0,0 @@ -# This file is used for all $(OS)==UNX during startup -# - -SHELL *:= /usr/bin/csh -GROUPSHELL *:= $(SHELL) - -.IF $(USE_SHELL) == bash - SHELLFLAGS *:= -c -.ELSE - SHELLFLAGS *:= -fc -.ENDIF # $(USE_SHELL) == bash - - GROUPFLAGS *:= $(SHELLFLAGS) - -# incomplete - better use METAS from startup.mk -# SHELLMETAS *:= "<>|/ - RM *= rm - RMFLAGS *= -f - MV *= mv diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index 96b6378db11f..bd9fb0f61ef3 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS) .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) $(SOLARENV)$/inc # Grab key definitions from the environment -# .IMPORT .IGNORE : OS TMPDIR SHELL UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS +# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME CVER GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS .IF "$(OS)" == "" || "$(OS)" == "Windows_NT" .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build! @@ -42,7 +42,11 @@ OS_variable_needed # Customize macro definitions based on seting of OS. # This must come before the default macro definitions which follow. -.INCLUDE .NOINFER : $(INCFILENAME:d)$(OS)$/macros.mk +.IF "$(OS)" == "OS2" +.INCLUDE: $(INCFILENAME:d)OS2/macros.mk +.ELIF "$(OS)" == "WNT" +.INCLUDE: $(INCFILENAME:d)wnt/macros.mk +.END # ----------------- Default Control Macro definitions ----------------------- # Select appropriate defaults for basic macros @@ -53,15 +57,18 @@ OS_variable_needed MAXLINELENGTH = 65530 # Recipe execution configuration - SHELL *:= $/bin$/sh - SHELLFLAGS *:= -fc - GROUPSHELL *:= $(SHELL) - GROUPFLAGS *:= - SHELLMETAS *:= |();&<>?*][$$:\\#`'" - GROUPSUFFIX *:= + SHELL := $(OOO_SHELL) + SHELLFLAGS := -c + SHELLMETAS := !"\#$$%&'()*;<=>?[\]`{{|}}~ + # the colon (":") utility is typically only available as a shell built-in, + # so it should be included in SHELLMETAS; however, this would result in very + # many false positives on Windows where ":" is used in drive letter notation + GROUPSHELL := $(SHELL) + GROUPFLAGS := + GROUPSUFFIX := # Intermediate target removal configuration - RM *:= $/bin$/rm + RM *:= rm RMFLAGS *= -f RMTARGET *= $< @@ -80,7 +87,7 @@ NULLPRQ *:= __.NULLPRQ E *:= # Executables # Other Compilers, Tools and their flags -MV *:= $/bin$/mv # File rename command +MV *:= mv # File rename command # Finally, define the default construction strategy diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index 35f903f60922..2d8181439e81 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -15,25 +15,10 @@ GUWCMD*=guw.exe # Applicable suffix definitions E *:= .exe # Executables -# Now set the remaining arguments depending on which SHELL we -# are going to use. - -.IF $(USE_SHELL) == bash - SHELLFLAGS *:= -c -.ELSE - # See iz50689 why -f is needed. - SHELLFLAGS *:= -fc -.ENDIF # $(USE_SHELL) == bash - - GROUPFLAGS *:= - SHELLMETAS *:= *";?<>|()&][$$\#`' -# Fix syntax highlighting: " - GROUPSUFFIX *:= .csh # This is hopefully not used. Only in: dmake/msdos/spawn.c # .MKSARGS *:= yes DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}}) RM *= $/bin$/rm - RMFLAGS *= -f MV *= $/bin$/mv __.DIVSEP-sh-yes *:= \\\ __.DIVSEP-sh-no *:= \\ @@ -41,14 +26,6 @@ E *:= .exe # Executables .EXPORT : GUWCMD -.IF $(SHELL) == $(NULL) -# SHELL has to be set in (non-4NT) OOobuild environment -.ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build! -SHELL_variable_needed -.END - -GROUPSHELL *:= $(SHELL) - # Does not respect case of filenames. .DIRCACHERESPCASE := no NAMEMAX = 256 diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index bb5402813282..7593dad01c37 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -47,11 +47,11 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS) .EXPORT : LDFLAGS .ENDIF -.IF "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt" +.IF "$(GUI)"=="WNT" PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH) -.ELSE # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt" +.ELSE # "$(GUI)"=="WNT" PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH) -.ENDIF # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt" +.ENDIF # "$(GUI)"=="WNT" .EXPORT : PATH #override @@ -83,10 +83,6 @@ NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)-newpatch-rename_me.patch PATCH_FILE_DEP:=$(PRJ)/$(PATH_IN_MODULE)/{$(PATCH_FILES)} .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" -.IF "$(TAR_EXCLUDES)"!="" -TAR_EXCLUDE_SWITCH=--exclude=$(TAR_EXCLUDES) -.ENDIF # "$(TAR_EXCLUDES)"!="" - unzip_quiet_switch:=-qq .IF "$(VERBOSE)"=="TRUE" tar_verbose_switch=v @@ -118,9 +114,9 @@ clean: $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @@ -128,28 +124,28 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar @-$(RM) $@ - @noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar) + @noop $(assign UNPACKCMD := $(GNUTAR) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index e76d1e292a62..6c497dd9053e 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -66,26 +66,14 @@ NULLDEV:=/dev/null # iz29609 helpmacro to check if file exists -.IF "$(USE_SHELL)"=="bash" IFEXIST:=if [ -f IFNOTEXIST:= if ! test -f THEN:= ] ; then FI:= ; fi PIPEERROR=2>&1 | -.ELSE -IFEXIST:=if ( -e -IFNOTEXIST:=if ( ! -e -THEN:= ) -FI:= -PIPEERROR=|& -.ENDIF # iz31658 -.IF "$(USE_SHELL)"=="bash" CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then exit $$ret ; fi && echo "Nothing to update for zip" -.ELSE -CHECKZIPRESULT:=|| if ("$$status" != "12" && "$$status" != "1") exit $$status && echo "Nothing to update for zip" -.ENDIF # Platform specific .IF "$(GUI)"=="WNT" @@ -196,10 +184,8 @@ CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl -# The dmake $(PWD) variable and the tcsh pwd command both apparantly produce -# paths with symlinks resolved, while the bash pwd command by default produces -# paths with unresolved symlinks, so that computing PATH_IN_MODULE in -# settings.mk would fail without the -P flag to the bash pwd command: -.IF "$(USE_SHELL)" == "bash" +# The dmake $(PWD) apparantly produces paths with symlinks resolved, while the +# bash pwd command by default produces paths with unresolved symlinks, so that +# computing PATH_IN_MODULE in settings.mk would fail without the -P flag to the +# bash pwd command: PWDFLAGS = -P -.ENDIF diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl index eb9e540f0a82..d73b41a43ffa 100644 --- a/soltools/testhxx/create.pl +++ b/soltools/testhxx/create.pl @@ -70,27 +70,7 @@ if ($ENV{OS} eq 'LINUX') { print STDOUT 'unlink ${my_tmp} || exit 1', "\n"; print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n"; print STDOUT 'exit ${my_ret}', "\n"; -} elsif ($ENV{OS} eq 'WNT' and $ENV{USE_SHELL} eq '4nt') { - 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes - $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1%SOLARVERSION%$2!og; - # macrofy includes to solver - $in =~ s!\s+-Fo\s*\S+! -Fo%my_tmp%.obj! || die 'bad input: no -Fo'; - $in =~ s!\s+-Zi\s! !; - $in =~ s!\s+-Fd\s*\S+!!; - $in =~ s!\S+\\testhxx.cxx!%my_tmp%! - || die 'bad input: no source file'; - print STDOUT '@ECHO OFF', "\n"; - print STDOUT 'SET my_tmp=%TMP%\%_PID%_include.cc', "\n"; - print STDOUT 'ECHO #include "%@REPLACE[\\,/,%@FULL[%1]]" > %my_tmp%', "\n"; - print STDOUT $in, ' > %my_tmp%.out', "\n"; - print STDOUT 'SET my_ret=%ERRORLEVEL%', "\n"; - print STDOUT 'IF %my_ret% != 0', - ' sed -e s!%@FILENAME[%my_tmp%]!%@REPLACE[\\,\\\\,%1]! %my_tmp%.out', - ' 1>&2', "\n"; - print STDOUT 'DEL /EQ %my_tmp% %my_tmp%.obj %my_tmp%.pdb %my_tmp%.out', - "\n"; - print STDOUT 'QUIT %my_ret%', "\n"; -} elsif ($ENV{OS} eq 'WNT' and $ENV{USE_SHELL} ne '4nt') { +} elsif ($ENV{OS} eq 'WNT') { if ($ENV{COM} eq 'GCC') { 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og; diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk index 79811dbebbe2..268a2b330241 100644 --- a/soltools/testhxx/makefile.mk +++ b/soltools/testhxx/makefile.mk @@ -42,21 +42,13 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj SLOFILES = $(SLO)$/testhxx.obj -.IF "$(USE_SHELL)" == "4nt" -MY_SCRIPT_EXT := .btm -MY_EXECUTABLE := @ echo -.ELSE -MY_SCRIPT_EXT := -MY_EXECUTABLE := chmod +x -.ENDIF - .INCLUDE: target.mk -ALLTAR: $(BIN)$/$(TARGET)$(MY_SCRIPT_EXT) +ALLTAR: $(BIN)$/$(TARGET) -$(BIN)$/$(TARGET)$(MY_SCRIPT_EXT) .ERRREMOVE : $(MISC)$/testhxx.output create.pl +$(BIN)$/$(TARGET) .ERRREMOVE : $(MISC)$/testhxx.output create.pl $(PERL) -w create.pl < $(MISC)$/testhxx.output > $@ - $(MY_EXECUTABLE) $@ + chmod +x $@ $(MISC)$/testhxx.output: $(SLO)$/testhxx.obj $(TOUCH) $< diff --git a/stlport/makefile.mk b/stlport/makefile.mk index bff4f60fd719..475052287709 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -102,10 +102,6 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) # stl/_epilog.h.) .ENDIF -.IF "$(USE_SHELL)"=="4nt" -TAR_EXCLUDES=*/SC5/* -.ENDIF # "$(USE_SHELL)"=="4nt" - ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \ src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak @@ -233,21 +229,13 @@ avoid_win32_patches : force_dmake_to_error $(PACKAGE_DIR)$/so_custom_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) -.IF "$(USE_SHELL)"=="4nt" win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -.ELSE # "$(USE_SHELL)"=="4nt" - win32_custom.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -.ENDIF # "$(USE_SHELL)"=="4nt" $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch .IF "$(USE_NEW_SDK)"!="" $(PACKAGE_DIR)$/win32_sdk_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) -.IF "$(USE_SHELL)"=="4nt" win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -.ELSE # "$(USE_SHELL)"=="4nt" - win32_sdk.sh $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ -.ENDIF # "$(USE_SHELL)"=="4nt" $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch .ENDIF # "$(USE_NEW_SDK)"!="" |