diff options
| author | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
| commit | 94e33b11392ca7dca01538c57d2f2aaf2c7a9d79 (patch) | |
| tree | 5b15e98dc6f84d0ed189e315617d771bb8db6ff2 | |
| parent | 54ec9fae86d86f27fd2b4decfcb0e50571d8303c (diff) | |
| parent | 29215a2062903a6391d9903c2c8f47656181099d (diff) | |
rebase to dev300 m69.
93 files changed, 4384 insertions, 8551 deletions
diff --git a/configure b/configure index a386d0c426a8..ca6818eaab0e 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_FONTOOO SYSTEM_MSPACK 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 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_files='' # Initialize some variables set by options. @@ -888,9 +888,6 @@ Optional Features: --disable-qadevooo OO.o includes some qa testsuites which some packagers may wish to build without - --disable-fontooo disable FontOOo - (useful for distributions using fontconfig for OOo) - --disable-mathmldtd disable mathmldtd (useful for distributions that want to avoid packaging it) @@ -1046,11 +1043,6 @@ Optional Features: explicitly enable if your version of ccache doesn't identify as version 2.4_OOo - --enable-sgistl for IRIX users, use this option option to build - OpenOffice.org using SGI's STL. - - Usage: --enable-sgistl=yes - --enable-verbose Increase build verbosity. --disable-verbose Decrease build verbosity. @@ -1112,8 +1104,6 @@ Optional Packages: --with-system-stdlibs use libstdc++/libgcc_s already on system - --with-system-mspack use libmspack already installed on system - --with-system-cairo Use Cairo libraries already on system --with-mozilla-version Choose which version of mozilla to use while building @@ -2015,13 +2005,6 @@ if test "${enable_qadevooo+set}" = set; then else enable_qadevooo="yes" fi; -# Check whether --enable-fontooo or --disable-fontooo was given. -if test "${enable_fontooo+set}" = set; then - enableval="$enable_fontooo" - -else - enable_fontooo="yes" -fi; # Check whether --enable-mathmldtd or --disable-mathmldtd was given. if test "${enable_mathmldtd+set}" = set; then enableval="$enable_mathmldtd" @@ -2042,12 +2025,6 @@ if test "${with_system_stdlibs+set}" = set; then else checkforstdlibproblems=yes fi; - -# Check whether --with-system-mspack or --without-system-mspack was given. -if test "${with_system_mspack+set}" = set; then - withval="$with_system_mspack" - -fi; # Check whether --enable-cups or --disable-cups was given. if test "${enable_cups+set}" = set; then enableval="$enable_cups" @@ -2903,11 +2880,6 @@ if test "${with_build_version+set}" = set; then withval="$with_build_version" with_build_version=$withval fi; -# Check whether --enable-sgistl or --disable-sgistl was given. -if test "${enable_sgistl+set}" = set; then - enableval="$enable_sgistl" - -fi; # Check whether --with-alloc or --without-alloc was given. if test "${with_alloc+set}" = set; then @@ -3343,9 +3315,6 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;} test_cups=yes test_randr=yes test_freetype=yes - if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then - PTHREAD_CFLAGS="-DNPTL" - fi _os=Linux ;; gnu) @@ -3430,12 +3399,6 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6 PTHREAD_LIBS="-pthread -lpthread" _os=NetBSD ;; - irix*) - test_cups=no - test_randr=no - test_freetype=yes - _os=IRIX - ;; aix*) test_cups=no test_randr=no @@ -4923,7 +4886,8 @@ done COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`; fi - +COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`; +echo $COMPATH GCCVER=20995 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 @@ -5171,7 +5135,7 @@ fi test -n "$_cc" && break done - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6 _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` @@ -5261,75 +5225,6 @@ echo "${ECHO_T}not found " >&6 fi -if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - if test "$CC" = "cc"; then - for ac_prog in cc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; 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__cc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $_cc in - [\\/]* | ?:[\\/]*) - ac_cv_path__cc="$_cc" # 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__cc="$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 -_cc=$ac_cv_path__cc - -if test -n "$_cc"; then - echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$_cc" && break -done - - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 -echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6 - _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` - _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` - if test "$_mipspro_major" != "7"; then - { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} - { (exit 1); exit 1; }; } - else - _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'` - if test "$_mipspro_minor" = "false"; then - { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} - { (exit 1); exit 1; }; } - else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 - fi - fi - fi -fi - if test "$_os" = "OSF1"; then if test "$CC" = "cc"; then for ac_prog in cc @@ -5376,7 +5271,7 @@ fi test -n "$_cc" && break done - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 @@ -5653,8 +5548,8 @@ fi # Remove /cl.exe from CC case insensitive echo "$as_me:$LINENO: result: found ($CC)" >&5 echo "${ECHO_T}found ($CC)" >&6 - COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'` - export INCLUDE=`cygpath -d "$COMPATH/../Include"` + COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'` + export INCLUDE=`cygpath -d "$COMPATH/Include"` echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6 CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ { @@ -9533,7 +9428,7 @@ echo $ECHO_N "checking whether to use dynamic libgcc... $ECHO_C" >&6 echo "$as_me:$LINENO: checking dynamic libgcc name" >&5 echo $ECHO_N "checking dynamic libgcc name... $ECHO_C" >&6 MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` - MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null` + MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null` if test -n "$MINGW_GCCDLL"; then MINGW_SHARED_GCCLIB=YES echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5 @@ -9555,7 +9450,7 @@ echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6 echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5 echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6 MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` - MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null` + MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null` if test -n "$MINGW_GXXDLL"; then MINGW_SHARED_GXXLIB=YES echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5 @@ -9605,20 +9500,6 @@ echo "${ECHO_T}checked" >&6 fi fi fi -if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - if test "$CC" = "cc"; then - echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 -echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6 - if test "$CXX" != "CC"; then - { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 -echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} - echo "SGI MIPSpro C++ was not found" >> warn - else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 - fi - fi -fi if test "$_os" = "OSF1"; then echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6 @@ -9805,25 +9686,6 @@ echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 10 fi fi -if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then - if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - echo "$as_me:$LINENO: checking for SGI STL" >&5 -echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6 - if test -d /usr/include/CC ; then - echo "$as_me:$LINENO: result: yes." >&5 -echo "${ECHO_T}yes." >&6 - - else - echo "$as_me:$LINENO: result: not found." >&5 -echo "${ECHO_T}not found." >&6 - fi - else - { { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5 -echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;} - { (exit 1); exit 1; }; } - fi -else - echo "$as_me:$LINENO: checking what the default STL should be" >&5 echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6 DEFAULT_TO_STLPORT="no" @@ -9956,24 +9818,6 @@ echo "${ECHO_T}checked" >&6 echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi - elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 - else - if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 - elif test -f "$STLPORT4/lib/libstlport.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 - STLPORT_VER=500 - else - { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -echo "$as_me: error: STLport libraries not found" >&2;} - { (exit 1); exit 1; }; } - fi - fi else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then echo "$as_me:$LINENO: result: checked" >&5 @@ -9995,7 +9839,6 @@ echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" > echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi fi -fi if test -z "$STLPORT4"; then STLPORT4="NO_STLPORT4" @@ -10402,11 +10245,18 @@ _ACEOF if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then gccvisbroken=yes else - if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then - gccvisbroken=no; - else - gccvisbroken=yes; - fi + case "$build_cpu" in + i?86|x86_64) + if $EGREP -q '@PLT' visibility.s; then + gccvisbroken=no + else + gccvisbroken=yes + fi + ;; + *) + gccvisbroken=no + ;; + esac fi rm -f visibility.s @@ -10942,7 +10792,7 @@ echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6 echo "${ECHO_T}checked (ecj)" >&6 #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" - _gij_longver="50000" + _gij_longver="40200" fi fi @@ -11067,7 +10917,7 @@ fi if test "$SOLAR_JAVA" != ""; then if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then - if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then + if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then cat > findhome.java <<_ACEOF import java.io.File; @@ -11118,7 +10968,7 @@ echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2; fi fi - if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then + if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then @@ -12017,9 +11867,6 @@ echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 OSF1) PKGFORMAT=setld ;; - IRIX) - PKGFORMAT=tardist - ;; # we never should get here since we check the arciecture/os at the beginning, # but go sure... *) @@ -14787,8 +14634,7 @@ fi echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6 - for v in `seq 1 7`; do - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling @@ -14805,7 +14651,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include <db.h> int main(int argc, char **argv) { - if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0; + if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0; else return 1; } @@ -14821,28 +14667,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - DB_VERSION_MINOR=$v + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 +echo "$as_me: error: no. you need at least db 4.1" >&2;} + { (exit 1); exit 1; }; } fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - done - if test "$DB_VERSION_MINOR" -gt "1"; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 - DB_VERSION=4.$DB_VERSION_MINOR - else - { { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 -echo "$as_me: error: no. you need at least db 4.1" >&2;} - { (exit 1); exit 1; }; } - fi - # does not work :/ - #AC_CHECK_LIB(db, db_create, [], - # [AC_MSG_ERROR([db library not installed or functional])], []) echo "$as_me:$LINENO: checking for main in -ldb" >&5 echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 @@ -20510,25 +20348,19 @@ echo "${ECHO_T}yes" >&6 for ac_header in X11/Xaw/Label.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include <X11/Intrinsic.h> + #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -20553,100 +20385,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -24369,8 +24118,8 @@ echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6 echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 else - MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1` - MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1` + MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1` + MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1` if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK" cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK" @@ -26753,14 +26502,64 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6 if test "$with_system_apache_commons" = "yes"; then - SYSTEM_APACHE_COMMONS=YES - echo "$as_me:$LINENO: result: external" >&5 + SYSTEM_APACHE_COMMONS=YES + echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6 if test "$ENABLE_MEDIAWIKI" = "YES"; then - if test -z "$COMMONS_CODEC_JAR"; then - COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar - fi - as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` + if test -z $COMMONS_CODEC_JAR; then + echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec-1.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-codec-1.3.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-codec-1.3.jar"; then + ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes +else + ac_cv_file__usr_share_java_commons_codec_1_3_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_codec_1_3_jar = yes; then + COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar +else + + echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-codec.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-codec.jar"; then + ac_cv_file__usr_share_java_commons_codec_jar=yes +else + ac_cv_file__usr_share_java_commons_codec_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_codec_jar = yes; then + COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar +else + { { echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5 +echo "$as_me: error: commons-codec.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then @@ -26786,10 +26585,62 @@ echo "$as_me: error: commons-codec.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z "$COMMONS_LANG_JAR"; then - COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar - fi - as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` + fi + + if test -z $COMMONS_LANG_JAR; then + echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-lang-2.3.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-lang-2.3.jar"; then + ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes +else + ac_cv_file__usr_share_java_commons_lang_2_3_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_lang_2_3_jar = yes; then + COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar +else + + echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-lang.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-lang.jar"; then + ac_cv_file__usr_share_java_commons_lang_jar=yes +else + ac_cv_file__usr_share_java_commons_lang_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_lang_jar = yes; then + COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar +else + { { echo "$as_me:$LINENO: error: commons-lang.jar replacement not found." >&5 +echo "$as_me: error: commons-lang.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then @@ -26815,10 +26666,62 @@ echo "$as_me: error: commons-lang.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z "$COMMONS_HTTPCLIENT_JAR"; then - COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar - fi - as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` + fi + + if test -z $COMMONS_HTTPCLIENT_JAR; then + echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-httpclient-3.1.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then + ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes +else + ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar = yes; then + COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar +else + + echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-httpclient.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-httpclient.jar"; then + ac_cv_file__usr_share_java_commons_httpclient_jar=yes +else + ac_cv_file__usr_share_java_commons_httpclient_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_httpclient_jar = yes; then + COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar +else + { { echo "$as_me:$LINENO: error: commons-httpclient.jar replacement not found." >&5 +echo "$as_me: error: commons-httpclient.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then @@ -26844,12 +26747,63 @@ echo "$as_me: error: commons-httpclient.jar not found." >&2;} { (exit 1); exit 1; }; } fi + fi fi if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - if test -z "$COMMONS_LOGGING_JAR"; then - COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar - fi - as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` + if test -z $COMMONS_LOGGING_JAR; then + echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then + ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes +else + ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then + COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar +else + + echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "/usr/share/java/commons-logging.jar"; then + ac_cv_file__usr_share_java_commons_logging_jar=yes +else + ac_cv_file__usr_share_java_commons_logging_jar=no +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then + COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar +else + { { echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5 +echo "$as_me: error: commons-logging.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then @@ -26875,13 +26829,13 @@ echo "$as_me: error: commons-logging.jar not found." >&2;} { (exit 1); exit 1; }; } fi - + fi fi else - echo "$as_me:$LINENO: result: internal" >&5 + echo "$as_me:$LINENO: result: internal" >&5 echo "${ECHO_T}internal" >&6 - SYSTEM_APACHE_COMMONS=NO - BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" + SYSTEM_APACHE_COMMONS=NO + BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi @@ -27424,268 +27378,6 @@ echo "${ECHO_T}no" >&6 fi -echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 -echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6 -if test -n "$enable_fontooo"; then - if test "$enable_fontooo" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - WITH_FONTOOO=NO - SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" - else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - WITH_FONTOOO=YES - BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT" - fi -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - WITH_FONTOOO=NO - SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" -fi - - -if test "$WITH_FONTOOO" = "YES"; then - echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 -echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6 - if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ - test "$with_system_mspack" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SYSTEM_MSPACK=YES - if test "${ac_cv_header_mspack_h+set}" = set; then - echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 -if test "${ac_cv_header_mspack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking mspack.h usability" >&5 -echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <mspack.h> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking mspack.h presence" >&5 -echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <mspack.h> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 -if test "${ac_cv_header_mspack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mspack_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 - -fi -if test $ac_cv_header_mspack_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5 -echo "$as_me: error: mspack.h not found, install libmspack" >&2;} - { (exit 1); exit 1; }; } -fi - - - -echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 -echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6 -if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmspack $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char mspack_create_cab_decompressor (); -int -main () -{ -mspack_create_cab_decompressor (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mspack_mspack_create_cab_decompressor=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_mspack_mspack_create_cab_decompressor=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 -echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6 -if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBMSPACK 1 -_ACEOF - - LIBS="-lmspack $LIBS" - -else - { { echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5 -echo "$as_me: error: libmspack not installed or functional" >&2;} - { (exit 1); exit 1; }; } -fi - - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - SYSTEM_MSPACK=NO - fi -fi - - echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6 if test -n "$enable_mathmldtd"; then @@ -29475,8 +29167,6 @@ s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t s,@ENABLE_KAB@,$ENABLE_KAB,;t t -s,@WITH_FONTOOO@,$WITH_FONTOOO,;t t -s,@SYSTEM_MSPACK@,$SYSTEM_MSPACK,;t t s,@WITH_FONTS@,$WITH_FONTS,;t t s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t diff --git a/configure.in b/configure.in index 3505be436cf6..0ce538aeed8e 100644 --- a/configure.in +++ b/configure.in @@ -115,10 +115,6 @@ AC_ARG_ENABLE(qadevooo, [ --disable-qadevooo OO.o includes some qa testsuites which some packagers may wish to build without ],,enable_qadevooo="yes") -AC_ARG_ENABLE(fontooo, -[ --disable-fontooo disable FontOOo - (useful for distributions using fontconfig for OOo) -],,enable_fontooo="yes") AC_ARG_ENABLE(mathmldtd, [ --disable-mathmldtd disable mathmldtd (useful for distributions that want to avoid packaging @@ -131,9 +127,6 @@ AC_ARG_ENABLE(evolution2, AC_ARG_WITH(system-stdlibs, [ --with-system-stdlibs use libstdc++/libgcc_s already on system ],,checkforstdlibproblems=yes) -AC_ARG_WITH(system-mspack, -[ --with-system-mspack use libmspack already installed on system -],,) AC_ARG_ENABLE(cups, [ --disable-cups disable cups support in the psprint project ],,enable_cups=yes) @@ -786,12 +779,6 @@ AC_ARG_WITH(build-version, Usage: --with-build-version="Built by Jim" ],with_build_version=$withval) -AC_ARG_ENABLE(sgistl, -[ --enable-sgistl for IRIX users, use this option option to build - OpenOffice.org using SGI's STL. - - Usage: --enable-sgistl=yes -],,) AC_ARG_WITH(alloc, [ --with-alloc Define which allocator to build with (choices are oo, system, tcmalloc) @@ -939,9 +926,6 @@ case "$build_os" in test_cups=yes test_randr=yes test_freetype=yes - if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then - PTHREAD_CFLAGS="-DNPTL" - fi _os=Linux ;; gnu) @@ -1021,12 +1005,6 @@ case "$build_os" in PTHREAD_LIBS="-pthread -lpthread" _os=NetBSD ;; - irix*) - test_cups=no - test_randr=no - test_freetype=yes - _os=IRIX - ;; aix*) test_cups=no test_randr=no @@ -1451,7 +1429,8 @@ if test "$COMPATH" = "." ; then dnl double square bracket to get single because of M4 quote... COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`; fi - +COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`; +echo $COMPATH dnl =================================================================== dnl Test the gcc version, 3 is OK dnl =================================================================== @@ -1595,7 +1574,7 @@ dnl =================================================================== if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` AC_MSG_CHECKING([the SunStudio C/C++ compiler version]) dnl cc -V outputs to standard error!!!! _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` @@ -1634,37 +1613,12 @@ fi AC_SUBST(HAVE_LD_HASH_STYLE) dnl =================================================================== -dnl Test the IRIX SGI Mips pro compiler -dnl =================================================================== -if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - if test "$CC" = "cc"; then - AC_PATH_PROGS(_cc, cc) - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - AC_MSG_CHECKING([the SGI MIPSpro C compiler version]) - dnl cc -version outputs to standard error!!!! - _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` - _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` - if test "$_mipspro_major" != "7"; then - AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) - else - _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'` - if test "$_mipspro_minor" = "false"; then - AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) - else - dnl compiler will do - AC_MSG_RESULT([checked]) - fi - fi - fi -fi - -dnl =================================================================== dnl Test the Compaq compiler for OSF1 dnl =================================================================== if test "$_os" = "OSF1"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` AC_MSG_WARN([******* $_cc , $COMPATH]) AC_MSG_CHECKING([the Compaq C compiler version]) dnl cc -V outputs to standard error!!!! @@ -1790,8 +1744,8 @@ if test "$_os" = "WINNT"; then CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive AC_MSG_RESULT([found ($CC)]) - COMPATH=`echo $CC | $SED 's@/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` - export INCLUDE=`cygpath -d "$COMPATH/../Include"` + COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` + export INCLUDE=`cygpath -d "$COMPATH/Include"` dnl Check which Microsoft C/C++ compiler is found AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler]) dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out. @@ -2220,7 +2174,7 @@ _ACEOF if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then AC_MSG_CHECKING([dynamic libgcc name]) MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` - MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null` + MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null` if test -n "$MINGW_GCCDLL"; then MINGW_SHARED_GCCLIB=YES AC_MSG_RESULT([use $MINGW_GCCDLL]) @@ -2237,7 +2191,7 @@ _ACEOF if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then AC_MSG_CHECKING([dynamic libstdc++ name]) MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` - MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null` + MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null` if test -n "$MINGW_GXXDLL"; then MINGW_SHARED_GXXLIB=YES AC_MSG_RESULT([use $MINGW_GXXDLL]) @@ -2287,21 +2241,6 @@ if test "$_os" = "Darwin"; then fi fi dnl =================================================================== -dnl Extra checking for the IRIX compiler -dnl =================================================================== -if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - dnl MIPSpro C++ compiler packaged with MIPSpro C compiler - if test "$CC" = "cc"; then - AC_MSG_CHECKING([SGI MIPSpro C++ Compiler]) - if test "$CXX" != "CC"; then - AC_MSG_WARN([SGI MIPSpro C++ was not found]) - echo "SGI MIPSpro C++ was not found" >> warn - else - AC_MSG_RESULT([checked]) - fi - fi -fi -dnl =================================================================== dnl Extra checking for the OSF compiler dnl =================================================================== if test "$_os" = "OSF1"; then @@ -2443,23 +2382,6 @@ if test "$_os" = "SunOS"; then fi dnl =================================================================== -dnl Checks for SGI STL -dnl =================================================================== -if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then - if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - AC_MSG_CHECKING([for SGI STL]) - if test -d /usr/include/CC ; then - AC_MSG_RESULT([yes.]) - - else - AC_MSG_RESULT([not found.]) - fi - else - AC_MSG_ERROR([Option --enable-sgistl is only valid for IRIX]) - fi -else - -dnl =================================================================== dnl Checks for what the default STL should be dnl =================================================================== AC_MSG_CHECKING([what the default STL should be]) @@ -2542,19 +2464,6 @@ dnl =================================================================== else AC_MSG_ERROR([STLport libraries not found]) fi - elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then - AC_MSG_RESULT([checked]) - else - if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - AC_MSG_RESULT([checked]) - elif test -f "$STLPORT4/lib/libstlport.so"; then - AC_MSG_RESULT([checked]) - STLPORT_VER=500 - else - AC_MSG_ERROR([STLport libraries not found]) - fi - fi else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then AC_MSG_RESULT([checked]) @@ -2571,7 +2480,6 @@ dnl =================================================================== echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi fi -fi if test -z "$STLPORT4"; then STLPORT4="NO_STLPORT4" @@ -2712,11 +2620,18 @@ _ACEOF if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then gccvisbroken=yes else - if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then - gccvisbroken=no; - else - gccvisbroken=yes; - fi + case "$build_cpu" in + i?86|x86_64) + if $EGREP -q '@PLT' visibility.s; then + gccvisbroken=no + else + gccvisbroken=yes + fi + ;; + *) + gccvisbroken=no + ;; + esac fi rm -f visibility.s @@ -2977,7 +2892,7 @@ if test "$SOLAR_JAVA" != ""; then AC_MSG_RESULT([checked (ecj)]) #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" - _gij_longver="50000" + _gij_longver="40200" fi fi @@ -3032,7 +2947,7 @@ fi if test "$SOLAR_JAVA" != ""; then dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then - if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then + if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then cat > findhome.java <<_ACEOF [import java.io.File; @@ -3072,7 +2987,7 @@ _ACEOF fi dnl second sanity check JAVA_HOME if possible - if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then + if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then @@ -3350,9 +3265,6 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) OSF1) PKGFORMAT=setld ;; - IRIX) - PKGFORMAT=tardist - ;; # we never should get here since we check the arciecture/os at the beginning, # but go sure... *) @@ -3852,25 +3764,14 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \ ], [] ) AC_MSG_CHECKING([whether db is at least 4.1]) - for v in `seq 1 7`; do - AC_TRY_RUN([ + AC_TRY_RUN([ #include <db.h> int main(int argc, char **argv) { - if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0; + if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0; else return 1; } - ], [DB_VERSION_MINOR=$v], []) - done - if test "$DB_VERSION_MINOR" -gt "1"; then - AC_MSG_RESULT([OK]) - DB_VERSION=4.$DB_VERSION_MINOR - else - AC_MSG_ERROR([no. you need at least db 4.1]) - fi - # does not work :/ - #AC_CHECK_LIB(db, db_create, [], - # [AC_MSG_ERROR([db library not installed or functional])], []) + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])]) AC_HAVE_LIBRARY(db, [], [AC_MSG_ERROR([db not installed or functional])], []) SCPDEFS="$SCPDEFS -DSYSTEM_DB" @@ -4689,7 +4590,8 @@ if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then [#include <X11/Intrinsic.h>]) else AC_MSG_RESULT([yes]) - AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])]) + AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])], + [#include <X11/Intrinsic.h>]) AC_CHECK_LIB(Xaw, main, [], [AC_MSG_ERROR(Xaw library not found or functional)], []) fi @@ -5418,8 +5320,8 @@ if test "$_os" = "WINNT"; then if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then AC_MSG_RESULT([found]) else - MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1` - MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1` + MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1` + MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1` if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK" cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK" @@ -5936,37 +5838,74 @@ AC_SUBST(LIBSERIALIZER_JAR) if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then - SYSTEM_APACHE_COMMONS=YES - AC_MSG_RESULT([external]) + SYSTEM_APACHE_COMMONS=YES + AC_MSG_RESULT([external]) if test "$ENABLE_MEDIAWIKI" = "YES"; then - if test -z "$COMMONS_CODEC_JAR"; then - COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar - fi - AC_CHECK_FILE($COMMONS_CODEC_JAR, [], - [AC_MSG_ERROR(commons-codec.jar not found.)], []) - if test -z "$COMMONS_LANG_JAR"; then - COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar - fi - AC_CHECK_FILE($COMMONS_LANG_JAR, [], - [AC_MSG_ERROR(commons-lang.jar not found.)], []) - if test -z "$COMMONS_HTTPCLIENT_JAR"; then - COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar - fi - AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], - [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) + if test -z $COMMONS_CODEC_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-codec.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ], + [AC_MSG_ERROR(commons-codec.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_CODEC_JAR, [], + [AC_MSG_ERROR(commons-codec.jar not found.)], []) + fi + + if test -z $COMMONS_LANG_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, + [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-lang.jar, + [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ], + [AC_MSG_ERROR(commons-lang.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LANG_JAR, [], + [AC_MSG_ERROR(commons-lang.jar not found.)], []) + fi + + if test -z $COMMONS_HTTPCLIENT_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, + [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, + [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ], + [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], + [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) + fi fi if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - if test -z "$COMMONS_LOGGING_JAR"; then - COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar - fi - AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], - [AC_MSG_ERROR(commons-logging.jar not found.)], []) - + if test -z $COMMONS_LOGGING_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-logging.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], + [AC_MSG_ERROR(commons-logging.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], + [AC_MSG_ERROR(commons-logging.jar not found.)], []) + fi fi else - AC_MSG_RESULT([internal]) - SYSTEM_APACHE_COMMONS=NO - BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" + AC_MSG_RESULT([internal]) + SYSTEM_APACHE_COMMONS=NO + BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi AC_SUBST(SYSTEM_APACHE_COMMONS) @@ -6258,47 +6197,6 @@ fi AC_SUBST(ENABLE_KAB) dnl =================================================================== -dnl Test whether to include FontOOo -dnl =================================================================== -AC_MSG_CHECKING([whether to include FontOOo]) -if test -n "$enable_fontooo"; then - if test "$enable_fontooo" = "no"; then - AC_MSG_RESULT([no]) - WITH_FONTOOO=NO - SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" - else - AC_MSG_RESULT([yes]) - WITH_FONTOOO=YES - BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT" - fi -else - AC_MSG_RESULT([no]) - WITH_FONTOOO=NO - SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" -fi -AC_SUBST(WITH_FONTOOO) - -if test "$WITH_FONTOOO" = "YES"; then - dnl =============================================================== - dnl Check whether to use libmspack from system - dnl =============================================================== - AC_MSG_CHECKING([whether to use system libmspack]) - if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ - test "$with_system_mspack" != "no"; then - AC_MSG_RESULT([yes]) - SYSTEM_MSPACK=YES - AC_CHECK_HEADER(mspack.h, [], - [AC_MSG_ERROR([mspack.h not found, install libmspack])], []) - AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [], - [AC_MSG_ERROR(libmspack not installed or functional)], []) - else - AC_MSG_RESULT([no]) - SYSTEM_MSPACK=NO - fi -fi -AC_SUBST(SYSTEM_MSPACK) - -dnl =================================================================== dnl Test whether to include MathMLDTD dnl =================================================================== AC_MSG_CHECKING([whether to include MathMLDTD]) diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf index f4da77d0d8b9..20f2a60dd195 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf @@ -1,3 +1,4 @@ [OOO_LAUNCH_1] en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system." - +[OOO_LAUNCH_2] +en-US = "Please use the file setup.exe to start the installation." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index 35d78694a664..c53ccda8d736 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,3 +2,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition Privileged OOO_LAUNCH_1 +SETUP_USED=1 Or Installed OOO_LAUNCH_2 diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store Binary files differindex d730660fb13f..3b7c9f7794b9 100644 --- a/instsetoo_native/res/DS_Store +++ b/instsetoo_native/res/DS_Store diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 76c70ed8a435..e6ba698fae7f 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,24 +4,24 @@ Globals { variables { - OOOBASEVERSION 3.2 - OOOPACKAGEVERSION 3.2.0 - UREPACKAGEVERSION 1.6.0 + OOOBASEVERSION 3.3 + OOOPACKAGEVERSION 3.3.0 + UREPACKAGEVERSION 1.7.0 URELAYERVERSION 1 BASISROOTNAME OpenOffice.org UNIXBASISROOTNAME openoffice.org - SERVICETAG_PRODUCTNAME OpenOffice.org 3.2 - SERVICETAG_PRODUCTVERSION 3.2 - SERVICETAG_PARENTNAME OpenOffice.org 3.2 + SERVICETAG_PRODUCTNAME OpenOffice.org 3.3 + SERVICETAG_PRODUCTVERSION 3.3 + SERVICETAG_PARENTNAME OpenOffice.org 3.3 SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) - SERVICETAG_URN urn:uuid:cd39f1d0-f2fc-11dd-8c47-080020a9ed93 + SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93 HIDELICENSEDIALOG 1 PACKAGEPREFIX BASISPACKAGEPREFIX ooobasis UREPACKAGEPREFIX openoffice.org SOLSUREPACKAGEPREFIX openofficeorg USE_FILEVERSION 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 POOLPRODUCT 1 REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb REGISTRATIONURL http://survey.services.openoffice.org/user/index.php @@ -35,7 +35,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 4 + WINDOWSPATCHLEVEL 6 } } } @@ -47,7 +47,7 @@ OpenOffice variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -55,10 +55,10 @@ OpenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.2.0 - BASEPRODUCTVERSION 3.2 + ABOUTBOXPRODUCTVERSION 3.3.0 + BASEPRODUCTVERSION 3.3 PCPFILENAME openoffice.pcp - UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -67,7 +67,7 @@ OpenOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -83,7 +83,7 @@ OpenOffice STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 PATCHCODEFILE ooo_patchcodes.txt DOWNLOADBANNER ooobanner.bmp DOWNLOADBITMAP ooobitmap.bmp @@ -111,7 +111,7 @@ OpenOffice_wJRE variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -119,9 +119,9 @@ OpenOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.2.0 - BASEPRODUCTVERSION 3.2 - UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update + ABOUTBOXPRODUCTVERSION 3.3.0 + BASEPRODUCTVERSION 3.3 + UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -130,7 +130,7 @@ OpenOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -146,7 +146,7 @@ OpenOffice_wJRE STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 PATCHCODEFILE ooo_patchcodes.txt JAVAPRODUCT 1 DOWNLOADBANNER ooobanner.bmp @@ -174,7 +174,7 @@ OpenOffice_Dev variables { PRODUCTNAME OOo-dev - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -184,22 +184,22 @@ OpenOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.2.0 - BASEPRODUCTVERSION 3.2 + ABOUTBOXPRODUCTVERSION 3.3.0 + BASEPRODUCTVERSION 3.3 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDev - SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93 - UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update + SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 + UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -216,7 +216,7 @@ OpenOffice_Dev CHANGETARGETDIR 1 USE_FILEVERSION 1 JAVAPRODUCT 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt DOWNLOADBANNER ooobanner.bmp @@ -247,8 +247,8 @@ URE variables { PRODUCTNAME URE - PRODUCTVERSION 1.6 - PACKAGEVERSION 1.6 + PRODUCTVERSION 1.7 + PACKAGEVERSION 1.7 PACKAGEREVISION 1 PRODUCTEXTENSION LONG_PRODUCTEXTENSION @@ -288,14 +288,14 @@ OpenOffice_SDK variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -331,7 +331,7 @@ OpenOffice_Dev_SDK variables { PRODUCTNAME OOo-dev - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -340,7 +340,7 @@ OpenOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev @@ -379,7 +379,7 @@ BrOffice variables { PRODUCTNAME BrOffice.org - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -387,12 +387,12 @@ BrOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.2.0 + ABOUTBOXPRODUCTVERSION 3.3.0 PROGRESSBARCOLOR PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR - UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -401,7 +401,7 @@ BrOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -417,7 +417,7 @@ BrOffice STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 CODEFILENAME codes_broo.txt PATCHCODEFILE bro_patchcodes.txt DOWNLOADBANNER brobanner.bmp @@ -446,7 +446,7 @@ BrOffice_wJRE variables { PRODUCTNAME BrOffice.org - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -454,12 +454,12 @@ BrOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.2.0 + ABOUTBOXPRODUCTVERSION 3.3.0 PROGRESSBARCOLOR PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR - UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -468,7 +468,7 @@ BrOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -484,7 +484,7 @@ BrOffice_wJRE STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 CODEFILENAME codes_broo.txt PATCHCODEFILE bro_patchcodes.txt JAVAPRODUCT 1 @@ -513,7 +513,7 @@ BrOffice_Dev variables { PRODUCTNAME BrOo-dev - PRODUCTVERSION 3.2 + PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -523,7 +523,7 @@ BrOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.2.0 + ABOUTBOXPRODUCTVERSION 3.3.0 DEVELOPMENTPRODUCT 1 PROGRESSBARCOLOR PROGRESSSIZE @@ -533,15 +533,15 @@ BrOffice_Dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDevBroffice - SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93 - UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update + SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 + UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.2.0 + PACKAGEVERSION 3.3.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -558,7 +558,7 @@ BrOffice_Dev CHANGETARGETDIR 1 USE_FILEVERSION 1 JAVAPRODUCT 1 - LIBRARYVERSION 9.2.0 + LIBRARYVERSION 9.3.0 PATCHCODEFILE brodev_patchcodes.txt CODEFILENAME codes_broodev.txt DOWNLOADBANNER brobanner.bmp diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index 342053a288cb..abf5f14740da 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -1,4 +1,4 @@ -cp scp2 : l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL +cp scp2 : l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL cp scp2 usr1 - all cp_mkout NULL cp scp2\macros nmake - all cp_langmacros NULL cp scp2\source\templates nmake - all cp_langtemplates NULL diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index fa6c1cfcd661..0f34c3ad358d 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -57,7 +57,7 @@ STD_RES_FILE( gid_File_Res_Abp, abp) STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp) STD_RES_FILE( gid_File_Res_Dbp, dbp) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbu, dbu ) +STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu ) STD_RES_FILE( gid_File_Res_Dbu, dbu) STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) @@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr) STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl) STD_RES_FILE( gid_File_Res_Sdberr, sdberr) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt ) +STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt ) STD_RES_FILE( gid_File_Res_Rpt, rpt) STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui ) diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 89096b80f87c..3917d5f3e92f 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -51,9 +51,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) STD_UNO_LIB_FILE( gid_File_Lib_Date, date) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc) +STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc) -STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui) +STD_LIB_FILE( gid_File_Lib_Scui, scui) STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index c720c0a85d0f..4a30287e6fce 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable @@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index 839cf429793c..67e374e6d584 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -43,7 +43,7 @@ File gid_File_Oo_Office_Canvas_Xcu Name = "/registry/data/org/openoffice/Office/Canvas.xcu"; End -STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas) +STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas) STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools) #ifdef ENABLE_AGG diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 13b32fd71d0d..b06ca6430fe4 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable @@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 2e7d7f471cfe..cb23b879fc37 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable @@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp index 64629d480a20..0bb9d19ec2ab 100644 --- a/scp2/source/layout/layout.scp +++ b/scp2/source/layout/layout.scp @@ -38,28 +38,28 @@ End File gid_File_Zip_Toolkit_Layout Dir = gid_Dir_Share_Layout; USER_FILE_BODY; - Styles = (ARCHIVE, PATCH); + Styles = (ARCHIVE); Name = "toolkit-layout.zip"; End File gid_File_Zip_Sc_Layout Dir = gid_Dir_Share_Layout; USER_FILE_BODY; - Styles = (ARCHIVE, PATCH); + Styles = (ARCHIVE); Name = "sc-layout.zip"; End File gid_File_Zip_Svx_Layout Dir = gid_Dir_Share_Layout; USER_FILE_BODY; - Styles = (ARCHIVE, PATCH); + Styles = (ARCHIVE); Name = "svx-layout.zip"; End File gid_File_Zip_Sw_Layout Dir = gid_Dir_Share_Layout; USER_FILE_BODY; - Styles = (ARCHIVE, PATCH); + Styles = (ARCHIVE); Name = "sw-layout.zip"; End diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 43436a75f82d..5bd506f7432b 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -40,7 +40,7 @@ End #endif -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm) +STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm) STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd) diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp index 84c246f60b3c..cc50981da023 100644 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand ModuleID = gid_Module_Prg_Math_Bin; Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable @@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand ModuleID = gid_Module_Prg_Math_Bin; Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index b415ea2ad9e7..470b69eb9030 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -30,7 +30,7 @@ #include "macros.inc" -SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updchk , updchk.uno ) +SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu TXT_FILE_BODY; diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp index 93110fe693eb..67ec89b15963 100644 --- a/scp2/source/ooo/file_improvement.scp +++ b/scp2/source/ooo/file_improvement.scp @@ -49,5 +49,5 @@ End #endif #if defined(BUILD_SPECIAL) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement) +STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement) #endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index be5ca61b0563..f9c247bd6157 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -203,13 +203,13 @@ File gid_File_Lib_Comphelper2 Name = STRING(CONCAT3(comphelp4,COMID,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl) -STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui) +STD_LIB_FILE( gid_File_Lib_Cui, cui) #ifndef SYSTEM_CURL @@ -269,7 +269,7 @@ End #endif #endif -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dba, dba) +STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba) STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt) @@ -277,7 +277,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm) STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase ) +STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase ) File gid_File_Oo_Office_Dataaccess_Dbase_Xcu TXT_FILE_BODY; Styles = (PACKED); @@ -301,9 +301,9 @@ File gid_File_Lib_Dbpool #endif End -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbt, dbtools ) +STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools ) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml ) +STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml ) File gid_File_Lib_Dict_Ja TXT_FILE_BODY; @@ -362,7 +362,7 @@ End File gid_File_Lib_Dlgprov TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX @@ -462,7 +462,7 @@ End #endif -STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer) +STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj) @@ -472,11 +472,11 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #if defined(WNT) && !defined(DISABLE_ATL) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser ) +STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser ) File gid_File_Lib_Inprocserv TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "inprocserv.dll"; End @@ -563,7 +563,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc) File gid_File_Lib_Filterconfig1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; Name = SPECIAL_NAME(filterconfig1); @@ -593,7 +593,7 @@ End File gid_File_Lib_Fps TXT_FILE_BODY; - Styles = (PACKED,PATCH,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = "fps.dll"; @@ -642,7 +642,7 @@ End #ifdef QUARTZ File gid_File_Lib_Fps_Aqua TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno); @@ -710,14 +710,14 @@ End #endif -STD_LIB_FILE_PATCH( gid_File_Lib_Fwe , fwe) +STD_LIB_FILE( gid_File_Lib_Fwe , fwe) STD_LIB_FILE( gid_File_Lib_Fwi , fwi) File gid_File_Lib_Fwk Name = LIBNAME(fwk); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -738,7 +738,7 @@ End File gid_File_Lib_Go Name = LIBNAME(go); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -749,7 +749,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) File gid_File_Lib_I18npool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX @@ -935,12 +935,12 @@ File gid_File_Lib_Rebasemsi TXT_FILE_BODY; Name = "rebase.dll"; Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); + Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); End #endif -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng) +STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng) File gid_File_Lib_Localedata_En TXT_FILE_BODY; @@ -1018,7 +1018,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) File gid_File_Lib_Mozbootstrap TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX @@ -1108,7 +1108,7 @@ File gid_File_Lib_Mingw_GccS TXT_FILE_BODY; Dir = gid_Dir_Program; Name = MINGW_GCCDLL; - Styles = (PACKED, PATCH); + Styles = (PACKED); End #endif @@ -1119,7 +1119,7 @@ File gid_File_Lib_Mingw_Stdcpp TXT_FILE_BODY; Dir = gid_Dir_Program; Name = MINGW_GXXDLL; - Styles = (PACKED, PATCH); + Styles = (PACKED); End #endif @@ -1228,7 +1228,7 @@ End STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) #ifndef WITHOUT_MOZILLA -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl) +STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl) #endif STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload) @@ -1239,13 +1239,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_Vclplug_Gen Name = LIBNAME(vclplug_gen); TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1255,7 +1255,7 @@ End File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1264,7 +1264,7 @@ End File gid_File_Lib_Vclplug_Kde Name = LIBNAME(vclplug_kde); TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1300,7 +1300,7 @@ End #endif #if defined UNX && ! defined QUARTZ -STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp ) +STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp ) STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) #endif @@ -1351,7 +1351,7 @@ End File gid_File_Lib_Res Name = LIBNAME(res); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1382,9 +1382,9 @@ End STD_LIB_FILE( gid_File_Lib_Sax , sax) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox , oox) +STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb) +STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb) STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn) @@ -1401,15 +1401,15 @@ File gid_File_Lib_Scriptframe #endif RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,PATCH,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT); End -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd) -STD_LIB_FILE_PATCH( gid_File_Lib_Sdui, sdui) +STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd) +STD_LIB_FILE( gid_File_Lib_Sdui, sdui) File gid_File_Lib_Slideshow TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX @@ -1438,7 +1438,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) File gid_File_Lib_Sfx Name = LIBNAME(sfx); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1466,7 +1466,7 @@ End #endif -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sot, sot ) +STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot ) #if defined(UNX) && !defined(QUARTZ) @@ -1481,7 +1481,7 @@ End File gid_File_Lib_Spell TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(spell); Dir = SCP2_OOO_BIN_DIR; @@ -1493,24 +1493,24 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) STD_LIB_FILE( gid_File_Lib_Sts , sts) -STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl ) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno ) +STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl ) +STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) -STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore) -STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx) +STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) +STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) -STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) +STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) + +STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw) +STD_LIB_FILE( gid_File_Lib_Swui, swui) -STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword ) +STD_LIB_FILE( gid_File_Lib_Msword, msword ) #if ! defined UNX File gid_File_Lib_Sysdtrans TXT_FILE_BODY; - Styles = (PACKED,PATCH,UNO_COMPONENT); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = "sysdtrans.dll"; @@ -1581,13 +1581,13 @@ File gid_File_Lib_Ucpchelp1 End #ifndef DISABLE_NEON -SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1) +SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #ifndef SYSTEM_NEON SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) #endif #endif -SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1) +SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) @@ -1601,7 +1601,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) File gid_File_Lib_Lnth TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(lnth); Dir = SCP2_OOO_BIN_DIR; @@ -1609,22 +1609,22 @@ End File gid_File_Lib_Hyph TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(hyphen); Dir = SCP2_OOO_BIN_DIR; End -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl) +STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui ) +STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui ) STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1649,7 +1649,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof) File gid_File_Lib_Xo Name = LIBNAME(xo); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1712,7 +1712,7 @@ File gid_File_Lib_XSec_Framework Name = "xsec_fw.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End @@ -1724,7 +1724,7 @@ File gid_File_Lib_XSec_XmlSec Name = "xsec_xmlsec.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT,PATCH); + Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End @@ -1792,9 +1792,9 @@ End STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Updchkui , updchk ) +STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk ) -SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno ) +SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) #ifdef WNT File gid_File_Lib_Onlinecheck @@ -1842,7 +1842,7 @@ File gid_File_Lib_Unopkgapp Styles = (PACKED); End -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore) +STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore) #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \ !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 7d1d8bb5cc40..5e571e0b2e03 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -163,7 +163,7 @@ End File gid_File_Profile_Gengal BIN_FILE_BODY; Dir = gid_Dir_Program; - Styles = (PACKED, PATCH); + Styles = (PACKED); Name = PROFILENAME(gengal); End @@ -173,7 +173,7 @@ File gid_File_Bin_Pluginapp BIN_FILE_BODY; Dir = gid_Dir_Program; Name = "pluginapp.bin"; - Styles = (PACKED,PATCH); + Styles = (PACKED); End #endif @@ -348,7 +348,7 @@ End STD_FILTER_FILE( gid_File_Filter_Eme, eme) -STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt) +STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt) STD_FILTER_FILE( gid_File_Filter_Icg, icg) @@ -503,17 +503,6 @@ End #endif #ifdef SOLAR_JAVA -#ifndef GCJ -File gid_File_Jar_Sandbox - TXT_FILE_BODY; - Name = JARFILENAME(sandbox); - Dir = gid_Dir_Classes; - Styles = (PACKED); -End -#endif -#endif - -#ifdef SOLAR_JAVA UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) @@ -526,7 +515,7 @@ File gid_File_Jar_Unoil TXT_FILE_BODY; Name = "unoil.jar"; Dir = gid_Dir_Classes; - Styles = (PACKED,DONT_OVERWRITE,PATCH); + Styles = (PACKED,DONT_OVERWRITE); End #endif @@ -1667,7 +1656,7 @@ End File gid_File_Oo_Office_Ui_Genericcommands_Xcu TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu"; End @@ -1730,7 +1719,7 @@ End File gid_File_Oo_Office_Linguistic_Xcs TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs"; End @@ -2126,7 +2115,7 @@ End File gid_File_Rdb_Offapi TXT_FILE_BODY; Dir = gid_Dir_Program; - Styles = (PACKED,PATCH); + Styles = (PACKED); Name = "offapi.rdb"; End @@ -2724,7 +2713,7 @@ File gid_Starregistry_Services_Rdb TXT_FILE_BODY; Name = "services.rdb"; Dir = gid_Dir_Program; - Styles = (PACKED, STARREGISTRY, PATCH); + Styles = (PACKED, STARREGISTRY); #if defined WNT NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/"; #else @@ -2893,7 +2882,7 @@ File gid_File_Images_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images.zip"; - Styles = (PACKED,PATCH); + Styles = (PACKED); End File gid_File_ImagesCrystal_Zip @@ -2903,6 +2892,13 @@ File gid_File_ImagesCrystal_Zip Styles = (PACKED); End +File gid_File_ImagesOxygen_Zip + TXT_FILE_BODY; + Dir = gid_Dir_Share_Config; + Name = "images_oxygen.zip"; + Styles = (PACKED); +End + File gid_File_ImagesHicontrast_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 14b02d2dfa83..010a3ec5efd6 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -87,7 +87,7 @@ STD_RES_FILE( gid_File_Res_San, san ) STD_RES_FILE( gid_File_Res_Sd, sd ) -STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx ) +STD_RES_FILE( gid_File_Res_Sfx, sfx ) #if defined(UNX) && !defined(QUARTZ) @@ -101,11 +101,13 @@ STD_RES_FILE( gid_File_Res_Sb, sb ) STD_RES_FILE( gid_File_Res_Svs, svs ) STD_RES_FILE( gid_File_Res_Svt, svt ) -STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp ) +STD_RES_FILE_ONLY( gid_File_Res_Svp, svp ) STD_RES_FILE( gid_File_Res_Svx, svx ) STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs ) +STD_RES_FILE( gid_File_Res_Cui, cui ) + STD_RES_FILE( gid_File_Res_Sw, sw ) STD_RES_FILE( gid_File_Res_Tk, tk ) @@ -113,7 +115,7 @@ STD_RES_FILE( gid_File_Res_Acc, acc ) STD_RES_FILE( gid_File_Res_Tpl, tpl ) -STD_RES_FILE_PATCH( gid_File_Res_Uui, uui ) +STD_RES_FILE( gid_File_Res_Uui, uui ) STD_RES_FILE( gid_File_Res_Vcl, vcl ) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 345f28a8762c..aa8c3178c9fd 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -301,7 +301,6 @@ PARFILES += \ folder_ooo.par \ folderitem_ooo.par \ registryitem_ooo.par \ - mergemodules_ooo.par \ vc_redist.par \ windowscustomaction_ooo.par .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index e20308572219..4b293e0a6126 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -867,6 +867,7 @@ Module gid_Module_Root_Files_Images Styles = (HIDDEN_ROOT); Files = (gid_File_Images_Zip, gid_File_ImagesCrystal_Zip, + gid_File_ImagesOxygen_Zip, gid_File_ImagesHicontrast_Zip, gid_File_ImagesIndustrial_Zip, gid_File_ImagesTango_Zip, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index d28fa5bb54dd..9f6329fabc77 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -96,6 +96,7 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Svt, gid_File_Res_Svp, gid_File_Res_Svx, + gid_File_Res_Cui, gid_File_Res_TextConversionDlgs, gid_File_Res_Sw, gid_File_Res_Tab, diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp index 97211fe6a5ac..34c3a5ce8957 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -56,7 +56,7 @@ Profile gid_Profile_Version_Ini_Basis ModuleID = gid_Module_Root; Name = PROFILENAME(version); Dir = gid_Dir_Program; - Styles = (PATCH); + Styles = (); End Profile gid_Profile_Fundamentalbasis_Ini diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index d06c4bd3864c..6544de17f993 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -266,7 +266,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc ModuleID = gid_Module_Root; Name = "INSTALLLOCATION"; Value = "[INSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install @@ -275,7 +275,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad ModuleID = gid_Module_Root; Name = "INSTALLLOCATION"; Value = "[INSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install @@ -284,7 +284,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install ModuleID = gid_Module_Root; Name = "INSTALLLOCATION"; Value = "[INSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED,PATCH); + Styles = (ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall @@ -293,7 +293,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc ModuleID = gid_Module_Root; Name = "OFFICEINSTALLLOCATION"; Value = "[OFFICEINSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH,UPGRADEKEY); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion @@ -302,7 +302,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc ModuleID = gid_Module_Root; Name = "ProductVersion"; Value = "[ProductVersion]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall @@ -311,7 +311,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad ModuleID = gid_Module_Root; Name = "OFFICEINSTALLLOCATION"; Value = "[OFFICEINSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion @@ -320,7 +320,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad ModuleID = gid_Module_Root; Name = "ProductVersion"; Value = "[ProductVersion]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall @@ -329,7 +329,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall ModuleID = gid_Module_Root; Name = "OFFICEINSTALLLOCATION"; Value = "[OFFICEINSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED,PATCH); + Styles = (ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall @@ -338,7 +338,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[BASISINSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall @@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[BASISINSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall @@ -356,7 +356,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[BASISINSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION,PATCH); + Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION); End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall @@ -365,7 +365,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal ModuleID = gid_Module_Root; Name = "BASISINSTALLLOCATION"; Value = "[BASISINSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED,PATCH); + Styles = (ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall @@ -374,7 +374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[UREINSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall @@ -383,7 +383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[UREINSTALLLOCATION]"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH); + Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall @@ -392,7 +392,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[UREINSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION,PATCH); + Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION); End RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall @@ -401,7 +401,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall ModuleID = gid_Module_Root; Name = "UREINSTALLLOCATION"; Value = "[UREINSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED,PATCH); + Styles = (ALWAYS_REQUIRED); End RegistryItem gid_Regitem_Sog diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 1c260e2d2508..41f2b73adbe8 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx BIN_FILE_BODY; Dir = gid_Dir_Ure_Bin; Name = EXENAME(javaldx); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1"; End #endif @@ -269,7 +269,7 @@ File gid_File_Dl_Sal TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_UNO_VER("sal", "3"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID,PATCH); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6"; End @@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("sunjavaplugin"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E"; End #endif @@ -839,7 +839,7 @@ File gid_File_Dl_Libxml2 #else Name = SCP2_URE_DL_VER("xml2", "2"); #endif - Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E"; End #endif @@ -1208,7 +1208,7 @@ Profile gid_Profile_Version_Ini_Ure ModuleID = gid_Module_Root_Ure_Hidden; Name = PROFILENAME(version); Dir = gid_Dir_Ure_Bin; - Styles = (PATCH); + Styles = (); End ProfileItem gid_Ure_Profileitem_Version_Buildid diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index cefdd69ce034..b7e6e81dc331 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -30,25 +30,29 @@ #include "macros.inc" #if defined(WITH_VC_REDIST) -WindowsCustomAction gid_Customaction_InstallRuntime - Name = "InstallRuntime"; - Typ = "98"; - Source = "SystemFolder"; - Target = "[SourceDir]redist\vcredist_x86.exe /qb"; - Inbinarytable = 0; - Styles = (NO_FILE); - Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction"); -End -WindowsCustomAction gid_Customaction_InstallRuntime_X64 - Name = "InstallRuntimeX64"; - Typ = "98"; - Source = "SystemFolder"; - Target = "[SourceDir]redist\vcredist_x64.exe /qb"; - Inbinarytable = 0; - Styles = (NO_FILE); - Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction"); -End +// WindowsCustomAction gid_Customaction_InstallRuntime +// Name = "InstallRuntime"; +// Typ = "98"; +// Source = "SystemFolder"; +// Target = "[SourceDir]redist\vcredist_x86.exe /qb"; +// Inbinarytable = 0; +// Styles = (NO_FILE); +// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction"); +// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost"); +// End + +// WindowsCustomAction gid_Customaction_InstallRuntime_X64 +// Name = "InstallRuntimeX64"; +// Typ = "98"; +// Source = "SystemFolder"; +// Target = "[SourceDir]redist\vcredist_x64.exe /qb"; +// Inbinarytable = 0; +// Styles = (NO_FILE); +// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction"); +// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost"); +// End + ScpAction scp_Copy_vcredist_x86 #if defined(BUILD_SPECIAL) @@ -65,4 +69,5 @@ ScpAction scp_Copy_vcredist_x64 Name = "vcredist_x64.exe"; Subdir = "redist"; End + #endif diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index b4ddac39799b..ceb0b156cd7b 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -394,7 +394,7 @@ WindowsCustomAction gid_Customaction_Patch_Isofficerunning Target = "IsOfficeRunning"; Inbinarytable = 1; Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1"); - Assignment2 = ("InstallExecuteSequence", "", "RunningOffice"); + Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice"); End WindowsCustomAction gid_Customaction_Full_Isofficerunning @@ -403,7 +403,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning Source = "shlxtmsi.dll"; Target = "IsOfficeRunning"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "", "RunningOffice"); + Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice"); End WindowsCustomAction gid_Customaction_Langpack_Isofficerunning @@ -412,7 +412,7 @@ WindowsCustomAction gid_Customaction_Langpack_Isofficerunning Source = "lngpckinsthlp.dll"; Target = "IsOfficeRunning"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice"); + Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice"); End WindowsCustomAction gid_Customaction_CheckPatchList diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 33616500ac29..819ba6128663 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand ModuleID = gid_Module_Prg_Wrt_Bin; Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable @@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand ModuleID = gid_Module_Prg_Wrt_Bin; Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32"; Value = "<progpath>\program\inprocserv.dll"; - Styles = (PATCH); + Styles = (); End RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 9ba398eff7b9..bafca83860cb 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -129,7 +129,6 @@ SCP1FILES += \ folder_ooo.par \ folderitem_ooo.par \ windowscustomaction_ooo.par \ - mergemodules_ooo.par \ vc_redist.par \ registryitem_writer.par \ folderitem_writer.par \ @@ -283,7 +282,6 @@ SCP2FILES += \ folder_ooo.par \ folderitem_ooo.par \ windowscustomaction_ooo.par \ - mergemodules_ooo.par \ vc_redist.par \ registryitem_writer.par \ folderitem_writer.par \ diff --git a/set_soenv.in b/set_soenv.in index 16edc29334d0..4d3e41383a38 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, $PROEXT, - $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS); + $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- # IId. Declaring the aliases. @@ -591,33 +591,6 @@ elsif ( $platform =~ m/osf1/ ) $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads"; } -elsif ( $platform =~ m/irix/ ) -{ print "Setting Irix specific values... "; - $outfile = "IrixMipsEnv.Set"; - $BIG_SVX = "TRUE"; - if ($CC =~ "gcc" ) { - $COM = "GCC"; - $OUTPATH = "unxirgm"; - $CVER = "C300"; - } - else { - $COM = "C730"; - $CVER = "C730"; - $OUTPATH = "unxirxm3"; - } - $COMPATH = '@COMPATH@'; - $CPU = "M"; - $CPUNAME = "MIPS"; - $GUI = "UNX"; - $GUIBASE = "unx"; - $GVER = "VCL"; - $INPATH = $OUTPATH.$PROEXT; - $OS = "IRIX"; - $PATH_SEPERATOR = $ps; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads"; -} elsif ( $platform =~ m/cygwin/ ) { $COMPATH = PathFormat('@COMPATH@'); @@ -646,7 +619,6 @@ elsif ( $platform =~ m/cygwin/ ) $PATH_SEPERATOR = ';'; $outfile = "winmingw.set"; $COM = "GCC"; - $COMPATH =~ s/\/bin$//i; $CVER = "C341"; $OUTPATH = "wntgcci"; $INPATH = $OUTPATH.$PROEXT; @@ -655,8 +627,6 @@ elsif ( $platform =~ m/cygwin/ ) else # The MSVC section starts here { $outfile = "winenv.set"; $COM = "MSC"; - # COMPATH for MSC is differently used - $COMPATH =~ s/\/bin$//i; $OUTPATH = "wntmsci@COMEX@"; $INPATH = $OUTPATH.$PROEXT; $COMEX = '@COMEX@'; @@ -979,12 +949,10 @@ if ( $platform =~ m/darwin/ ) $WORK_STAMP = "@SOURCEVERSION@"; # Location of the source. $SOLARSRC = '$SRC_ROOT'; - -# SOURCE_ROOT_DIR equals $SOLARSRC/.. -my @list1 = split( /\// , $SOLARSRC ); -pop @list1; -$SOURCE_ROOT_DIR = join ( '/' , @list1 ); - +# Location of the repository. +my @splitlist = split( /\//, $SRC_ROOT ); +pop @splitlist; +$SOURCE_ROOT_DIR = join("/", @splitlist); # $DEVROOT = '$SRC_ROOT'; # Set solenv and solver to given or default values. @@ -1037,7 +1005,7 @@ if ($platform =~ m/solaris/) $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB; } -elsif ($platform =~ m/linux|netbsd|osf1|irix|freebsd|aix/) +elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/) { $SOLAREXTRALIB = $L.$par_dir.$LIB64; } @@ -1103,7 +1071,7 @@ if ($platform =~ m/cygwin|os2/) } # The general environment path. -if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/) +if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/) { $PATH = $cur_dir. # $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. @@ -1323,9 +1291,7 @@ if ($platform =~ m/solaris/) $L.$LIB. $L.$USR_LIB; if ( $CC =~ "gcc" ) { - my $temp = $COMPATH; - $temp =~ s:/bin$::; - $SOLARLIB .= $L.$temp.$LIB; + $SOLARLIB .= $L.$COMPATH.$LIB; } $SOLARLIB .= $L.$USR_LOCAL.$LIB. $L.$USR_DT.$LIB. @@ -1337,7 +1303,7 @@ if ($platform =~ m/solaris/) $L_STLPORT_LIB. $L.$XLIB; } -elsif ($platform =~ m/linux|netbasd|osf1|irix|aix|freebsd/) +elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/) { $SOLARLIB = $L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. @@ -1380,7 +1346,7 @@ $SOLARINC = $I.$cur_dir. $I.'$SOLARENV'.$INC. $I.'$SRC_ROOT'.$ds."res"; -if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|irix/) +if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/) { $SOLARINC .= $STLPORT_stlport; if ($platform =~ m/linux|freebsd|netbsd/) @@ -1394,9 +1360,8 @@ $SOLARINC .= '/SC5 '; } # Platform dependent include path at the top of this list of include paths if ($platform =~ m/solaris/) -{ my $temp; - $temp =~ s:$COMPATH:/bin\$:; - $SOLARINC .= $I.$temp.$ds."include"; +{ + $SOLARINC .= $I.$COMPATH.$ds."include"; } if ($platform =~ m/linux/) { @@ -1426,9 +1391,6 @@ if ($platform =~ m/linux/) elsif ($platform =~ m/netbsd/) { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; } - elsif ($platform =~ m/irix/) - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix"; - } #java threads include path @@ -1498,14 +1460,6 @@ else { AddWarning( "set_soenv", "$platform not configured for system dependant include dir" ); } -if ($SYSTEM_PYTHON eq "NO") { - $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno'; - if ($GUIBASE eq "WIN") { - # PYTHONPATH need to use '\' directory seperators; - $PYTHONPATH = WinPath( $PYTHONPATH, ";" ); - } -} - # print "done\n"; @@ -1829,11 +1783,9 @@ ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" ); ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" ); ToFile( "BUILD_TYPE", "@BUILD_TYPE@", "e" ); ToFile( "VERBOSE", "@VERBOSE@", "e" ); -ToFile( "WITH_FONTOOO", "@WITH_FONTOOO@", "e" ); ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@", "e" ); ToFile( "GOBJECT_CFLAGS", "@GOBJECT_CFLAGS@", "e" ); ToFile( "GOBJECT_LIBS", "@GOBJECT_LIBS@", "e" ); -ToFile( "SYSTEM_MSPACK", "@SYSTEM_MSPACK@", "e" ); if ( '@ENABLE_RPATH@' eq "no" ) { ToFile( "LINKFLAGSRUNPATH",'', "e" ); } @@ -1981,9 +1933,6 @@ ToFile( "MKOUT", $perlpre."mkout.pl", "e" ); ToFile( "ZIPDEP", $perlpre."zipdep.pl", "e" ); ToFile( "USE_SHELL", '@USE_SHELL@', "e" ); -if ($SYSTEM_PYTHON eq "NO") { - ToFile( "PYTHONPATH", $PYTHONPATH, "e" ); -} # # Writing the aliases to file. diff --git a/soldep/bootstrp/XMLBuildListParser.pm b/soldep/bootstrp/XMLBuildListParser.pm deleted file mode 100644 index 857723657568..000000000000 --- a/soldep/bootstrp/XMLBuildListParser.pm +++ /dev/null @@ -1,1966 +0,0 @@ -: -eval 'exec perl -wS $0 ${1+"$@"}' - if 0; - -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: XMLBuildListParser.pm,v $ -# -# $Revision: 1.3 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -#************************************************************ -# Data structure and XML parser/creator for the changeover * -# of the current build.lst to build.xlist files * -# programmer: Pascal Junck, Sun Microsystems GmbH * -#************************************************************ - -# The current XMLBuildListParser is the second step for the changeover to XML. -# It was written to create a complex structure with more possibilities to store informations -# of the 'build.lst' files in the new XML files. The important informations were parsed by the -# 'buildlst_parser.pl' from the old files and then are (temporary) stored by the set and add -# methods in the module 'XMLBuildListParser' and 'XML::Parser'. By the API of this module it's -# possible to create the new XML 'build.xlist' files. - -# If the '$Product' or the '$JobPlatform' (as also '$BuildReqPlatform') have no value, -# their value are automatically 'all'. -# It doesn't matter whether it's the set/add or the get method, that receives or sends -# these optional parameters. -# In the created XML file the default values aren't set, because of the constraints of the -# 'Document Type Definition'(DTD). -# If there is no product/platform attribute in the 'build.xlist' it means a default of 'all'! - -# The important parameters are: - -# $ModuleName = it's the name of the current module - -# $DependencyType = here are the three possible scalar dependency values -# for all other depending modules(of the current module): -# 'md-simple', 'md-always' and 'md-force' - -# $Products = which products can be used for the module dependencies -# and might have more different whitespace separated values -# e.g.'so oo' (scalar type) - -# $Dir = it means a string(scalar) with the current working directory, -# with a '/'(current directory) at the beginning of the string - -# $JobType = it means a job e.g. 'make' - -# $Platforms = in this scalar parameter might be more than one different value, -# like: 'wnt unx mac' and 'all'('all' includes the three values) -# it must be whitespace separated - -# @DependingDirs = a list(array) of all inner depending directories -# of the current working directory - -# %BuildReq = means a hash with build requirement pairs: -# 'BuildReqName'(key) => 'BuildReqPlatform'(value) - - - -############################## begin of main ######################################## - -use strict; - -use XML::Parser; - -package XMLBuildListParser; - -# global variable for printing out all results at parsing -# if the debug variable is set to '1' it prints the results to STDOUT -my $Debug = 0; - - -############################# begin of subroutines ################################### - -sub new -{ - my $invocant = shift; - my $class = ref($invocant) || $invocant; - - my $self = {}; - - # no real instance data yet, might change if package is extended - bless($self, $class); - $$self{'error_string'} = ''; - $self->beginXMLStructure(); - - return $self; -} - -# VG: procedure for a better error handling -sub getError -{ - my $self = shift; - return $$self{'error_string'}; -}; - -######################################################################################## -# sub: loadXMLFile -# gets: $File -# optional: - -# returns: - -# description: get the 'path' of the 'build.xlist'(s), load it in the 'xml parser tree' -# and fill it in the own data_structure to make it available for the API -######################################################################################## -sub loadXMLFile -{ - my $self = shift; - my $File = shift; - - if (-f $File) - { - my $TreeParse = new XML::Parser(Style => 'Tree'); - - my $File_ref; - - eval - { - $File_ref = $TreeParse->parsefile($File); - }; - - if ($@) - { - $@ =~ s/[\r\n]//g; - print"ERROR: $@" if ($Debug); - $$self{'error_string'} = 'ERROR: ' . $@ . ". Error occured while trying to parse $File"; - - return 0; - } - else - { - filterXMLFile($File_ref); - - $$self{"ModuleData"} = $File_ref; - - return 1; - } - } - else - { - $$self{'error_string'} = "ERROR: cannot find file $File"; - return 0; - } -} - -######################################################################################## -# sub: filterXMLFile -# gets: $ArrayContent_ref -# optional: - -# returns: - -# description: filters all '0' and whitespace based pairs of the XML file -# -> all spaces, tabs and new lines -######################################################################################## -sub filterXMLFile -{ - my $ArrayContent_ref = shift; - - # get the number of elements of the array_ref - my $Count = getContentCount($ArrayContent_ref); - - for (my $i = 0; $i < $Count;) - { - # get each content pair - my $Content_ref = getContent($ArrayContent_ref, $i); - - # in each content pair the first element is either - # a tag name or the value '0' - my $FirstContent = getTagName($Content_ref); - - # we need the second part of the content pair to check - # which value is inside - my $SecondContent = getSecondContent($Content_ref); - - my $tempArray_ref = ""; - if (($FirstContent eq "task") or ($FirstContent eq "depend")) - { - my $dir = $Content_ref->[1]->[0]->{dir}; - $dir =~ s/\/$//; - $Content_ref->[1]->[0]->{dir} = $dir; - $i++; - filterXMLFile($Content_ref); - } - elsif ($FirstContent eq "0") - { - # only if there is in the first part a '0' and in the - # second part are whitespaces... - if ($SecondContent =~ /\s+/) - { - # ...make a ref at this position - $tempArray_ref = @$ArrayContent_ref[1]; - - # and delete this element pair - removeContent($tempArray_ref, $i); - - # now we have one element pair fewer - $Count--; - } - else - { - # is there a '0' but in the second part not a whitespace, - # increase 'i' by 1 - $i++; - } - } - else - { - # if it's a tag name, increase 'i' by one and call recursive - # the 'filterXMLFile' with the 'content ref' - $i++; - - # look further after the '0' and whitespace content - filterXMLFile($Content_ref); - } - } -} - -######################################################################################## -# sub: removeContent -# gets: $File_ref, $Count -# optional: - -# returns: - -# description: removes the '0' and the whitespace based pairs of the XML structure -# whitespace could be: tabs, new lines and whitespace itself -######################################################################################## -sub removeContent -{ - my $tempArray_ref = shift; - my $i = shift; - - my $Start = (2*$i) + 1; - - splice(@$tempArray_ref, $Start, 2); -} - -######################################################################################## -# sub: beginXMLStructure -# gets: $ModuleData_ref -# optional: - -# returns: - -# description: create a new beginning of the XML file structure -######################################################################################## -sub beginXMLStructure -{ - my $self = shift; - - # global variable for the complete filled data structure - my $ModuleData_ref = createTag("build-list", {}); - - $$self{"ModuleData"} = $ModuleData_ref; -} - -######################################################################################## -# sub: insertContent -# gets: $HigherLevelTag_ref, $currentTag_ref, $Pos -# optional: - -# returns: - -# description: insert a content at the right (alphabetical sorted) position -######################################################################################## -sub insertContent -{ - my $HigherLevelTag_ref = shift; - my $currentTag_ref = shift; - my $Pos = shift; - - my $Array_ref = $HigherLevelTag_ref->[1]; - - $Pos = ($Pos*2)+1; - - splice(@$Array_ref, $Pos, 0, @$currentTag_ref); -} - -######################################################################################## -# sub: saveXMLFile -# gets: $Path -# optional: - -# returns: - -# description: creates a XML file of the whole data structure -######################################################################################## -sub saveXMLFile -{ - my $self = shift; - my $Path = shift; - - my $ModuleData_ref = $$self{"ModuleData"}; - - # open the filehandle 'CREATE_XML' for creating the XML files - open (SAVE_XML, ">".$Path) - or die "Error. Open the file <build.xlist> wasn't successful!\n\n"; - - select SAVE_XML; - - print"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; - print"<!DOCTYPE build-list SYSTEM \"build_xlist.dtd\">\n"; - print"<!--\n" - ."***************************************************************************\n" - ."* \n" - ."* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. \n" - ."* \n" - ."* Copyright 2008 by Sun Microsystems, Inc. \n" - ."* \n" - ."* OpenOffice.org - a multi-platform office productivity suite \n" - ."* \n" - ."* \$RCSfile: XMLBuildListParser.pm,v $ \n" - ."* \n" - ."* \$Revision: 1.3 $ \n" - ."* \n" - ."* This file is part of OpenOffice.org. \n" - ."* \n" - ."* OpenOffice.org is free software: you can redistribute it and/or modify \n" - ."* it under the terms of the GNU Lesser General Public License version 3 \n" - ."* only, as published by the Free Software Foundation. \n" - ."* \n" - ."* OpenOffice.org is distributed in the hope that it will be useful, \n" - ."* but WITHOUT ANY WARRANTY; without even the implied warranty of \n" - ."* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n" - ."* GNU Lesser General Public License version 3 for more details \n" - ."* (a copy is included in the LICENSE file that accompanied this code). \n" - ."* \n" - ."* You should have received a copy of the GNU Lesser General Public License \n" - ."* version 3 along with OpenOffice.org. If not, see \n" - ."* <http://www.openoffice.org/license.html> \n" - ."* for a copy of the LGPLv3 License. \n" - ."* \n" - ."***************************************************************************\n" - ."-->\n"; - - printTag($ModuleData_ref); - - # flush the buffer - # it's the same like the both lines below here, but we make it manually without module 'IO' - # use IO::Handle; - # SAVE_XML -> autoflush(1); - $| = 1; - - select STDOUT; - - close (SAVE_XML); - -} - -######################################################################################## -# sub: printTag -# gets: $Tag_ref -# optional: - -# returns: - -# description: prints out each tag of the existing data structure (XML tree) -######################################################################################## -sub printTag -{ - my $Tag_ref = shift; - - # the first time we call this function the 'pos counter' has the default value of '0', - # because it is for the begin tag -> it shouldn't have a distance to the left side - my $PosCounter = shift || 0; - - # makes it possible that each tag has a specified distance from the left sided margin - my $Distance = " " x $PosCounter; - - # it's possible that the content is a text(case 1) between a begin and end tag - # or a tag name(case 2) - # case 1: ( 0 , "Text between the begin and end tag" ) - my $TagName = getTagName($Tag_ref); - - if ($TagName eq "0") - { - print"$Tag_ref->[1]"; - } - # case 2: ( "TagName" , (...) ) - else - { - # open the tag - # only a new line if it is not the first tag - print"\n" if ($PosCounter != 0); - print $Distance."<".$TagName; - - my $Attributes_ref = getAttributesRef($Tag_ref); - - # print all sorted attributes of this tag - foreach my $Attribute (sort keys %$Attributes_ref) - { - my $value = $$Attributes_ref{$Attribute}; - print" $Attribute=\"$value\""; - } - - # get the number of elements of the array - my $ContentCount = getContentCount($Tag_ref); - - # close the tag - # if it is an empty tag create a '/' before we close it with '>' - print"/" if ($ContentCount == 0); - print">"; - - # get and print all tags recursive - for (my $i = 0; $i < $ContentCount; $i++) - { - # here we get the content of the current tag, - # we rise the 'pos counter' that each level of tags - # has a specified distance from the left side - printTag(getContent($Tag_ref, $i), $PosCounter + 2); - } - - # check that the tag has a text between the begin and end tag - # first: had the tag further inner tags? - if ($ContentCount > 0) - { - my $Content_ref = getContent($Tag_ref, 0); - my $TagName = getTagName($Tag_ref); - my $TagContent = getTagName($Content_ref); - - # if a tag has a begin tag and a following text, create the end tag behind the text - print"</$TagName>" if ($TagContent eq "0"); - - print"\n".$Distance."</$TagName>" if ($TagContent ne "0"); - } - } -} - -######################################################################################## -# sub: getTagName -# gets: $Content_ref -# optional: - -# returns: $TagName -# description: gets a reference of an array and returns the tag name at position '0' -######################################################################################## -sub getTagName -{ - my $Content_ref = shift; - - my $TagName = $$Content_ref[0]; - - return $TagName; -} - -######################################################################################## -# sub: getSecondContent -# gets: $Content_ref -# optional: - -# returns: $SecondContent -# description: gets a reference of an array and returns the second value(index '1') -######################################################################################## -sub getSecondContent -{ - my $Content_ref = shift; - - my $SecondContent = $$Content_ref[1]; - - return $SecondContent; -} - -######################################################################################## -# sub: createSortKey -# gets: $DependencyType, $DepModuleName -# optional: - -# returns: $SortKey -# description: creates a key with a number(depending of the dependency type) -# and a string and returns it -######################################################################################## -sub createSortKey -{ - my $DependencyType = shift; - my $DepModuleName = shift; - - my $DepTypeAsValue = 0; - - if ($DependencyType eq "md-simple") - { - $DepTypeAsValue = 1; - } - elsif ($DependencyType eq "md-always") - { - $DepTypeAsValue = 2; - } - elsif ($DependencyType eq "md-force") - { - $DepTypeAsValue = 3; - } - - my $SortKey = $DepTypeAsValue.$DepModuleName; - - return $SortKey; -} - -######################################################################################## -# sub: searchTag -# gets: $TagName, $Tag_ref -# optional: - -# returns: $TagValues_ref -# description: gets a reference and goes in the lower level tag, -# looks after the specified tag name and returns the reference -# of itself and the neighbour element -######################################################################################## -sub searchTag -{ - my $TagName = shift; - my $Tag_ref = shift; - - my $TagSerie_ref = $Tag_ref->[1]; - - # (all elements of the array) - 1 => highest index of the array - my $IndexEnd = scalar(@$TagSerie_ref)-1; - - my $TagValues_ref = undef; - - for (my $i = 1; $i <= $IndexEnd; $i += 2) - { - if ($TagSerie_ref->[$i] eq $TagName) - { - @$TagValues_ref = @$TagSerie_ref[$i..$i+1]; - - last; - } - } - - return $TagValues_ref; -} - -######################################################################################## -# sub: createTag -# gets: $TagName, $Attribute_ref -# optional: - -# returns: $Tag_ref -# description: creates an anonymous array with a tag name and the reference of its -# attributes; then returns the reference of this array -######################################################################################## -sub createTag -{ - my $TagName = shift; - my $Attribute_ref = shift; - - my $Tag_ref = [$TagName, [$Attribute_ref]]; - - return $Tag_ref; -} - -######################################################################################## -# sub: createText -# gets: $Text -# optional: - -# returns: $TagText_ref -# description: creates an anonymous array(which contains a '0' and a string) -# for the data structure and returns a reference of it -######################################################################################## -sub createText -{ - my $Text = shift; - - my $TagText_ref = [0, $Text]; - - return $TagText_ref; -} - -######################################################################################## -# sub: addContent -# gets: $Tag_ref, $NextInfos_ref -# optional: - -# returns: - -# description: creates and adds a tag with its following content -######################################################################################## -sub addContent -{ - # '$NextInfos_ref' has two infos: - # either: '0' and a string -> [Tag, [{}, 0 , string ]] - # or: 'tag' and a ref of a anonymous array -> [Tag, [{}, newTag, [.....] ]] - my $Tag_ref = shift; - my $NextInfos_ref = shift; - - my $SecondPart_ref = $Tag_ref->[1]; - - # '$Tag_ref' gets now the right structure: - # e.g. ['tag1', [{}, 0, "text of tag1" ...]...] - # or ['tag1', [{}, 'tag2', [...] ...]...] - push(@$SecondPart_ref, @$NextInfos_ref); -} - -######################################################################################## -# sub: getContent -# gets: $Tag_ref, $i -# optional: - -# returns: \@Content (ref of array 'content') -# description: creates and returns a reference of an array with two elements, -# which are a part of the array of the current tag -######################################################################################## -sub getContent -{ - my $Tag_ref = shift; - my $i = shift; - - # e.g. - # [ "tag 1", [ {} , 0 , "string", "tag 2", [{}..], "tag 3", [{}..], ..] ..] - # $Tag_ref [ [0] [1] ..] - # $Content_ref [ [0] [1] [2] [3] [4] [5] [6] ..] - - my $Content_ref = $$Tag_ref[1]; - - # '$start' contains: elements with the index 1, 3, 5 ...(and so on) - # '$end' contains: elements with the index 2, 4, 6 ...(and so on) - my $start = (2 * $i) + 1; - my $end = $start + 1; - - my @Content = @$Content_ref[$start..$end]; - - return \@Content; -} - -######################################################################################## -# sub: getAttribute -# gets: $Tag_ref, $AttributeName -# optional: - -# returns: $Attribute -# description: finds and returns an attribute as a string -######################################################################################## -sub getAttribute -{ - my $Tag_ref = shift; - my $AttributeName = shift; - - # [ "tag1", [ { attribute1 = "..", attribute2 = ".." } , "tag2"... ] ] - # Tag_ref [ [0] [1] ] ] - # [ [0]->'attribute1' , [0]->'attribute2' , [1] ... ] ] - - # get the scalar of the value of the 'AttributeName' in the anonymous hash - my $Attribute = $Tag_ref->[1]->[0]->{$AttributeName}; - - return $Attribute; -} - -######################################################################################## -# sub: getAttributeRef -# gets: $Tag_ref -# optional: - -# returns: $Attribute_ref -# description: finds and returns the reference of the hash which contains the attributes -######################################################################################## -sub getAttributesRef -{ - my $Tag_ref = shift; - - # [ "tag1", [ { attribute1 = "..", attribute2 = ".." } , "tag2"... ] ] - # Tag_ref [ [0] [1] ] ] - # [ [0] , [1] ] ] - - # get the reference of the anonymous hash - my $Attribute_ref = $Tag_ref->[1]->[0]; - - return $Attribute_ref; -} - -######################################################################################## -# sub: getContentCount -# gets: $Tag_ref -# optional: - -# returns: $IndexValue -# description: returns the sum of elements pairs of the array (less the anonymous hash) -######################################################################################## -sub getContentCount -{ - my $Tag_ref = shift; - - # get the content array (address of the inner array) - my $Content_ref = $$Tag_ref[1]; - - # get the number of the element pairs of the array (without the anonymous hash) - my $IndexValue = scalar(@$Content_ref); - $IndexValue = ($IndexValue-1)/2; - - return $IndexValue; -} - -######################################################################################## -# sub: getIterationData -# gets: $TagName -# optional: - -# returns: $IndexValue, $TagDepend_ref -# description: gets a tag name and returns the sum of elements pairs of the array -# (less the anonymous hash) and the reference of the anonymous array -######################################################################################## -sub getIterationData -{ - my $self = shift; - my $TagName = shift; - - my $ModuleData_ref = $$self{"ModuleData"}; - - my $TagDepend_ref = searchTag($TagName, $ModuleData_ref); - my $IndexValue = getContentCount($TagDepend_ref); - - return ($IndexValue, $TagDepend_ref); -} - -######################################################################################## -# sub: printErrorMessage -# gets: $BuildReqPlatforms or $Platforms or $Products -# optional: - -# returns: - -# description: it's an error, if a platform or a product content (e.g.'so oo') -# has at least one valid value and also the value 'all', -# because 'all' includes all other possible values -######################################################################################## -sub printErrorMessage -{ - my $self = shift; - my $Content = shift; - - my $ModuleData_ref = $$self{"ModuleData"}; - - my $Module_ref = searchTag("module-name", $ModuleData_ref); - my $ModuleContent_ref = getContent($Module_ref, 0); - my $Module = @$ModuleContent_ref[1]; - - print"Error in module <$Module> in Content <$Content>!\n"; - print"The value 'all' includes all currently existing valid values.\n\n"; -} - -######################################################################################## -# sub: adjustRedundancy -# gets: $Task_ref, $JobPlatform, $BuildReq_ref -# optional: - -# returns: - -# description: the tag <task> (it means 'job') should be created with no redundant infos, -# like: <task dir="/uno" platform="unx"> ... -# <task dir="/uno" platform="wnt"> ... -# <build-requirement name="test10" platform="wnt"> -# -# it should be: <task dir="/uno" platform="unx wnt"> -# <build-requirement name="test10" platform="wnt"> -######################################################################################## -sub adjustRedundancy -{ - my $Task_ref = shift; - my $JobPlatform = shift; - my $BuildReq_ref = shift; - - my %sortedJobPlatforms = (); - my @JobPlatforms = (); - my $PlatformContent = ""; - - # get the 'task platforms' in one content - my $Attributes_ref = getAttributesRef($Task_ref); - - # get the existing 'task platform' - my $existingPlatform = getAttribute($Task_ref, "platform"); - $existingPlatform = "all" if (!($existingPlatform)); - - if ( ($existingPlatform ne "all") && ($JobPlatform ne "all") ) - { - # get the sorted platform content - $sortedJobPlatforms{$JobPlatform} = ""; - $sortedJobPlatforms{$existingPlatform} = ""; - - @JobPlatforms = sort keys %sortedJobPlatforms; - - $PlatformContent = join " ", @JobPlatforms; - - $$Attributes_ref{"platform"} = $PlatformContent; - } - elsif ( ($existingPlatform ne "all") && ($JobPlatform eq "all") ) - { - delete $$Attributes_ref{"platform"}; - } - - if ($BuildReq_ref) - { - my $JobType_ref = getContent($Task_ref, 0); - - # if it exists add the 'build requirements' at the - # previous(with the same directory as the current) <task> tag - addBuildReq($JobType_ref, $BuildReq_ref); - } -} - -######################################################################################## -# sub: addBuildReq -# gets: $JobTypeInfos_ref, $BuildReq_ref -# optional: - -# returns: - -# description: add the 'build requirements' to the existing data structure -# case 1: if the 'job directory' is not redundant -# case 2: if it is redundant create it to the first existing 'job' -######################################################################################## -sub addBuildReq -{ - my $JobTypeInfos_ref = shift; - my $BuildReq_ref = shift; - - my @sortedBuildReqPlatforms = (); - - foreach my $BuildReqName (sort keys %$BuildReq_ref) - { - my $BuildReqPlatforms = $$BuildReq_ref{$BuildReqName}; - - $BuildReqPlatforms = "all" if (!($BuildReqPlatforms)); - - my $Attributes_ref = {"name" => "$BuildReqName"}; - - # it's wrong, if in a platform content(e.g. "unx wnt") are at least - # one or more platform(s) and within a 'all' term, - # because 'all' is default and means it includes all other possible values! - if ( ($BuildReqPlatforms ne "all") && ($BuildReqPlatforms =~ /\ball\b/) ) - { - printErrorMessage($BuildReqPlatforms); - } - elsif (!($BuildReqPlatforms =~ /\ball\b/)) - { - @sortedBuildReqPlatforms = sort(split(/\s+/, $BuildReqPlatforms)); - $BuildReqPlatforms = join " ", @sortedBuildReqPlatforms; - - $$Attributes_ref{"platform"} = "$BuildReqPlatforms"; - } - - # create the tag <build-requirement> - my $BuildReqInfos_ref = createTag("build-requirement", $Attributes_ref); - - # append the <build-requirement> tag to the <'$JobType'> tag - addContent($JobTypeInfos_ref, $BuildReqInfos_ref); - } -} - -######################################################################################## -# sub: checkJobRedundancy -# gets: $Task_ref, $JobType, $DependingDirs_ref, $JobPlatform, $BuildReq_ref -# optional: - -# returns: $LineIsRedundant -# description: checks whether the values of the 'job' line are redundant, like: -# 'job dir', 'job'(e.g.: make) and 'depending dirs' -######################################################################################## -sub checkJobRedundancy -{ - my $Task_ref = shift; - my $JobType = shift; - my $DependingDirs_ref = shift; - my $JobPlatform = shift; - my $BuildReq_ref = shift; - - my $LineIsRedundant = 0; - - - # get the ref of the existing 'depending directories' - # if they also equal with the current 'depending directories', - # make one tag instead of two, which differences only in the platform - # (and the 'build requirement', if it exists) - my $JobType_ref = getContent($Task_ref, 0); - my $JobName = getTagName($JobType_ref); - - # get the existing 'task platform' - my $existingPlatform = getAttribute($Task_ref, "platform"); - - # are the jobs equal? - if ($JobType eq $JobName) - { - my @existingDepDirs = (); - - my $IndexEnd = getContentCount($JobType_ref); - - # get all existing 'depending dirs' of this redundant 'job' - for (my $j = 0; $j < $IndexEnd; $j++) - { - my $Content_ref = getContent($JobType_ref, $j); - - my $TagName = getTagName($Content_ref); - - # create an array of the 'depending directories' - if ($TagName eq "depend") - { - my $DepDir = getAttribute($Content_ref, "depend"); - - push(@existingDepDirs, $DepDir); - } - } - - # if now the current 'depending dirs' equal with the existing, - # we know that is redundant and have to create only one instead - # of two tags, e.g. - # before: <task dir="/uno" platform="unx">... - # <task dir="/uno" platform="wnt"> ... - # <build-requirement name="test10" platform="wnt"> - # - # it should be: <task dir="/uno" platform="unx wnt"> - # <build-requirement name="test10" platform="wnt"> - if (@$DependingDirs_ref eq @existingDepDirs) - { - $LineIsRedundant = 1; - - # check redundant directories and create no redundant 'task dirs' - adjustRedundancy($Task_ref, $JobPlatform, $BuildReq_ref); - } - } - - return $LineIsRedundant; -} - -######################################################################################## -# sub: existsTag -# gets: $TagName -# optional: - -# returns: $TagExists_ref -# description: checks whether that a tag exists and returns the ref of the content -######################################################################################## -sub existsTag -{ - my $self = shift; - my $TagName = shift; - - my $TagExists_ref = undef; - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <module-depend> tag exists - $TagExists_ref = searchTag($TagName, $ModuleData_ref); - - return $TagExists_ref; -} - -######################################################################################## -# API - (internal) 'set/add' methods # -######################################################################################## - -######################################################################################## -# sub: setModuleName -# gets: $ModuleName -# optional: - -# returns: - -# description: gets the name of the current module and set it at the right position -# in the data structure -######################################################################################## -sub setModuleName -{ - my $self = shift; - my $ModuleName = shift; - - my $ModuleData_ref = $$self{"ModuleData"}; - - my $Tag_ref = createTag("module-name", {}); - my $TagText_ref = createText($ModuleName); - - addContent($Tag_ref, $TagText_ref); - - addContent($ModuleData_ref, $Tag_ref); -} - -######################################################################################## -# sub: addModuleDependencies -# gets: $ModuleName, $DependencyType, $Products -# optional: $Products(default: 'all' -> includes currently 'so' and 'oo') -# but the default should not set in the data structure, -# it's only a 'Document Type Definition' based term -# returns: - -# description: add the module dependencies and their attributes into the data structure -######################################################################################## -sub addModuleDependencies -{ - my $self = shift; - my $ModuleName = shift; - my $DependencyType = shift; - my $Products = shift || "all"; - - my $ModuleData_ref = $$self{"ModuleData"}; - - my @sortedProducts = (); - - # change all possible upper cases to lower cases - $Products =~ s/($Products)/\L$Products/; - - # before we add the module dependencies, we have to prove that the <module-depend> tag was set - # because this tag must be set once before the module dependency tags begin - my $ModuleDepend_ref = searchTag("module-depend", $ModuleData_ref); - - # if it doesn't exist, create this tag '<module-depend>' - if (!($ModuleDepend_ref)) - { - $ModuleDepend_ref = createTag("module-depend", {}); - - # add it to the global data structure - addContent($ModuleData_ref, $ModuleDepend_ref); - } - - my $Attributes_ref = {"module" => "$ModuleName"}; - - # it's wrong, if in a product content(e.g. "so") are at least - # one or more product(s) and within a 'all' term, - # because 'all' is default and means it includes all other possible values! - if ( ($Products ne "all") && ($Products =~ /\ball\b/) ) - { - printErrorMessage($Products); - } - elsif (!($Products =~ /\ball\b/)) - { - @sortedProducts = sort(split(/\s+/ ,$Products)); - $Products = join " ", @sortedProducts; - - $$Attributes_ref{"product"} = "$Products"; - } - - my $ModuleDependenciesInfos_ref = createTag("$DependencyType", $Attributes_ref); - - my $currentKey = createSortKey($DependencyType, $ModuleName); - - # search and get the position in which we have to insert the current 'module depend name' - # at first get the current 'module depend name' - my $currentName = getAttribute($ModuleDependenciesInfos_ref, "module"); - - # get the information about the number of 'Contents'(= elements) of the array - my $ContentCount = getContentCount($ModuleDepend_ref); - - # we have to sort the serie of the 'name' contents, - # therefore we need a 'Pos'(position) of the array in which we want to sort in the 'name' content - my $Pos = 0; - - # and we need a control variable 'isInsert' - # that we won't add the 'name' and the content more than one time - my $isInsert = 0; - - for (my $i = 0; $i < $ContentCount; $i++) - { - # get each 'Content' of the array = ('task', ARRAY(...)) - my $Content_ref = getContent($ModuleDepend_ref, $i); - my $TagName = getTagName($Content_ref); - - # get the existing 'task dir' to compare it with the current 'task dir' - my $existingName = getAttribute($Content_ref, "module"); - - my $existingKey = createSortKey(getTagName($Content_ref), $existingName); - - # compare both dirs... - # only if the 'current dir' is lower than a 'existing dir' - # insert it in the data structure - if ($currentKey lt $existingKey) - { - $Pos = $i; - - insertContent($ModuleDepend_ref, $ModuleDependenciesInfos_ref, $Pos); - - $isInsert = 1; - - last; - } - } - # only if the 'current name' is greater (or equal) than the other 'existing names' - # insert it at the end of the data structure - addContent($ModuleDepend_ref, $ModuleDependenciesInfos_ref) if ($isInsert == 0); -} - -######################################################################################## -# sub: addJob -# gets: $Dir, $JobType, $JobPlatform, $DependingDirs_ref, $BuildReq_ref, -# $JobPlatform, $DependingDirs_ref, $BuildReq_ref -# optional: $JobPlatform(default: 'all' -> includes all other possible values), -# $DependingDirs_ref, $BuildReq_ref -# returns: - -# description: add the infos about a job from the old build lists(by ascii parser) and -# sort it in the data structure -######################################################################################## -sub addJob -{ - my $self = shift; - my $Dir = shift; - my $JobType = shift; - my $JobPlatform = shift || "all"; - my $DependingDirs_ref = shift; - my $BuildReq_ref = shift; - - my $ModuleData_ref = $$self{"ModuleData"}; - - # before we add the "build" tag, we have to prove that the <build> tag was set - # because this tag must be set once before the job tag(s) follows - my $buildTag_ref = searchTag("build", $ModuleData_ref); - - # if it doesn't exist, create the tag '<build>' - if (!($buildTag_ref)) - { - # If the tag wasn't found, create it - $buildTag_ref = createTag("build", {}); - - # add it to the global data structure - addContent($ModuleData_ref, $buildTag_ref); - } - - my $Attributes_ref = {"dir" => "$Dir"}; - - # it's wrong, if a 'job platform' content(e.g. "unx wnt") has at least - # one or more 'job platform(s)' and an 'all' term, - # because 'all' is default and means it includes all other possible values - if ( ($JobPlatform ne "all") && ($JobPlatform =~ /\ball\b/) ) - { - printErrorMessage($JobPlatform); - } - elsif (!($JobPlatform =~ /\ball\b/)) - { - my @sortedPlatforms = sort(split /\s+/, $JobPlatform); - $JobPlatform = join " ", @sortedPlatforms; - - $$Attributes_ref{"platform"} = "$JobPlatform"; - } - - # create the tags: <task>, <make> and (if it exists)... - # <depend> and/or <build-requirement> - my $taskInfos_ref = createTag("task", $Attributes_ref); - - # search and get the position in which we have to insert the current task - # at first get the current 'task directory' - my $currentDir = getAttribute($taskInfos_ref, "dir"); - - # get the information about the number of 'Contents'(= elements) of the array - my $IndexValue = getContentCount($buildTag_ref); - - # we have to sort the serie of the 'task contents', - # therefore we need a '$pos'(position) of the array in which we want to sort in the 'task content' - my $Pos = 0; - - # and we need a control variable 'isInsert' - # that we won't add the 'task content' more than one time - my $isInsert = 0; - - # control variable for the redundancy check - my $LineIsRedundant = 0; - - # go in the array of the corresponding <build> tag element - for (my $i = 0; $i < $IndexValue; $i++) - { - # get each content of the <build> tag => ('task1', ARRAY1(...), task2...) - my $Task_ref = getContent($buildTag_ref, $i); - - # get the existing 'task dir' to compare it with the current 'task dir' - my $existingDir = getAttribute($Task_ref, "dir"); - - # is the 'job dir' redundant? - if ($currentDir eq $existingDir) - { - $LineIsRedundant = checkJobRedundancy($Task_ref, $JobType, $DependingDirs_ref, $JobPlatform, $BuildReq_ref); - } - - # if it's not a redundant line, compare both dirs: - # only if the 'current dir' is lower than an 'existing dir' - # insert it in the data structure - if ( ($LineIsRedundant == 0) && ($currentDir lt $existingDir) ) - { - $Pos = $i; - - insertContent($buildTag_ref, $taskInfos_ref, $Pos); - - $isInsert = 1; - - last; - } - } - - # only if the 'current dir' is greater (or equal) than the other 'existing dirs' - # and it is not redundant insert it at the end of the data structure - if ( ($isInsert == 0) && ($LineIsRedundant == 0) ) - { - addContent($buildTag_ref, $taskInfos_ref); - } - - if ($LineIsRedundant == 0) - { - # create the <'$JobType'> tag - my $JobTypeInfos_ref = createTag($JobType, {}); - - # append the <'$JobType'> tag to the <task> tag - addContent($taskInfos_ref, $JobTypeInfos_ref); - - # before we add the "depend" infos - # we have to get the alphabetical sorted 'Depending Directories' - @$DependingDirs_ref = sort(@$DependingDirs_ref) if ($DependingDirs_ref); - - foreach my $DependDir (@$DependingDirs_ref) - { - my $DependInfos_ref = createTag("depend", {"dir" => "$DependDir"}); - - # append the <depend> tag to the <'$JobType'> tag - addContent($JobTypeInfos_ref, $DependInfos_ref); - } - - # if a 'build requirement' exists, create the tag <build-requirement> - if ($BuildReq_ref) - { - addBuildReq($JobTypeInfos_ref, $BuildReq_ref); - } - } -} - -######################################################################################## -# end of (internal) 'set/add' methods # -######################################################################################## - - -######################################################################################## -# API - (external) 'get' methods # -######################################################################################## - -######################################################################################## -# sub: getModuleDependencies -# gets: $Product, $DependencyType -# optional: $Product(default: 'all', means all currently used valid values), -# $DependencyType(default: 'md-simple', 'md-always' and 'md-force') -# returns: @ModuleDependencies -# description: gets a ref of an array (with the products) and creates and -# returns an array with the sorted depending modules -######################################################################################## -sub getModuleName { - my $self = shift; - if ($self->existsTag("module-name")) { - my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-name"); - return $$ModuleDepend_ref[1][2]; - }; - return ""; - -}; -sub getModuleDependencies -{ - my $self = shift; - my $Products_ref = shift; - my $DependencyType = shift || "all"; - - push(@$Products_ref, "all") if (!scalar @$Products_ref); - - my $Product = ""; - my %tempModuleDeps = (); - my @ModuleDependencies = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <module-depend> tag exists - if ($self->existsTag("module-depend")) - { - # change all possible upper cases to lower cases - $DependencyType =~ s/($DependencyType)/\L$DependencyType/ if ($DependencyType ne "all"); - - foreach $Product (@$Products_ref) - { - # change all possible upper cases to lower cases - $Product =~ s/($Product)/\L$Product/; - - my $ProductContent = undef; - my $ModuleDependencyName = ""; - - # get the number of elements and the ref of the <module-depend> tag - my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - my $Content_ref = getContent($ModuleDepend_ref, $i); - - my $ModuleDependencyName = getAttribute($Content_ref, "module"); - - # get the name of each existing tag - my $TagName = getTagName($Content_ref); - - $ProductContent = getAttribute($Content_ref, "product"); - - # if the attribute 'product' wasn't set in the internal data structure, - # it means the default of 'all' is valid and includes all other possible values - $ProductContent = "all" if (!($ProductContent)); - - if ($Product ne "all") - { - if ($DependencyType ne "all") - { - # if the caller wants all (e.g.)'so' product based dependency types, - # we must get the 'so' and the 'all' matching products - # because 'all' matches also the product 'so' - if ( ($DependencyType eq $TagName) && - ((($ProductContent eq "all") || $ProductContent =~ /\b($Product)\b/)) ) - { - $tempModuleDeps{$ModuleDependencyName} = ""; - - print"ModuleDeps (Product != 'all' && DepType != 'all') = <$ModuleDependencyName>\n" if ($Debug); - } - } - # we get from the caller only the 'product' parameter, - # 'dependency type' is now 'all'(default) and includes all possible values - elsif ( ($ProductContent =~ /\b($Product)\b/) || ($ProductContent eq "all") ) - { - $tempModuleDeps{$ModuleDependencyName} = ""; - - print"ModuleDeps (Product != 'all' && DepType = 'all') = <$ModuleDependencyName>\n" if ($Debug); - } - } - # now the product is 'all' and we only need to check the 'dependency type' - elsif ($DependencyType ne "all") - { - if ($DependencyType eq $TagName) - { - $tempModuleDeps{$ModuleDependencyName} = ""; - - print"ModuleDeps (Product = 'all' && DepType != 'all') = <$ModuleDependencyName>\n" if ($Debug); - } - } - else - { - $tempModuleDeps{$ModuleDependencyName} = ""; - - print"ModuleDeps (Product = 'all' && DepType = 'all') = <$ModuleDependencyName>\n" if ($Debug); - } - } - } - - @ModuleDependencies = sort keys %tempModuleDeps; - } - - print"ModuleDependencies = <@ModuleDependencies>\n" if ($Debug); - - return @ModuleDependencies; -} - -######################################################################################## -# sub: getModuleDepType -# gets: $DepModuleName -# optional: - -# returns: $DependencyType -# description: gets a module name and returns the dependency type of it -######################################################################################## -sub getModuleDepType -{ - my $self = shift; - my $DepModuleName = shift; - - my $DependencyType = ""; - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <module-depend> tag exists - if ($self->existsTag("module-depend")) - { - # change all possible upper cases to lower cases - $DepModuleName =~ s/($DepModuleName)/\L$DepModuleName/; - - my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - my $Content_ref = getContent($ModuleDepend_ref, $i); - my $existingModuleName = getAttribute($Content_ref, "module"); - - if ($DepModuleName eq $existingModuleName) - { - $DependencyType = getTagName($Content_ref); - last; - } - } - } - - print"DependencyType = <$DependencyType>\n" if ($Debug); - - return $DependencyType; -} - -######################################################################################## -# sub: getModuleProducts -# gets: $DepModuleName -# optional: - -# returns: @ModuleProducts -# description: gets a module name and returns the associated products -######################################################################################## -sub getModuleProducts -{ - my $self = shift; - my $DepModuleName = shift; - - my @ModuleProducts = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <module-depend> tag exists - if ($self->existsTag("module-depend")) - { - # change all possible upper cases to lower cases - $DepModuleName =~ s/($DepModuleName)/\L$DepModuleName/; - - my $ProductContent = undef; - - my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - my $Content_ref = getContent($ModuleDepend_ref, $i); - - my $existingModuleName = getAttribute($Content_ref, "module"); - - # if the attribute 'product' wasn't set in the internal data structure, - # it means the default of 'all' is valid and includes all other possible values - $ProductContent = getAttribute($Content_ref, "product"); - - if ($DepModuleName eq $existingModuleName) - { - $ProductContent = "all" if (!($ProductContent)); - - @ModuleProducts = split /\s+/, $ProductContent; - - last; - } - } - } - - print"Products = <@ModuleProducts>\n" if ($Debug); - - return @ModuleProducts; -} - -######################################################################################## -# sub: getProducts -# gets: - -# optional: - -# returns: @ModuleProducts -# description: returns the products of the whole depending modules -# each found product name may occurs only once in the module products array -######################################################################################## -sub getProducts -{ - my $self = shift; - my $ProductContent = undef; - my @tempProducts = (); - my @ModuleProducts = (); - my %Products = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <module-depend> tag exists - if ($self->existsTag("module-depend")) - { - my ($IndexValue, $ModuleDepend_ref) = $self->getIterationData("module-depend"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - my $Content_ref = getContent($ModuleDepend_ref, $i); - - $ProductContent = getAttribute($Content_ref, "product"); - - # if the attribute 'product' wasn't set in the internal data structure, - # it means the default of 'all' is valid and includes all other possible values - # but here we need only all 'not-all' values! - if (!($ProductContent)) - { - $ProductContent=""; - } - else - { - # here are the products of the current depending module - @tempProducts = split /\s+/, $ProductContent; - - foreach my $Product (@tempProducts) - { - $Products{$Product} = ""; - } - } - } - - # fill the sorted 'module products' in the array - @ModuleProducts = sort keys %Products; - } - - print"All ModuleProducts = <@ModuleProducts>\n" if ($Debug); - - return @ModuleProducts; -} - -######################################################################################## -# sub: getJobDirectories -# gets: $JobType, $JobPlatform -# optional: $JobType, $JobPlatform(default: 'all' -> includes all possible values) -# returns: @JobDirectories -# description: creates and returns an array with the sorted directories, which -# fulfil the expected values of the job type and the job platform -######################################################################################## -sub getJobDirectories -{ - my $self = shift; - my $JobType = shift; - my $JobPlatform = shift || "all"; - - my @JobDirectories = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <build> tag exists - if ($self->existsTag("build")) - { - # change all possible upper cases to lower cases - $JobType =~ s/($JobType)/\L$JobType/ if ($JobType); - $JobPlatform =~ s/($JobPlatform)/\L$JobPlatform/ if ($JobPlatform ne "all"); - - my $PlatformContent = undef; - my %tempJobDirectories = (); - - # get the ref of the <build> tag - my ($IndexValue, $Build_ref) = $self->getIterationData("build"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - my $Content_ref = getContent($Build_ref, $i); - - my $PlatformContent = getAttribute($Content_ref, "platform"); - my $existingDir = getAttribute($Content_ref, "dir"); - - # three cases are possible... - if ($JobType) - { - my $JobType_ref = getContent($Content_ref, 0); - my $existingJobType = getTagName($JobType_ref); - - # if the attribute 'job platform' wasn't set in the internal data structure, - # it means the default of 'all' is valid and includes all other possible values - $PlatformContent = "all" if (!($PlatformContent)); - - # first case: we get from the caller the parameters 'job type' and 'job platform' - if ($JobPlatform ne "all") - { - # if the caller wants all e.g.'wnt' job platform based directories, - # we have to get the 'wnt' or the 'all' matching platform - # because 'all' includes also 'wnt' - if ( ($JobType eq $existingJobType) && - (($PlatformContent =~ /\b($JobPlatform)\b/) || ($PlatformContent eq "all")) ) - { - $tempJobDirectories{$existingDir} = ""; - } - } - # second case: we get from the caller only the 'job type' parameter - # 'job platform' is now 'all'(default) and includes all possible values - elsif ($JobType eq $existingJobType) - { - $tempJobDirectories{$existingDir} = ""; - } - } - # third case: we get from the caller no parameter; now we take each existing 'job directory', - # no matter which 'job type' and 'job platform' it has - else - { - $tempJobDirectories{$existingDir} = ""; - } - } - - # sort each unique 'job directory' alphabetical - @JobDirectories = sort keys %tempJobDirectories; - } - print"JobDirectories = <@JobDirectories>\n" if ($Debug); - - return @JobDirectories; -} - -######################################################################################## -# sub: getDirDependencies -# gets: $Dir, $JobType, $JobPlatform -# optional: $JobPlatform(default: 'all' -> includes all possible values) -# returns: @JobDependencies -# description: creates and returns an array with the sorted depending directories -######################################################################################## -sub getDirDependencies -{ - my $self = shift; - my $Dir = shift; - my $JobType = shift; - my $JobPlatform = shift || "all"; - - my @JobDependencies = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <build> tag exists - if ($self->existsTag("build")) - { - # change all possible upper cases to lower cases - $JobType =~ s/($JobType)/\L$JobType/; - $JobPlatform =~ s/($JobPlatform)/\L$JobPlatform/ if ($JobPlatform ne "all"); - - my $PlatformContent = undef; - my %tempJobDependencies = (); - - # first we need a reference of the higher level tag <build> - my ($IndexValue, $Build_ref) = $self->getIterationData("build"); - - # get all 'job directories' with the matching values of the 'job type' and the 'job platform' - my @tempDepDirs = (); - @tempDepDirs = $self->getJobDirectories($JobType, $JobPlatform); - - # get each content of the <build> tag - for (my $i = 0; $i < $IndexValue; $i++) - { - # get the ref of the content of the <build> tag - my $Task_ref = getContent($Build_ref, $i); - - # get both attributes: 'job dir' and 'job platform' - my $existingDir = getAttribute($Task_ref, "dir"); - my $PlatformContent = getAttribute($Task_ref, "platform"); - - # if the attribute 'job platform' wasn't set in the internal data structure, - # it means the default of 'all' is valid and includes all other possible values - $PlatformContent = "all" if (!($PlatformContent)); - - # get the 'job type' ref which is inside the <task> tag on position '0' - my $JobType_ref = getContent($Task_ref, 0); - - my $existingJobType = getTagName($JobType_ref); - - if ( ($Dir eq $existingDir) && ($JobType eq $existingJobType) ) - { - # each 'job type' can have several 'depends' and 'build requirements' - # here we get the number of the including elements - my $IndexEnd = getContentCount($JobType_ref); - - for (my $j = 0; $j < $IndexEnd; $j++) - { - # create a ref of the existing content - my $Content_ref = getContent($JobType_ref, $j); - - # the content_ref can be 'depend' or 'build requirement' - # but we only need the 'depend' informations - next if (getTagName($Content_ref) ne "depend"); - - # get the 'depend dir' - my $DependDir = getAttribute($Content_ref, "dir"); - - # look in the list of all existing 'job directories' - foreach my $DepDir (@tempDepDirs) - { - # get it, if one of these 'job dirs' is equal with one of the 'depending dirs' - if ($DepDir eq $DependDir) - { - # get all unique values only once - $tempJobDependencies{$DepDir} = ""; - } - } - } - } - } - - # get the unique sorted values in the array - @JobDependencies = sort keys %tempJobDependencies; - } - - print"Depending Dirs = <@JobDependencies>\n" if ($Debug); - - return @JobDependencies; -} - -######################################################################################## -# sub: getJobTypes -# gets: $Dir -# optional: - -# returns: @JobTypes -# description: creates and returns an array with the sorted 'job types' -######################################################################################## -sub getJobTypes -{ - my $self = shift; - my $Dir = shift; - - my @JobTypes = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <build> tag exists - if ($self->existsTag("build")) - { - # it's for creating unique 'job types' which exists only once in the (later) array - my %tempJobTypes = (); - - # first we need a reference of the higher level tag <build> - my ($IndexValue, $Build_ref) = $self->getIterationData("build"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - # get the ref of the <build> tag - my $Task_ref = getContent($Build_ref, $i); - my $existingDir = getAttribute($Task_ref, "dir"); - - # we only need the 'task(s)' with the matching dir - next if ($Dir ne $existingDir); - - # get the ref of the <task> tag at the position '0' - my $JobType_ref = getContent($Task_ref, 0); - my $JobType = getTagName($JobType_ref); - - # get the 'job type' as a key in the hash - # so we can guarantee that each 'job type' stays unique! - $tempJobTypes{$JobType} = ""; - } - - # fill the unique sorted 'job types' in the array - @JobTypes = sort keys %tempJobTypes; - } - - print"JobTypes = <@JobTypes>\n" if ($Debug); - - return @JobTypes; -} - -######################################################################################## -# sub: getJobBuildReqs -# gets: $Dir, $BuildReqPlatform -# optional: $BuildReqPlatform(default: 'all' -> includes all possible values) -# returns: @JobBuildRequirements -# description: creates and returns an array with the sorted 'job build requirements' -######################################################################################## -sub getJobBuildReqs -{ - my $self = shift; - my $Dir = shift; - my $BuildReqPlatform = shift || "all"; - - my @JobBuildRequirements = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <build> tag exists - if ($self->existsTag("build")) - { - # change all possible upper cases to lower cases - $BuildReqPlatform =~ s/($BuildReqPlatform)/\L$BuildReqPlatform/ if ($BuildReqPlatform ne "all"); - - my $BuildReqPlatformContent = undef; - my %tempJobBuildRequirements = (); - - # first we need a reference of the higher level tag <build> - my ($IndexValue, $Build_ref) = $self->getIterationData("build"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - # get the ref to the content of the array of the <build> tag - my $Task_ref = getContent($Build_ref, $i); - - # get the attribute 'task dir' - my $existingDir = getAttribute($Task_ref, "dir"); - - # get the 'job type' ref which is inside the <task> tag - my $JobType_ref = getContent($Task_ref, 0); - - # each 'job type' can have several 'depends' and 'build requirements' - # here we get the number of the included elements - my $IndexEnd = getContentCount($JobType_ref); - - for (my $j = 0; $j < $IndexEnd; $j++) - { - # create a ref of the existing content - my $Content_ref = getContent($JobType_ref, $j); - - # the content_ref can be 'build requirement' or 'depend' - # but we need only the 'build requirement' informations - next if (getTagName($Content_ref) ne "build-requirement"); - - my $BuildReqName = getAttribute($Content_ref, "name"); - $BuildReqPlatformContent = getAttribute($Content_ref, "platform"); - - $BuildReqPlatformContent = "all" if (!($BuildReqPlatformContent)); - - if ($BuildReqPlatform ne "all") - { - # compare the parameters: 'dir' and 'platform' - # other values('wnt', 'unx' and 'mac') for 'platform' - # including the value 'all' in the existing 'platform' list - # get each 'build requirement name' only once (unique) - if ( ($Dir eq $existingDir) && - (($BuildReqPlatformContent =~ /\b($BuildReqPlatform)\b/) || ($BuildReqPlatformContent =~ /\ball\b/)) ) - { - $tempJobBuildRequirements{$BuildReqName} = ""; - - print"JobBuildRequirements (if) = <$BuildReqName>\n" if ($Debug); - } - } - # if the 'build requirement platform' was not allocated, it is "all" (default) - # now we only need to compare the directories - elsif ($Dir eq $existingDir) - { - $tempJobBuildRequirements{$BuildReqName} = ""; - - print"JobBuildRequirements (elsif) = <$BuildReqName>\n" if ($Debug); - } - } - } - - # fill the unique sorted 'build requirement names' in the array - @JobBuildRequirements = sort keys %tempJobBuildRequirements; - } - - print"JobBuildRequirements = <@JobBuildRequirements>\n" if ($Debug); - - return @JobBuildRequirements; -} - -######################################################################################## -# sub: getJobBuildReqPlatforms -# gets: $Dir, $BuildReqName -# optional: - -# returns: @JobBuildReqPlatforms -# description: creates and returns an array with -# the sorted 'job build requirement platforms' -######################################################################################## -sub getJobBuildReqPlatforms -{ - my $self = shift; - my $Dir = shift; - my $JobBuildReqName = shift; - - my @JobBuildReqPlatforms = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <build> tag exists - if ($self->existsTag("build")) - { - # change all possible upper cases to lower cases - $JobBuildReqName =~ s/($JobBuildReqName)/\L$JobBuildReqName/; - - my $BuildReqPlatformContent = undef; - my @tempPlatforms = (); - my %tempJobBuildReqPlatforms = (); - - # first we need a reference of the higher level tag <build> - my ($IndexValue, $Build_ref) = $self->getIterationData("build"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - # get the ref to the content of the array of the <build> tag - my $Task_ref = getContent($Build_ref, $i); - - # get the attribute 'task dir' - my $existingDir = getAttribute($Task_ref, "dir"); - - # get the 'job type' ref which is inside the <task> tag - my $JobType_ref = getContent($Task_ref, 0); - - # each 'job type' can have several 'depends' and 'build requirements' - # here we get the number of the included elements - my $IndexEnd = getContentCount($JobType_ref); - - for (my $j = 0; $j < $IndexEnd; $j++) - { - # create a ref of the existing content - my $Content_ref = getContent($JobType_ref, $j); - - # the content_ref can be 'build requirement' or 'depend' - # but we need only the 'build requirement' informations - next if (getTagName($Content_ref) ne "build-requirement"); - - my $existingJobBuildReqName = getAttribute($Content_ref, "name"); - $BuildReqPlatformContent = getAttribute($Content_ref, "platform"); - - $BuildReqPlatformContent = "all" if (!($BuildReqPlatformContent)); - - if ( ($Dir eq $existingDir) && ($JobBuildReqName eq $existingJobBuildReqName) ) - { - # here are the platforms of the current 'build requirement' - @tempPlatforms = split /\s+/, $BuildReqPlatformContent; - - foreach my $BuildReqPlatform (@tempPlatforms) - { - $tempJobBuildReqPlatforms{$BuildReqPlatform} = ""; - } ######### - } - } - } - - # fill the unique sorted 'build requirement platforms' in the array - @JobBuildReqPlatforms = sort keys %tempJobBuildReqPlatforms; - } - - print"JobBuildReqPlatforms = <@JobBuildReqPlatforms>\n" if ($Debug); - - return @JobBuildReqPlatforms; -} - -######################################################################################## -# sub: getJobPlatforms -# gets: $Dir -# optional: - -# returns: @JobPlatforms -# description: creates and returns an array with the sorted depending 'job platforms' -######################################################################################## -sub getJobPlatforms -{ - my $self = shift; - my $Dir = shift; - - my @JobPlatforms = (); - - my $ModuleData_ref = $$self{"ModuleData"}; - - # check whether that the <build> tag exists - if ($self->existsTag("build")) - { - my $PlatformContent = undef; - my %tempJobPlatforms = (); - - # control variable: if a value 'all' exists in the platform content - # it doesn't matter which platforms are also existing, - # because 'all' includes all possible values! - my $allExists = 0; - - # first we need a reference of the higher level tag <build> - my ($IndexValue, $Build_ref) = $self->getIterationData("build"); - - for (my $i = 0; $i < $IndexValue; $i++) - { - my $Task_ref = getContent($Build_ref, $i); - - # get the attributes of the <task> tag - my $existingTaskDir = getAttribute($Task_ref, "dir"); - $PlatformContent = getAttribute($Task_ref, "platform"); - - # if it is not set in the data structure, - # it has automatically the default value 'all' - $PlatformContent = "all" if (!($PlatformContent)); - - if ($Dir eq $existingTaskDir) - { - # if a platform value 'all' exists, we remember it - # and don't look further after other platforms - if ($PlatformContent =~ /\ball\b/) - { - $allExists = 1; - - @JobPlatforms = "all"; - - last; - } - - my @tempPlatforms = (); - - push(@tempPlatforms, split(/\s+/, $PlatformContent)); - - foreach my $Platform (@tempPlatforms) - { - $tempJobPlatforms{$Platform} = ""; - } - } - } - - # fill the unique sorted 'job platforms' in the array, - # but only if the content "all" is not present in the platform content - @JobPlatforms = sort keys %tempJobPlatforms if ($allExists == 0); - } - - print"JobPlatforms = <@JobPlatforms>\n" if ($Debug); - - return @JobPlatforms; -} - -######################################################################################## -# end of 'get' methods # -######################################################################################## - -1 ; diff --git a/soldep/bootstrp/XmlBuildList.cxx b/soldep/bootstrp/XmlBuildList.cxx deleted file mode 100644 index 670a3eb7f771..000000000000 --- a/soldep/bootstrp/XmlBuildList.cxx +++ /dev/null @@ -1,436 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: XmlBuildList.cxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <EXTERN.h> /* from the Perl distribution */ - -#ifdef WNT -#include <tools/prewin.h> -#include "perl.h" -#include <tools/postwin.h> -#else -#include "perl.h" -#endif -#undef Copy /* from Perl handy.h */ - -#include <soldep/XmlBuildList.hxx> -#include "XmlBuildListDef.hxx" - -#ifdef __cplusplus -# define EXTERN_C extern "C" -#else -# define EXTERN_C extern -#endif - -static PerlInterpreter *my_perl; /*** The Perl interpreter ***/ -static const char * DEP_MD_SIMPLE_STR = "md-simple"; - -EXTERN_C void boot_DynaLoader (pTHX_ CV* cv); -static void xs_init (pTHX); -static void dl_init (pTHX); - -static void xs_init(pTHX) -{ - char *file = __FILE__; - dXSUB_SYS; - { - /* DynaLoader is a special case */ - newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file); - } -} - -static void dl_init(pTHX) -{ - char *file = __FILE__; - dTARG; - dSP; -/* Dynamicboot strapping code*/ - SAVETMPS; - targ=sv_newmortal(); - FREETMPS; -/* end Dynamic bootstrapping code */ -#ifdef MACOSX - *file=0; // how does this works??? - sp=0; -#endif -} - -FullByteStringList::FullByteStringList() - : FullByteStingListImpl(), - nRef (0) -{ -} - -FullByteStringList::~FullByteStringList() -{ - ByteString* pStr = First(); - while (pStr) - { - delete pStr; - pStr = Next(); - } -} - -ULONG FullByteStringList::GetPos (ByteString& rStr) -{ - ULONG nCurPos = GetCurPos(); - ULONG nPos = 0; - ByteString* pStr = First(); - while (pStr) - { - if (*pStr == rStr) - { - GetObject (nCurPos); - return nPos; - } - pStr = Next(); - nPos ++; - } - GetObject (nCurPos); - return LIST_ENTRY_NOTFOUND; -} - -FullByteStringListWrapper& FullByteStringListWrapper::operator=( const FullByteStringListWrapper& rFullByteStringListWrapper ) -{ - if (pStringList) - if (pStringList->GetRef() == 0) - delete pStringList; - else - pStringList->DecRef(); - - pStringList = rFullByteStringListWrapper.GetStringList(); - if (pStringList) - pStringList->IncRef(); - return *this; -} - -FullByteStringListWrapper::~FullByteStringListWrapper () -{ - if (pStringList) - { - if (pStringList->GetRef() == 0) - delete pStringList; - else - pStringList->DecRef(); - } -} - -// -// Function initializes Perl -// ATTENTION: No check built in - YET TO DO -// -void XmlBuildList::initPerl(const char* ModulePath) { - if (PerlInitialized) - return; - my_perl = perl_alloc(); - if (!my_perl) - throw XmlBuildListException("Cannot initialize perl"); - perl_construct(my_perl); - char* embedding[] = {"", "-e", "0"}; - int exitstatus = perl_parse(my_perl, xs_init, 3, embedding, (char **)NULL); - if (!exitstatus) { - dl_init(aTHX); - exitstatus = perl_run(my_perl); - } - //perl_run(my_perl); - // Create a variable (s. perlguts) - SV* sv = get_sv("main::module_path", TRUE); - sv_setpv(sv, ModulePath); - eval_pv("use lib $main::module_path; use XMLBuildListParser;", FALSE); - checkOperationSuccess(); - eval_pv("$main::build_lst_obj = XMLBuildListParser->new();", FALSE); - checkOperationSuccess(); - eval_pv("@array = ();", FALSE); - checkOperationSuccess(); - PerlInitialized = TRUE; -}; - -// Function proves if the $@ perl variable is set, if yes - -// last operation was unsuccessfull -> throws exception -void XmlBuildList::checkOperationSuccess() { - char* op_result = SvPV_nolen(get_sv("main::@", FALSE)); - if (strcmp(op_result, "")) - throw XmlBuildListException(op_result); -} - -// -// Function generates a regular array with NULL as last element -// from the Perl-object @array -// -FullByteStringList* XmlBuildList::extractArray() { - FullByteStringList* pStringList = new FullByteStringList(); - AV* theArrayObj = get_av("main::array", FALSE); - I32 arrayLength = av_len(theArrayObj); // $#array value - if (arrayLength == -1) - return pStringList; - - SV** string_ptr; - char* pStoredString; - // populate vector with strings (char*) - for (int i = 0; i <= arrayLength; i++) { - string_ptr = av_fetch(theArrayObj, i, NULL); - //pStoredString = savepv(SvPV_nolen(*string_ptr)); - pStoredString = SvPV_nolen(*string_ptr); - ByteString* pStr = new ByteString(pStoredString); - pStringList->Insert(pStr, LIST_APPEND); - }; - return pStringList; -}; - - -char* XmlBuildList::getError() { - eval_pv("$main::string1 = $main::build_lst_obj->getError();", FALSE); - checkOperationSuccess(); - return SvPV_nolen(get_sv("main::string1", FALSE)); -}; - -/*****************************************************************************/ -XmlBuildList::XmlBuildList(const ByteString& rModulePath) -/*****************************************************************************/ - : PerlInitialized (FALSE) -{ - initPerl(rModulePath.GetBuffer()); - string_obj1 = get_sv("main::string1", TRUE); - string_obj2 = get_sv("main::string2", TRUE); - string_obj3 = get_sv("main::string3", TRUE); - if (!(string_obj1 && string_obj2 && string_obj3)) - throw XmlBuildListException("Cannot initialize Perl string objects"); -}; - -// -// Function uninitializes Perl -// -/*****************************************************************************/ -XmlBuildList::~XmlBuildList() -/*****************************************************************************/ -{ - if (!PerlInitialized) - return; - perl_destruct(my_perl); - perl_free(my_perl); - PerlInitialized = FALSE; -}; - -/*****************************************************************************/ -void XmlBuildList::loadXMLFile(const ByteString& rBuildList) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rBuildList.GetBuffer()); - eval_pv("$main::string2 = $main::build_lst_obj->loadXMLFile($main::string1);", FALSE); - checkOperationSuccess(); - if(!SvTRUE(string_obj2)) { - const char* Message = getError(); - throw XmlBuildListException(Message); - }; -}; - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getProducts() -/*****************************************************************************/ -{ - eval_pv("@array = $main::build_lst_obj->getProducts();", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -} - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getJobDirectories(const ByteString& rJobType, const ByteString& rJobPlatform) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rJobType.GetBuffer()); - sv_setpv(string_obj2, rJobPlatform.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getJobDirectories($main::string1, $main::string2);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -} - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getModuleDependencies(const ByteString& rProduct, const ByteString& rDependencyType) -/*****************************************************************************/ -{ - FullByteStringList* pProducts = new FullByteStringList(); - FullByteStringListWrapper aProducts (pProducts); - if (rProduct != "") - aProducts.Insert (new ByteString(rProduct), LIST_APPEND); - return getModuleDependencies(aProducts, rDependencyType); -}; - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getModuleDependencies(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType) -/*****************************************************************************/ -{ - eval_pv("@products = ();", FALSE); - checkOperationSuccess(); - AV* theArrayObj = get_av("main::products", FALSE); - FullByteStringList* pProducts = rProducts.GetStringList(); - ByteString* pStr = pProducts->First(); - while (pStr) - { - sv_setpv(string_obj2, pStr->GetBuffer()); - av_push(theArrayObj, string_obj2); - pStr = pProducts->Next(); - } - - sv_setpv(string_obj1, rDependencyType.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getModuleDependencies(\\@products, $main::string1);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -}; - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getJobBuildReqs(const ByteString& rJobDir, const ByteString& rBuildReqPlatform) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rJobDir.GetBuffer()); - sv_setpv(string_obj2, rBuildReqPlatform.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getJobBuildReqs($main::string1, $main::string2);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -} - -/*****************************************************************************/ -ByteString XmlBuildList::getModuleDepType(const ByteString& rDepModuleName) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rDepModuleName.GetBuffer()); - eval_pv("$main::string1 = $main::build_lst_obj->getModuleDepType($main::string1);", FALSE); - checkOperationSuccess(); - char* pString = SvPV_nolen(get_sv("main::string1", FALSE)); - ByteString sDependencyType(pString); - return sDependencyType; -} - -/*****************************************************************************/ -sal_Bool XmlBuildList::hasModuleDepType(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType) -/*****************************************************************************/ -{ - FullByteStringListWrapper aDepencendModules = getModuleDependencies(rProducts, rDependencyType); - if (aDepencendModules.Count()>0) - { - return sal_True; - } - return sal_False; -} - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getModuleDepTypes(FullByteStringListWrapper& rProducts) -/*****************************************************************************/ -{ - FullByteStringList * pList = new FullByteStringList(); - - ByteString aDepType = ByteString( DEP_MD_SIMPLE_STR ); - bool bHasType = hasModuleDepType(rProducts, aDepType); - if (bHasType) - pList->Insert(new ByteString (aDepType)); - - aDepType = ByteString(DEP_MD_ALWAYS_STR); - bHasType = hasModuleDepType(rProducts, aDepType); - if (bHasType) - pList->Insert(new ByteString (aDepType)); - - aDepType = ByteString(DEP_MD_FORCE_STR); - bHasType = hasModuleDepType(rProducts, aDepType); - if (bHasType) - pList->Insert(new ByteString (aDepType)); - - return FullByteStringListWrapper (pList); -} - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getModuleProducts(const ByteString& rDepModuleName) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rDepModuleName.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getModuleProducts($main::string1);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -}; - -/*****************************************************************************/ -ByteString XmlBuildList::getModuleName() -/*****************************************************************************/ -{ - eval_pv("$main::string1 = $main::build_lst_obj->getModuleName();", FALSE); - checkOperationSuccess(); - char* pString = SvPV_nolen(get_sv("main::string1", FALSE)); - ByteString sModuleName(pString); - return sModuleName; -} - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getDirDependencies(const ByteString& rJobDir, const ByteString& rJobType, const ByteString& rJobPlatform) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rJobDir.GetBuffer()); - sv_setpv(string_obj2, rJobType.GetBuffer()); - sv_setpv(string_obj3, rJobPlatform.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getDirDependencies($main::string1, $main::string2, $main::string3);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -}; - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getJobTypes(const ByteString& rJobDir) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rJobDir.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getJobTypes($main::string1);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -}; - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getJobPlatforms(const ByteString& rJobDir) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rJobDir.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getJobPlatforms($main::string1);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -}; - -/*****************************************************************************/ -FullByteStringListWrapper XmlBuildList::getJobBuildReqPlatforms(const ByteString& rJobDir, const ByteString& rBuildReqName) -/*****************************************************************************/ -{ - sv_setpv(string_obj1, rJobDir.GetBuffer()); - sv_setpv(string_obj2, rBuildReqName.GetBuffer()); - eval_pv("@array = $main::build_lst_obj->getJobBuildReqPlatforms($main::string1, $main::string2);", FALSE); - checkOperationSuccess(); - FullByteStringList* pList = extractArray(); - return FullByteStringListWrapper(pList); -}; diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk index d38b25982b86..ac56f781b791 100644 --- a/soldep/bootstrp/makefile.mk +++ b/soldep/bootstrp/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,8 @@ PRJNAME=soldep TARGET=bootstrpdt ENABLE_EXCEPTIONS=true - # --- Settings ----------------------------------------------------- -#.INCLUDE : $(PRJ)$/util$/perl.mk .INCLUDE : settings.mk # fixme, code is not yet 64 bit clean @@ -50,7 +48,7 @@ all: # --- Files -------------------------------------------------------- EXCEPTIONSFILES= \ - $(SLO)$/prj.obj + $(SLO)$/prj.obj SLOFILES=\ $(SLO)$/dep.obj \ @@ -58,7 +56,8 @@ SLOFILES=\ $(SLO)$/prodmap.obj \ $(SLO)$/appdef.obj \ $(SLO)$/hashtbl.obj \ - $(SLO)$/prj.obj \ + $(SLO)$/prj.obj + SHL1TARGET =$(TARGET)$(DLLPOSTFIX) SHL1IMPLIB =$(TARGET) @@ -69,7 +68,7 @@ SHL1STDLIBS=\ $(TOOLSLIB) \ $(BTSTRPLIB) \ $(VOSLIB) \ - $(SALLIB) + $(SALLIB) DEF1NAME =$(SHL1TARGET) DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx index 2d87f0a35fc6..2a8a69dbc3b5 100644 --- a/soldep/bootstrp/minormk.cxx +++ b/soldep/bootstrp/minormk.cxx @@ -29,10 +29,10 @@ ************************************************************************/ #include "minormk.hxx" +#include "prodmap.hxx" #include <appdef.hxx> #include <tools/fsys.hxx> #include <tools/geninfo.hxx> -#include "prodmap.hxx" // // class MinorMk diff --git a/soldep/inc/XmlBuildListDef.hxx b/soldep/inc/XmlBuildListDef.hxx deleted file mode 100755 index 7f68059e18f5..000000000000 --- a/soldep/inc/XmlBuildListDef.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: XmlBuildListDef.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _XMLBUILDLISTDEF_HXX -#define _XMLBUILDLISTDEF_HXX - -enum DepTypes -{ - mdsimple, - mdalways, - mdforce -}; - -#define DEP_MD_SIMPLE 1; -//#define DEP_MD_ALWAYS 2; -//#define DEP_MD_FORCE 4; - -//static const char * DEP_MD_ALWAYS_STR = "md-always"; -//static const char * DEP_MD_FORCE_STR = "md-force"; - -#endif - - diff --git a/soldep/inc/soldep/XmlBuildList.hxx b/soldep/inc/soldep/XmlBuildList.hxx deleted file mode 100644 index cfab946d453c..000000000000 --- a/soldep/inc/soldep/XmlBuildList.hxx +++ /dev/null @@ -1,160 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: XmlBuildList.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _XMLBUILDLIST_HXX -#define _XMLBUILDLIST_HXX - -#ifndef _STRING_HXX -#include <tools/string.hxx> -#endif - -#ifndef _LIST_HXX -#include <tools/list.hxx> -#endif - -#include <sal/types.h> - -class FullByteStringListWrapper; - -struct STRUCT_SV; - -DECLARE_LIST ( FullByteStingListImpl, ByteString* ) - -class FullByteStringList : public FullByteStingListImpl -{ - friend class FullByteStringListWrapper; - ULONG nRef; - void IncRef() { nRef ++; } - void DecRef() { nRef --; } - ULONG GetRef() { return nRef; } -public: - FullByteStringList(); - ~FullByteStringList(); - ULONG GetPos (ByteString& rStr); - ULONG GetPos( const ByteString* p ) const { return FullByteStingListImpl::GetPos(p); } - ULONG GetPos( const ByteString* p, ULONG nStartIndex, - BOOL bForward = TRUE ) const { return - FullByteStingListImpl::GetPos(p, nStartIndex, bForward); } -}; - -class FullByteStringListWrapper -{ -private: - FullByteStringList* pStringList; - -public: - FullByteStringListWrapper (FullByteStringList* pList) {pStringList = pList;} - ~FullByteStringListWrapper (); - - FullByteStringList* GetStringList() const {return pStringList;} - - void Insert( ByteString* p ){pStringList->Insert(p);} - void Insert( ByteString* p, ULONG nIndex ){pStringList->Insert(p, nIndex);} - void Insert( ByteString* pNew, ByteString* pOld ){pStringList->Insert(pNew, pOld);} - - ByteString* Remove(){return pStringList->Remove();} - ByteString* Remove( ULONG nIndex ){return pStringList->Remove(nIndex);} - ByteString* Remove( ByteString* p ) - { return pStringList->Remove(p); } - - ByteString* Replace( ByteString* p ){ return pStringList->Replace(p); } - ByteString* Replace( ByteString* p, ULONG nIndex ){ return pStringList->Replace(p, nIndex); } - ByteString* Replace( ByteString* pNew, ByteString* pOld ) - { return pStringList->Replace( pNew, pOld ); } - - ULONG Count() const { return pStringList->Count(); } - void Clear(){pStringList->Clear(); } - - ByteString* GetCurObject() const { return pStringList->GetCurObject(); } - ULONG GetCurPos() const { return pStringList->GetCurPos(); } - ByteString* GetObject( ULONG nIndex ) const { return pStringList->GetObject( nIndex ); } - ULONG GetPos( const ByteString* p ) const { return pStringList->GetPos(p); } - ULONG GetPos( const ByteString* p, ULONG nStartIndex, - BOOL bForward = TRUE ) const { return - pStringList->GetPos(p, nStartIndex, bForward); } - ULONG GetPos (ByteString& rStr) { return pStringList->GetPos(rStr); } - - ByteString* Seek( ULONG nIndex ) { return pStringList->Seek(nIndex); } - ByteString* Seek( ByteString* p ) { return pStringList->Seek(p); } - - ByteString* First() { return pStringList->First(); }; - ByteString* Last() { return pStringList->Last(); }; - ByteString* Next() { return pStringList->Next(); }; - ByteString* Prev() { return pStringList->Prev(); }; - - FullByteStringListWrapper & operator= ( const FullByteStringListWrapper &); -}; - - -class XmlBuildListException { - private: - const char* ExceptionMessage; - public: - XmlBuildListException(const char* Message) - :ExceptionMessage(Message) {}; - const char* getMessage() {return ExceptionMessage;}; -}; - -class XmlBuildList { - protected: - bool PerlInitialized; - void initPerl(const char* ModulePath); - // Set of arrays for each function, which uses char* arrays - // as a return value. Each call to such function clears its array up - // before it's being populated - FullByteStringList* extractArray(); - // C objects for $string1 & $string2 Perl variables - STRUCT_SV* string_obj1; - STRUCT_SV* string_obj2; - STRUCT_SV* string_obj3; - char* getError(); - void checkOperationSuccess(); - public: - // alternative to constructor - XmlBuildList(const ByteString& rModulePath); - ~XmlBuildList(); - void loadXMLFile(const ByteString& rBuildList); - FullByteStringListWrapper getProducts(); - FullByteStringListWrapper getJobDirectories(const ByteString& rJobType, const ByteString& rJobPlatform); - FullByteStringListWrapper getModuleDependencies(const ByteString& rProduct, const ByteString& rDependencyType); - FullByteStringListWrapper getModuleDependencies(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType); - FullByteStringListWrapper getJobBuildReqs(const ByteString& rJobDir, const ByteString& rBuildReqPlatform); - ByteString getModuleDepType(const ByteString& rDepModuleName); - FullByteStringListWrapper getModuleDepTypes(FullByteStringListWrapper& rProducts); - sal_Bool hasModuleDepType(FullByteStringListWrapper& rProducts, const ByteString& rDependencyType); - FullByteStringListWrapper getModuleProducts(const ByteString& rDepModuleName); - ByteString getModuleName(); - FullByteStringListWrapper getDirDependencies(const ByteString& rJobDir, const ByteString& rJobType, const ByteString& rJobPlatform); - FullByteStringListWrapper getJobTypes(const ByteString& rJobDir); - FullByteStringListWrapper getJobPlatforms(const ByteString& rJobDir); - FullByteStringListWrapper getJobBuildReqPlatforms(const ByteString& rJobDir, const ByteString& rBuildReqName); -}; - -#endif diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx index 42517832c645..7caffca8662e 100644 --- a/soldep/inc/soldep/depper.hxx +++ b/soldep/inc/soldep/depper.hxx @@ -74,7 +74,7 @@ class FixedText; #define OBJWIN_X_SPACING 50 #define OBJWIN_Y_SPACING 12 #define DEPPER_MAX_DEPTH 100 -#define DEPPER_MAX_WIDTH 9 +#define DEPPER_MAX_WIDTH 12 #define DEPPER_MAX_LEVEL_WIDTH 10 * DEPPER_MAX_WIDTH diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx index 13568561c95d..884507a2fa81 100644 --- a/soldep/inc/soldep/objwin.hxx +++ b/soldep/inc/soldep/objwin.hxx @@ -139,6 +139,7 @@ public: BOOL ConnectionExistsInAnyDirection( ObjectWin *pWin ); void DrawOutput( OutputDevice* pDevice, const Point& rOffset ); + BOOL IsTop(); }; DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* ) @@ -155,6 +156,7 @@ public: ~ObjectList() {}; void ResetSelectedObject(); ObjectWin* GetPtrByName( const ByteString& rText ); + ObjectList* FindTopLevelModules(); }; #endif diff --git a/soldep/prj/d.lst b/soldep/prj/d.lst index 25dd1b8530c9..73301a558e61 100644 --- a/soldep/prj/d.lst +++ b/soldep/prj/d.lst @@ -27,7 +27,6 @@ mkdir: %COMMON_DEST%\res%_EXT%\img\additional ..\inc\soldep\prj.hxx %_DEST%\inc%_EXT%\soldep\prj.hxx ..\inc\dep.hxx %_DEST%\inc%_EXT%\soldep\dep.hxx ..\inc\prodmap.hxx %_DEST%\inc%_EXT%\soldep\prodmap.hxx -..\inc\soldep\XmlBuildList.hxx %_DEST%\inc%_EXT%\soldep\XmlBuildList.hxx ..\inc\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx ..\inc\soldep\soldlg.hrc %_DEST%\inc%_EXT%\soldep\soldlg.hrc diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx index 8eaba9ace236..acba58ce48d9 100644 --- a/soldep/source/connctr.cxx +++ b/soldep/source/connctr.cxx @@ -1,168 +1,168 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: connctr.cxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifdef _MSC_VER -#pragma warning(disable:4100) -#endif -#include <soldep/connctr.hxx> -#include <soldep/objwin.hxx> -#include <soldep/depwin.hxx> -#include "math.h" - -BOOL Connector::msbHideMode = FALSE; - -Connector::Connector( DepWin* pParent, WinBits nWinStyle ) : -mpStartWin( 0L ), -mpEndWin( 0L ), -mnStartId( 0 ), -mnEndId( 0 ), -bVisible( FALSE ), -len( 70 ) -{ - mpParent = pParent; - if ( mpParent ) - mpParent->AddConnector( this ); -} - -Connector::~Connector() -{ - if ( mpStartWin ) - mpStartWin->RemoveConnector( this ); - if ( mpEndWin ) - mpEndWin->RemoveConnector( this ); - if ( mpParent ) - mpParent->RemoveConnector( this ); - mpParent->Invalidate( Rectangle( mStart, mEnd )); - mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3))); -} - -void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis ) -{ - mpStartWin = pStartWin; - mpEndWin = pEndWin; - mpStartWin->AddConnector( this ); - mpEndWin->AddConnector( this ); - mCenter = GetMiddle(); - mStart = pStartWin->GetFixPoint( mCenter ); - mEnd = pEndWin->GetFixPoint( mCenter ); - mnStartId = pStartWin->GetId(); - mnEndId = pEndWin->GetId(); - bVisible = bVis; - -// if ( mpParent->IsPaintEnabled()) - if ( IsVisible() ) - { - mpParent->DrawLine( mEnd, mStart ); - mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2))); - } - UpdateVisibility(); //null_Project -} - -void Connector::UpdateVisibility() -{ - bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible(); -} - - -Point Connector::GetMiddle() -{ - Point aStartPoint = mpStartWin->GetPosPixel(); - Size aStartSize = mpStartWin->GetSizePixel(); - int nMoveHorz, nMoveVert; - aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 ); - - Point aEndPoint = mpEndWin->GetPosPixel(); - Size aEndSize = mpEndWin->GetSizePixel(); - - aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 ); - - Point aRetPoint = aEndPoint; - - nMoveHorz = aStartPoint.X() - aEndPoint.X(); - if ( nMoveHorz ) - nMoveHorz /= 2; - nMoveVert = aStartPoint.Y() - aEndPoint.Y(); - if ( nMoveVert ) - nMoveVert /= 2; - aRetPoint.Move( nMoveHorz, nMoveVert ); - return aRetPoint; - -} - -void Connector::Paint( const Rectangle& rRect ) -{ - //MyApp *pApp = (MyApp*)GetpApp(); - //SolDep *pSoldep = pApp->GetSolDep(); - if (msbHideMode) - { - if (!(mpStartWin->IsNullObject())) //null_project - { - if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING ) - { - mpStartWin->SetViewMask(0); //objwin invisible - } else - { - mpStartWin->SetViewMask(1); //objwin visible - } - } - if (!(mpEndWin->IsNullObject())) - { - if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING ) - { - mpEndWin->SetViewMask(0); //objwin invisible - } else - { - mpEndWin->SetViewMask(1); //objwin visible - } - } - UpdateVisibility(); - } else //IsHideMode - { - //bVisible = TRUE; - if (!(mpStartWin->IsNullObject())) //null_project - { - mpStartWin->SetViewMask(1); - } - if (!(mpEndWin->IsNullObject())) //null_project - { - mpEndWin->SetViewMask(1); - } - UpdateVisibility(); - } - if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project - (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project - { - mpParent->DrawLine( mEnd, mStart ); - mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2))); - } -} - +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: connctr.cxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifdef _MSC_VER
+#pragma warning(disable:4100)
+#endif
+#include <soldep/connctr.hxx>
+#include <soldep/objwin.hxx>
+#include <soldep/depwin.hxx>
+#include "math.h"
+
+BOOL Connector::msbHideMode = FALSE;
+
+Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :
+mpStartWin( 0L ),
+mpEndWin( 0L ),
+mnStartId( 0 ),
+mnEndId( 0 ),
+bVisible( FALSE ),
+len( 70 )
+{
+ mpParent = pParent;
+ if ( mpParent )
+ mpParent->AddConnector( this );
+}
+
+Connector::~Connector()
+{
+ if ( mpStartWin )
+ mpStartWin->RemoveConnector( this );
+ if ( mpEndWin )
+ mpEndWin->RemoveConnector( this );
+ if ( mpParent )
+ mpParent->RemoveConnector( this );
+ mpParent->Invalidate( Rectangle( mStart, mEnd ));
+ mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
+}
+
+void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )
+{
+ mpStartWin = pStartWin;
+ mpEndWin = pEndWin;
+ mpStartWin->AddConnector( this );
+ mpEndWin->AddConnector( this );
+ mCenter = GetMiddle();
+ mStart = pStartWin->GetFixPoint( mCenter );
+ mEnd = pEndWin->GetFixPoint( mCenter );
+ mnStartId = pStartWin->GetId();
+ mnEndId = pEndWin->GetId();
+ bVisible = bVis;
+
+// if ( mpParent->IsPaintEnabled())
+ if ( IsVisible() )
+ {
+ mpParent->DrawLine( mEnd, mStart );
+ mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
+ }
+ UpdateVisibility(); //null_Project
+}
+
+void Connector::UpdateVisibility()
+{
+ bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();
+}
+
+
+Point Connector::GetMiddle()
+{
+ Point aStartPoint = mpStartWin->GetPosPixel();
+ Size aStartSize = mpStartWin->GetSizePixel();
+ int nMoveHorz, nMoveVert;
+ aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );
+
+ Point aEndPoint = mpEndWin->GetPosPixel();
+ Size aEndSize = mpEndWin->GetSizePixel();
+
+ aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );
+
+ Point aRetPoint = aEndPoint;
+
+ nMoveHorz = aStartPoint.X() - aEndPoint.X();
+ if ( nMoveHorz )
+ nMoveHorz /= 2;
+ nMoveVert = aStartPoint.Y() - aEndPoint.Y();
+ if ( nMoveVert )
+ nMoveVert /= 2;
+ aRetPoint.Move( nMoveHorz, nMoveVert );
+ return aRetPoint;
+
+}
+
+void Connector::Paint( const Rectangle& rRect )
+{
+ //MyApp *pApp = (MyApp*)GetpApp();
+ //SolDep *pSoldep = pApp->GetSolDep();
+ if (msbHideMode)
+ {
+ if (!(mpStartWin->IsNullObject())) //null_project
+ {
+ if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
+ {
+ mpStartWin->SetViewMask(0); //objwin invisible
+ } else
+ {
+ mpStartWin->SetViewMask(1); //objwin visible
+ }
+ }
+ if (!(mpEndWin->IsNullObject()))
+ {
+ if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
+ {
+ mpEndWin->SetViewMask(0); //objwin invisible
+ } else
+ {
+ mpEndWin->SetViewMask(1); //objwin visible
+ }
+ }
+ UpdateVisibility();
+ } else //IsHideMode
+ {
+ //bVisible = TRUE;
+ if (!(mpStartWin->IsNullObject())) //null_project
+ {
+ mpStartWin->SetViewMask(1);
+ }
+ if (!(mpEndWin->IsNullObject())) //null_project
+ {
+ mpEndWin->SetViewMask(1);
+ }
+ UpdateVisibility();
+ }
+ if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
+ (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project
+ {
+ mpParent->DrawLine( mEnd, mStart );
+ mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
+ }
+}
+
void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
{
if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
@@ -174,102 +174,102 @@ void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) pDevice->DrawEllipse( aRect );
}
}
- -void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint ) -{ -// more than one call ? -// - Point OldStart, OldEnd; - static ULONG nCallCount = 0; - - //MyApp *pApp = (MyApp*)GetpApp(); - //SolDep *pSoldep = pApp->GetSolDep(); - if (msbHideMode) - bVisible = 1; - - if ( nCallCount ) // only one call - nCallCount++; - else - { - nCallCount++; - while ( nCallCount ) - { - if ( bPaint ) - { - OldStart = mStart; - OldEnd = mEnd; - } - mCenter = GetMiddle(); - mStart=mpStartWin->GetFixPoint( mCenter, bPaint ); - mEnd=mpEndWin->GetFixPoint( mCenter, bPaint ); - if ( bPaint ) - { - mpParent->Invalidate( Rectangle( OldStart, OldEnd )); - mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2))); -//Don't paint "null_project" connectors - if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project - (mpEndWin->GetBodyText() != ByteString("null"))) //null_project - { - Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3))); - Paint ( Rectangle( mEnd, mStart )); - } - } - nCallCount--; - } - } -} - -USHORT Connector::Save( SvFileStream& rOutFile ) -{ - rOutFile << mpStartWin->GetId(); - rOutFile << mpEndWin->GetId(); - - return 0; -} - -USHORT Connector::Load( SvFileStream& rInFile ) -{ - rInFile >> mnStartId; - rInFile >> mnEndId; - - return 0; -} - -ObjectWin* Connector::GetOtherWin( ObjectWin* pWin ) -{ -// get correspondent object ptr - if ( mpStartWin == pWin ) - return mpEndWin; - else - if ( mpEndWin == pWin ) - return mpStartWin; - - return NULL; -} - -ULONG Connector::GetOtherId( ULONG nId ) -{ -// get correspondent object id - if ( mnStartId == nId ) - return mnEndId; - else - if ( mnEndId == nId ) - return mnStartId; - - return NULL; -} - -ULONG Connector::GetLen() -{ - double dx, dy; - - dx = mStart.X() - mEnd.X(); - dy = mStart.Y() - mEnd.Y(); - - return (ULONG) sqrt( dx * dx + dy * dy ); -} - -BOOL Connector::IsStart( ObjectWin* pWin ) -{ - return pWin == mpStartWin; -} +
+void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
+{
+// more than one call ?
+//
+ Point OldStart, OldEnd;
+ static ULONG nCallCount = 0;
+
+ //MyApp *pApp = (MyApp*)GetpApp();
+ //SolDep *pSoldep = pApp->GetSolDep();
+ if (msbHideMode)
+ bVisible = 1;
+
+ if ( nCallCount ) // only one call
+ nCallCount++;
+ else
+ {
+ nCallCount++;
+ while ( nCallCount )
+ {
+ if ( bPaint )
+ {
+ OldStart = mStart;
+ OldEnd = mEnd;
+ }
+ mCenter = GetMiddle();
+ mStart=mpStartWin->GetFixPoint( mCenter, bPaint );
+ mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );
+ if ( bPaint )
+ {
+ mpParent->Invalidate( Rectangle( OldStart, OldEnd ));
+ mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));
+//Don't paint "null_project" connectors
+ if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
+ (mpEndWin->GetBodyText() != ByteString("null"))) //null_project
+ {
+ Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
+ Paint ( Rectangle( mEnd, mStart ));
+ }
+ }
+ nCallCount--;
+ }
+ }
+}
+
+USHORT Connector::Save( SvFileStream& rOutFile )
+{
+ rOutFile << mpStartWin->GetId();
+ rOutFile << mpEndWin->GetId();
+
+ return 0;
+}
+
+USHORT Connector::Load( SvFileStream& rInFile )
+{
+ rInFile >> mnStartId;
+ rInFile >> mnEndId;
+
+ return 0;
+}
+
+ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )
+{
+// get correspondent object ptr
+ if ( mpStartWin == pWin )
+ return mpEndWin;
+ else
+ if ( mpEndWin == pWin )
+ return mpStartWin;
+
+ return NULL;
+}
+
+ULONG Connector::GetOtherId( ULONG nId )
+{
+// get correspondent object id
+ if ( mnStartId == nId )
+ return mnEndId;
+ else
+ if ( mnEndId == nId )
+ return mnStartId;
+
+ return NULL;
+}
+
+ULONG Connector::GetLen()
+{
+ double dx, dy;
+
+ dx = mStart.X() - mEnd.X();
+ dy = mStart.Y() - mEnd.Y();
+
+ return (ULONG) sqrt( dx * dx + dy * dy );
+}
+
+BOOL Connector::IsStart( ObjectWin* pWin )
+{
+ return pWin == mpStartWin;
+}
diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx index ab64557dbcf1..6b000cc6fbce 100644 --- a/soldep/source/depapp.cxx +++ b/soldep/source/depapp.cxx @@ -1,150 +1,150 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: depapp.cxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// ----------------------------------------------------------------------- -#include "depapp.hxx" +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: depapp.cxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// -----------------------------------------------------------------------
+#include "depapp.hxx"
#include <ucbhelper/contentbroker.hxx>
#include <ucbhelper/configurationkeys.hxx>
- -void MyApp::Main() -{ -#if defined(WNT) - pDebugFile = fopen( "fprintf.out", "w" ); -#endif - - pMyApp = GetpApp(); - MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); - pAppWindow = &aMainWin; - // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK ); - //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN)); - - pSolDep = new SolDep( &aMainWin ); - pSolDep->Init(); - aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME )); - pSolDep->Hide(); - aMainWin.Show(); - Help aHelp; - SetHelp(&aHelp); - aHelp.EnableContextHelp(); - aHelp.EnableQuickHelp(); - Execute(); - delete pResMgr; - delete pSolDep; -} - -// ----------------------------------------------------------------------- - -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : - WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)), - // depper aTaskBarFrame(this, 0) -{ -//depper aTaskBarFrame.EnableAlwaysOnTop(); - -//depper aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) ); -//depper aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) ); -//depper SetMenuBar( &aMenuBar ); -//depper aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 )); -// aToolBox.Show(); -} - -// ----------------------------------------------------------------------- - -void MyWin::MouseMove( const MouseEvent& rMEvt ) -{ - WorkWindow::MouseMove( rMEvt ); -} - -// ----------------------------------------------------------------------- - -void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) -{ - WorkWindow::MouseButtonDown( rMEvt ); -} - -// ----------------------------------------------------------------------- - -void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) -{ - WorkWindow::MouseButtonUp( rMEvt ); -} - -// ----------------------------------------------------------------------- - -void MyWin::KeyInput( const KeyEvent& rKEvt ) -{ - WorkWindow::KeyInput( rKEvt ); -} - -// ----------------------------------------------------------------------- - -void MyWin::KeyUp( const KeyEvent& rKEvt ) -{ - WorkWindow::KeyUp( rKEvt ); -} - -// ----------------------------------------------------------------------- - -void MyWin::Paint( const Rectangle& rRect ) -{ - WorkWindow::Paint( rRect ); -} - -// ----------------------------------------------------------------------- - -void MyWin::Resize() -{ - ((MyApp*)GetpApp())->GetSolDep()->Resize(); - WorkWindow::Resize(); -} - -SAL_IMPLEMENT_MAIN() -{ - //Reference< XMultiServiceFactory > xMS; - - // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini - Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); - - //xMS = cppu::createRegistryServiceFactory( - // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); - - Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY); - - InitVCL( xMS ); - ::comphelper::setProcessServiceFactory(xMS); - com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2); +
+void MyApp::Main()
+{
+#if defined(WNT)
+ pDebugFile = fopen( "fprintf.out", "w" );
+#endif
+
+ pMyApp = GetpApp();
+ MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
+ pAppWindow = &aMainWin;
+ // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );
+ //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));
+
+ pSolDep = new SolDep( &aMainWin );
+ pSolDep->Init();
+ aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));
+ pSolDep->Hide();
+ aMainWin.Show();
+ Help aHelp;
+ SetHelp(&aHelp);
+ aHelp.EnableContextHelp();
+ aHelp.EnableQuickHelp();
+ Execute();
+ delete pResMgr;
+ delete pSolDep;
+}
+
+// -----------------------------------------------------------------------
+
+MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
+ WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),
+ // depper aTaskBarFrame(this, 0)
+{
+//depper aTaskBarFrame.EnableAlwaysOnTop();
+
+//depper aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );
+//depper aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );
+//depper SetMenuBar( &aMenuBar );
+//depper aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
+// aToolBox.Show();
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::MouseMove( const MouseEvent& rMEvt )
+{
+ WorkWindow::MouseMove( rMEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
+{
+ WorkWindow::MouseButtonDown( rMEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
+{
+ WorkWindow::MouseButtonUp( rMEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::KeyInput( const KeyEvent& rKEvt )
+{
+ WorkWindow::KeyInput( rKEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::KeyUp( const KeyEvent& rKEvt )
+{
+ WorkWindow::KeyUp( rKEvt );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::Paint( const Rectangle& rRect )
+{
+ WorkWindow::Paint( rRect );
+}
+
+// -----------------------------------------------------------------------
+
+void MyWin::Resize()
+{
+ ((MyApp*)GetpApp())->GetSolDep()->Resize();
+ WorkWindow::Resize();
+}
+
+SAL_IMPLEMENT_MAIN()
+{
+ //Reference< XMultiServiceFactory > xMS;
+
+ // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
+ Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
+
+ //xMS = cppu::createRegistryServiceFactory(
+ // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+
+ Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
+
+ InitVCL( xMS );
+ ::comphelper::setProcessServiceFactory(xMS);
+ com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
- +
::ucbhelper::ContentBroker::initialize( xMS, aArgs );
- - aMyApp.Main(); - DeInitVCL(); - return 0; -} +
+ aMyApp.Main();
+ DeInitVCL();
+ return 0;
+}
diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx index 187907e87fe0..e6cb96a63832 100644 --- a/soldep/source/depapp.hxx +++ b/soldep/source/depapp.hxx @@ -35,7 +35,7 @@ #define EVENT_RESIZE 0x00000001 -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <tools/resmgr.hxx> #include <bootstrp/sstring.hxx> #include <vcl/event.hxx> diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx index 56eacedb4093..baa24d41fce0 100644 --- a/soldep/source/objwin.cxx +++ b/soldep/source/objwin.cxx @@ -1,487 +1,487 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: objwin.cxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <tools/list.hxx> -#include <tools/debug.hxx> -#include <vcl/svapp.hxx> -#include <vcl/help.hxx> +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: objwin.cxx,v $
+ * $Revision: 1.6 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <tools/list.hxx>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/help.hxx>
#include <vcl/wall.hxx>
- -#include <soldep/objwin.hxx> -#include <soldep/depwin.hxx> -//#include "depapp.hxx" -#include <soldep/depper.hxx> -//#include "prjdep.hxx" -#include <soldep/connctr.hxx> -#include <stdio.h> - -static Color aDefaultColor = 0L; -static Wallpaper* pDefaultWallpaper = 0L; - -// Initialize static class member -BOOL ObjectWin::msbHideMode = FALSE; -ULONG ObjectWin::msnGlobalViewMask = 0; - - -UINT32 aColorMap[] = { - COL_TRANSPARENT, //MARKMODE_DEFAULT 0 - COL_GREEN, //MARKMODE_DEPENDING 1 - COL_RED, //MARKMODE_NEEDED 2 - COL_MAGENTA, //1+2 - COL_YELLOW, //MARKMODE_ACTIVATED 4 - COL_LIGHTGREEN, //1+4 - COL_LIGHTRED, //2+4 - COL_LIGHTMAGENTA, //1+2+4 - COL_BLUE, //MARKMODE_SELECTED 8 - COL_LIGHTGRAY, //1+8 - COL_CYAN, //2+8 - COL_LIGHTCYAN, //1+2+8 - COL_LIGHTBLUE, //4+8 - COL_BROWN, //1+4+8 - COL_BLACK, //2+4+8 - COL_BLUE //1+2+4+8 -}; - - -// -// class ObjectWin -// - -/*****************************************************************************/ -ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle ) -/*****************************************************************************/ - : Window( pParent, nWinStyle ), - msBodyText( "" ), - msTipText( "" ), - mnObjectId( 0 ), - mnMarkMode( 0 ), - mnViewMask( 0 ), - mbVisible( FALSE ), - mbMenuExecute( FALSE ), - mbVisited( FALSE ), - mnRootDist( 0 ), - mnHeadDist( 0 ), - mbFixed( FALSE ) -{ - SetBackground( Wallpaper( Color( COL_WHITE ))); - - aTipTimer.SetTimeout( 500 ); - aTipTimer.SetTimeoutHdl( - LINK( this, ObjectWin, TipHdl )); - - SetFont( Font( GetFont() ) ); +
+#include <soldep/objwin.hxx>
+#include <soldep/depwin.hxx>
+//#include "depapp.hxx"
+#include <soldep/depper.hxx>
+//#include "prjdep.hxx"
+#include <soldep/connctr.hxx>
+#include <stdio.h>
+
+static Color aDefaultColor = 0L;
+static Wallpaper* pDefaultWallpaper = 0L;
+
+// Initialize static class member
+BOOL ObjectWin::msbHideMode = FALSE;
+ULONG ObjectWin::msnGlobalViewMask = 0;
+
+
+UINT32 aColorMap[] = {
+ RGB_COLORDATA( 0xFF, 0xFF, 0x80 ), //MARKMODE_DEFAULT 0
+ COL_GREEN, //MARKMODE_DEPENDING 1
+ COL_RED, //MARKMODE_NEEDED 2
+ COL_MAGENTA, //1+2
+ COL_GRAY, //MARKMODE_ACTIVATED 4
+ COL_LIGHTGREEN, //1+4
+ COL_LIGHTRED, //2+4
+ COL_LIGHTMAGENTA, //1+2+4
+ COL_BLUE, //MARKMODE_SELECTED 8
+ COL_LIGHTGRAY, //1+8
+ COL_CYAN, //2+8
+ COL_LIGHTCYAN, //1+2+8
+ COL_LIGHTBLUE, //4+8
+ COL_BROWN, //1+4+8
+ COL_BLACK, //2+4+8
+ COL_BLUE //1+2+4+8
+};
+
+
+//
+// class ObjectWin
+//
+
+/*****************************************************************************/
+ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
+/*****************************************************************************/
+ : Window( pParent, nWinStyle ),
+ msBodyText( "" ),
+ msTipText( "" ),
+ mnObjectId( 0 ),
+ mnMarkMode( 0 ),
+ mnViewMask( 0 ),
+ mbVisible( FALSE ),
+ mbMenuExecute( FALSE ),
+ mbVisited( FALSE ),
+ mnRootDist( 0 ),
+ mnHeadDist( 0 ),
+ mbFixed( FALSE )
+{
+ SetBackground( Wallpaper( aColorMap[0] ));
+
+ aTipTimer.SetTimeout( 500 );
+ aTipTimer.SetTimeoutHdl(
+ LINK( this, ObjectWin, TipHdl ));
+
+ SetFont( Font( GetFont() ) );
Font aFont( GetFont() );
Size aSize = aFont.GetSize();
aFont.SetSize( aSize );
- SetFont( aFont ); - - EnableClipSiblings(); - SetZOrder( NULL, WINDOW_ZORDER_FIRST ); - mpPopup = new PopupMenu(); - mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" )); - mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" )); - mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" )); - mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" )); -// mpPopup->InsertSeparator(); - mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected )); - mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated )); - mnPopupStaticItems = mpPopup->GetItemCount(); - - if ( ! pDefaultWallpaper ) - { - pDefaultWallpaper = new Wallpaper( GetBackground() ); - aDefaultColor = GetTextColor(); - } - Hide(); -} - -/*****************************************************************************/ -ObjectWin::~ObjectWin() -/*****************************************************************************/ -{ - while ( mConnections.Count() > 0 ) - { - delete mConnections.GetObject( 0 ); - } -} - -void ObjectWin::SetHideMode(BOOL bHide) -{ - msbHideMode = bHide; - mConnections.GetObject(0)->SetHideMode(msbHideMode); -} - -BOOL ObjectWin::ToggleHideMode() -{ - msbHideMode = !msbHideMode; - mConnections.GetObject(0)->SetHideMode(msbHideMode); - return msbHideMode; -} - -/*****************************************************************************/ -void ObjectWin::SetViewMask( ULONG nMask ) -/*****************************************************************************/ -{ - mnViewMask = nMask; - // Compares - if ( mnViewMask & msnGlobalViewMask) { - mbVisible = TRUE; - Show(); - } - else { - Hide(); - mbVisible = FALSE; - } - for ( ULONG i = 0; i < mConnections.Count(); i++ ) - mConnections.GetObject( i )->UpdateVisibility(); -} - -/*****************************************************************************/ -void ObjectWin::SetBodyText( const ByteString& rNewString ) -/*****************************************************************************/ -{ - msBodyText = rNewString; -} - -/*****************************************************************************/ -ByteString& ObjectWin::GetBodyText() -/*****************************************************************************/ -{ - return msBodyText; -} - -/*****************************************************************************/ -void ObjectWin::SetTipText( const ByteString& rNewString ) -/*****************************************************************************/ -{ - msTipText = rNewString; -} - -/*****************************************************************************/ -ByteString& ObjectWin::GetTipText() -/*****************************************************************************/ -{ - return msTipText; -} - -/*****************************************************************************/ -Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos ) -/*****************************************************************************/ -{ - Point aLocalPoint; - if ( bUseRealPos ) - aLocalPoint = GetPosPixel(); - else - aLocalPoint = GetCalcPosPixel(); - - Size aLocalSize = GetSizePixel(); - Point aRetPoint; - - USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ; - USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ; - - // always false... - //if ( nRefX < 0 ) nRefX = 0; - //if ( nRefY < 0 ) nRefY = 0; - - if ( rRefPoint.X() > nRefX ) - { - if ( rRefPoint.Y() > nRefY ) - { - if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) - { - aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width(); - aRetPoint.Y() = nRefY; - } - else - { - aRetPoint.X() = nRefX; - aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height(); - } - } - else - { - if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) - { - aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width(); - aRetPoint.Y() = nRefY; - } - else - { - aRetPoint.X() = nRefX; - aRetPoint.Y() = aLocalPoint.Y(); - } - } - } - else - { - if ( rRefPoint.Y() > nRefY ) - { - if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) - { - aRetPoint.X() = aLocalPoint.X(); - aRetPoint.Y() = nRefY; - } - else - { - aRetPoint.X() = nRefX; - aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height(); - } - } - else - { - if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) - { - aRetPoint.X() = aLocalPoint.X(); - aRetPoint.Y() = nRefY; - } - else - { - aRetPoint.X() = nRefX; - aRetPoint.Y() = aLocalPoint.Y(); - } - } - } - - return PixelToLogic(aRetPoint); - -} - -/*****************************************************************************/ -void ObjectWin::AddConnector( Connector* pNewCon ) -/*****************************************************************************/ -{ - mConnections.Insert( pNewCon ); -} - -/*****************************************************************************/ -BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin ) -/*****************************************************************************/ -{ - for ( ULONG i = 0; i < mConnections.Count(); i++ ) - if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin ) - return TRUE; - - return FALSE; -} - -/*****************************************************************************/ -void ObjectWin::RemoveConnector( Connector* pOldCon ) -/*****************************************************************************/ -{ - mConnections.Remove( pOldCon ); -} - -/*****************************************************************************/ -Connector* ObjectWin::GetConnector( ULONG nIndex ) -/*****************************************************************************/ -{ - ULONG nConCount = mConnections.Count(); - - if ( nIndex < nConCount ) - return mConnections.GetObject( nIndex ); - return NULL; -} - -/*****************************************************************************/ -Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId ) -/*****************************************************************************/ -{ - if ( mnObjectId != nStartId ) - return NULL; - - USHORT i; - Connector* pCon; - ULONG nConCount = mConnections.Count(); - - for ( i = 0; i < nConCount; i++ ) - { - pCon = mConnections.GetObject( i ); - if ( pCon->GetOtherWin( this )->GetId() == nEndId ) - return pCon; - } - return NULL; -} - -void ObjectWin::SetAllConnectorsUnvisible() -{ - Connector* pCon; - ULONG nConCount = mConnections.Count(); - for ( ULONG i = 0; i < nConCount; i++ ) - { - pCon = mConnections.GetObject( i ); - if (pCon) pCon->SetVisibility( FALSE ); - } -} - -/*****************************************************************************/ -void ObjectWin::SetMarkMode( ULONG nMarkMode ) -/*****************************************************************************/ -{ - //Wallpaper aWallpaper; - - if ( nMarkMode == MARKMODE_DEFAULT ) - { - if ( pDefaultWallpaper ) - { - maObjWallpaper = GetBackground(); - maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() ); - SetBackground( maObjWallpaper ); - SetTextColor( aDefaultColor ); - } - } - else - { - mnMarkMode |= nMarkMode; - maObjWallpaper = GetBackground(); - maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); - SetBackground( maObjWallpaper ); - SetTextColor( COL_WHITE ); - } - - Invalidate(); -} - -/*****************************************************************************/ -void ObjectWin::UnsetMarkMode( ULONG nMarkMode ) -/*****************************************************************************/ -{ - //Wallpaper aWallpaper; - - ULONG nOldMode = mnMarkMode; - mnMarkMode &= ( !nMarkMode ); - - if ( nOldMode != mnMarkMode ) { - if ( mnMarkMode == MARKMODE_DEFAULT ) - { - if ( pDefaultWallpaper ) - { - maObjWallpaper = GetBackground(); - maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() ); - SetBackground( maObjWallpaper ); - SetTextColor( aDefaultColor ); - } - } - else - { - maObjWallpaper = GetBackground(); - maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode - SetBackground( maObjWallpaper ); - SetTextColor( COL_WHITE ); - } - Invalidate(); - } -} - -/*****************************************************************************/ -void ObjectWin::MarkNeeded( BOOL bReset ) -/*****************************************************************************/ -{ - Connector* pCon; - ObjectWin* pWin; - - ULONG nConCount = mConnections.Count(); - ULONG i; - - for ( i = 0; i < nConCount; i++ ) - { - pCon = mConnections.GetObject( i ); - if ( pCon && !pCon->IsStart( this)) - { - pWin = pCon->GetOtherWin( this ); - if ( pWin ) - { - if ( bReset ) - pWin->UnsetMarkMode( MARKMODE_NEEDED ); - else - pWin->SetMarkMode( MARKMODE_NEEDED ); - pWin->MarkNeeded( bReset ); // recursive call - } - } - } -} - -/*****************************************************************************/ -void ObjectWin::MarkDepending( BOOL bReset ) -/*****************************************************************************/ -{ - //if ( !bReset ) - // return; - - Connector* pCon; - ObjectWin* pWin; - - ULONG nConCount = mConnections.Count(); - ULONG i; - - for ( i = 0; i < nConCount; i++ ) - { - pCon = mConnections.GetObject( i ); - if ( pCon && pCon->IsStart( this) ) - { - pWin = pCon->GetOtherWin( this ); - if ( pWin ) - { - if ( bReset ) - pWin->UnsetMarkMode( MARKMODE_DEPENDING ); - else - pWin->SetMarkMode( MARKMODE_DEPENDING ); - pWin->MarkDepending( bReset ); // recursive call - } - } - } -} - -/*****************************************************************************/ -void ObjectWin::Paint( const Rectangle& rRect ) -/*****************************************************************************/ -{ - Size aWinSize = PixelToLogic( GetOutputSizePixel() ); - Size aTextSize; - ByteString sbt = msBodyText; //debug - //sbt += " "; //debug - //sbt += ByteString::CreateFromInt32(mnMarkMode); //debug - aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 )); - aTextSize.Height() = GetTextHeight(); - Point aPos( aWinSize.Width() / 2 - aTextSize.Width() / 2, - aWinSize.Height() / 2 - aTextSize.Height() / 2 ); - - //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 )); - if (msBodyText =="null") //don't paint this "window" - { - Hide(); - Invalidate(); - } else - DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug -} - + SetFont( aFont );
+
+ EnableClipSiblings();
+ SetZOrder( NULL, WINDOW_ZORDER_FIRST );
+ mpPopup = new PopupMenu();
+ mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
+ mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
+ mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
+ mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
+// mpPopup->InsertSeparator();
+ mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));
+ mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));
+ mnPopupStaticItems = mpPopup->GetItemCount();
+
+ if ( ! pDefaultWallpaper )
+ {
+ pDefaultWallpaper = new Wallpaper( GetBackground() );
+ aDefaultColor = GetTextColor();
+ }
+ Hide();
+}
+
+/*****************************************************************************/
+ObjectWin::~ObjectWin()
+/*****************************************************************************/
+{
+ while ( mConnections.Count() > 0 )
+ {
+ delete mConnections.GetObject( 0 );
+ }
+}
+
+void ObjectWin::SetHideMode(BOOL bHide)
+{
+ msbHideMode = bHide;
+ mConnections.GetObject(0)->SetHideMode(msbHideMode);
+}
+
+BOOL ObjectWin::ToggleHideMode()
+{
+ msbHideMode = !msbHideMode;
+ mConnections.GetObject(0)->SetHideMode(msbHideMode);
+ return msbHideMode;
+}
+
+/*****************************************************************************/
+void ObjectWin::SetViewMask( ULONG nMask )
+/*****************************************************************************/
+{
+ mnViewMask = nMask;
+ // Compares
+ if ( mnViewMask & msnGlobalViewMask) {
+ mbVisible = TRUE;
+ Show();
+ }
+ else {
+ Hide();
+ mbVisible = FALSE;
+ }
+ for ( ULONG i = 0; i < mConnections.Count(); i++ )
+ mConnections.GetObject( i )->UpdateVisibility();
+}
+
+/*****************************************************************************/
+void ObjectWin::SetBodyText( const ByteString& rNewString )
+/*****************************************************************************/
+{
+ msBodyText = rNewString;
+}
+
+/*****************************************************************************/
+ByteString& ObjectWin::GetBodyText()
+/*****************************************************************************/
+{
+ return msBodyText;
+}
+
+/*****************************************************************************/
+void ObjectWin::SetTipText( const ByteString& rNewString )
+/*****************************************************************************/
+{
+ msTipText = rNewString;
+}
+
+/*****************************************************************************/
+ByteString& ObjectWin::GetTipText()
+/*****************************************************************************/
+{
+ return msTipText;
+}
+
+/*****************************************************************************/
+Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )
+/*****************************************************************************/
+{
+ Point aLocalPoint;
+ if ( bUseRealPos )
+ aLocalPoint = GetPosPixel();
+ else
+ aLocalPoint = GetCalcPosPixel();
+
+ Size aLocalSize = GetSizePixel();
+ Point aRetPoint;
+
+ USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
+ USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
+
+ // always false...
+ //if ( nRefX < 0 ) nRefX = 0;
+ //if ( nRefY < 0 ) nRefY = 0;
+
+ if ( rRefPoint.X() > nRefX )
+ {
+ if ( rRefPoint.Y() > nRefY )
+ {
+ if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+ {
+ aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
+ aRetPoint.Y() = nRefY;
+ }
+ else
+ {
+ aRetPoint.X() = nRefX;
+ aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
+ }
+ }
+ else
+ {
+ if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+ {
+ aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
+ aRetPoint.Y() = nRefY;
+ }
+ else
+ {
+ aRetPoint.X() = nRefX;
+ aRetPoint.Y() = aLocalPoint.Y();
+ }
+ }
+ }
+ else
+ {
+ if ( rRefPoint.Y() > nRefY )
+ {
+ if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+ {
+ aRetPoint.X() = aLocalPoint.X();
+ aRetPoint.Y() = nRefY;
+ }
+ else
+ {
+ aRetPoint.X() = nRefX;
+ aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
+ }
+ }
+ else
+ {
+ if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
+ {
+ aRetPoint.X() = aLocalPoint.X();
+ aRetPoint.Y() = nRefY;
+ }
+ else
+ {
+ aRetPoint.X() = nRefX;
+ aRetPoint.Y() = aLocalPoint.Y();
+ }
+ }
+ }
+
+ return PixelToLogic(aRetPoint);
+
+}
+
+/*****************************************************************************/
+void ObjectWin::AddConnector( Connector* pNewCon )
+/*****************************************************************************/
+{
+ mConnections.Insert( pNewCon );
+}
+
+/*****************************************************************************/
+BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )
+/*****************************************************************************/
+{
+ for ( ULONG i = 0; i < mConnections.Count(); i++ )
+ if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )
+ return TRUE;
+
+ return FALSE;
+}
+
+/*****************************************************************************/
+void ObjectWin::RemoveConnector( Connector* pOldCon )
+/*****************************************************************************/
+{
+ mConnections.Remove( pOldCon );
+}
+
+/*****************************************************************************/
+Connector* ObjectWin::GetConnector( ULONG nIndex )
+/*****************************************************************************/
+{
+ ULONG nConCount = mConnections.Count();
+
+ if ( nIndex < nConCount )
+ return mConnections.GetObject( nIndex );
+ return NULL;
+}
+
+/*****************************************************************************/
+Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )
+/*****************************************************************************/
+{
+ if ( mnObjectId != nStartId )
+ return NULL;
+
+ USHORT i;
+ Connector* pCon;
+ ULONG nConCount = mConnections.Count();
+
+ for ( i = 0; i < nConCount; i++ )
+ {
+ pCon = mConnections.GetObject( i );
+ if ( pCon->GetOtherWin( this )->GetId() == nEndId )
+ return pCon;
+ }
+ return NULL;
+}
+
+void ObjectWin::SetAllConnectorsUnvisible()
+{
+ Connector* pCon;
+ ULONG nConCount = mConnections.Count();
+ for ( ULONG i = 0; i < nConCount; i++ )
+ {
+ pCon = mConnections.GetObject( i );
+ if (pCon) pCon->SetVisibility( FALSE );
+ }
+}
+
+/*****************************************************************************/
+void ObjectWin::SetMarkMode( ULONG nMarkMode )
+/*****************************************************************************/
+{
+ //Wallpaper aWallpaper;
+
+ if ( nMarkMode == MARKMODE_DEFAULT )
+ {
+ if ( pDefaultWallpaper )
+ {
+ maObjWallpaper = GetBackground();
+ maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
+ SetBackground( maObjWallpaper );
+ SetTextColor( aDefaultColor );
+ }
+ }
+ else
+ {
+ mnMarkMode |= nMarkMode;
+ maObjWallpaper = GetBackground();
+ maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );
+ SetBackground( maObjWallpaper );
+ SetTextColor( COL_WHITE );
+ }
+
+ Invalidate();
+}
+
+/*****************************************************************************/
+void ObjectWin::UnsetMarkMode( ULONG nMarkMode )
+/*****************************************************************************/
+{
+ //Wallpaper aWallpaper;
+
+ ULONG nOldMode = mnMarkMode;
+ mnMarkMode &= ( !nMarkMode );
+
+ if ( nOldMode != mnMarkMode ) {
+ if ( mnMarkMode == MARKMODE_DEFAULT )
+ {
+ if ( pDefaultWallpaper )
+ {
+ maObjWallpaper = GetBackground();
+ maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
+ SetBackground( maObjWallpaper );
+ SetTextColor( aDefaultColor );
+ }
+ }
+ else
+ {
+ maObjWallpaper = GetBackground();
+ maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode
+ SetBackground( maObjWallpaper );
+ SetTextColor( COL_WHITE );
+ }
+ Invalidate();
+ }
+}
+
+/*****************************************************************************/
+void ObjectWin::MarkNeeded( BOOL bReset )
+/*****************************************************************************/
+{
+ Connector* pCon;
+ ObjectWin* pWin;
+
+ ULONG nConCount = mConnections.Count();
+ ULONG i;
+
+ for ( i = 0; i < nConCount; i++ )
+ {
+ pCon = mConnections.GetObject( i );
+ if ( pCon && !pCon->IsStart( this))
+ {
+ pWin = pCon->GetOtherWin( this );
+ if ( pWin )
+ {
+ if ( bReset )
+ pWin->UnsetMarkMode( MARKMODE_NEEDED );
+ else
+ pWin->SetMarkMode( MARKMODE_NEEDED );
+ pWin->MarkNeeded( bReset ); // recursive call
+ }
+ }
+ }
+}
+
+/*****************************************************************************/
+void ObjectWin::MarkDepending( BOOL bReset )
+/*****************************************************************************/
+{
+ //if ( !bReset )
+ // return;
+
+ Connector* pCon;
+ ObjectWin* pWin;
+
+ ULONG nConCount = mConnections.Count();
+ ULONG i;
+
+ for ( i = 0; i < nConCount; i++ )
+ {
+ pCon = mConnections.GetObject( i );
+ if ( pCon && pCon->IsStart( this) )
+ {
+ pWin = pCon->GetOtherWin( this );
+ if ( pWin )
+ {
+ if ( bReset )
+ pWin->UnsetMarkMode( MARKMODE_DEPENDING );
+ else
+ pWin->SetMarkMode( MARKMODE_DEPENDING );
+ pWin->MarkDepending( bReset ); // recursive call
+ }
+ }
+ }
+}
+
+/*****************************************************************************/
+void ObjectWin::Paint( const Rectangle& rRect )
+/*****************************************************************************/
+{
+ Size aWinSize = PixelToLogic( GetOutputSizePixel() );
+ Size aTextSize;
+ ByteString sbt = msBodyText; //debug
+ //sbt += " "; //debug
+ //sbt += ByteString::CreateFromInt32(mnMarkMode); //debug
+ aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
+ aTextSize.Height() = GetTextHeight();
+ Point aPos( aWinSize.Width() / 2 - aTextSize.Width() / 2,
+ aWinSize.Height() / 2 - aTextSize.Height() / 2 );
+
+ //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));
+ if (msBodyText =="null") //don't paint this "window"
+ {
+ Hide();
+ Invalidate();
+ } else
+ DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
+}
+
void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
/*****************************************************************************/
{
@@ -508,291 +508,317 @@ void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) pDevice->SetTextColor( GetTextColor() );
pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );
}
-} - -/*****************************************************************************/ -void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt ) -/*****************************************************************************/ -{ - //Notify Soldep to clear ObjectList - SetZOrder( NULL, WINDOW_ZORDER_FIRST ); - GrabFocus(); - - // workaround fuer vcl-bug -// GetWindow( WINDOW_REALPARENT)->Invalidate(); -// MyApp *pApp = (MyApp*)GetpApp(); -// SolDep *pSoldep = pApp->GetSolDep(); - - maMouseOffset = rMEvt.GetPosPixel(); - if ( rMEvt.IsLeft() ) - { - - if ( rMEvt.IsMod2() ) // alt + mouse click left - { - CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this ); - } - else { - CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this ); - } - if( rMEvt.GetClicks() == 2 ) - CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this ); - else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon()) - { - //((DepWin*)GetParent())->SaveSelectedObjWin(&this); - CaptureMouse(); - } - } -} - -/*****************************************************************************/ -void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt ) -/*****************************************************************************/ -{ - fprintf(stdout,"ObjectWin::MouseButtonUp\n"); - if ( rMEvt.IsLeft() ) - { - if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon()) - CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this ); -// ((DepWin*)GetParent())->NewConnector( this ); - else - { - CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this ); - if ( IsMouseCaptured() ) ReleaseMouse(); - } - } - else if ( rMEvt.IsRight() ) - { - USHORT i; - - while ( mnPopupStaticItems < mpPopup->GetItemCount() ) - { - mpPopup->RemoveItem( mnPopupStaticItems ); - } - - if ( mConnections.Count()) { - mpPopup->InsertSeparator(); - - for( i = 0; i < mConnections.Count() ; i++ ) - { - mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 )); - } - } - mbMenuExecute = TRUE; - mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel()); - } -} - -/*****************************************************************************/ -void ObjectWin::MouseMove( const MouseEvent& rMEvt ) -/*****************************************************************************/ -{ - if ( IsMouseCaptured() ) - { - USHORT i; - - Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset ); - - aNewWinPos.X() = Max( 0L, aNewWinPos.X()); - aNewWinPos.Y() = Max( 0L, aNewWinPos.Y()); - SetPosPixel( aNewWinPos ); - //int t = mConnections.Count(); - - for ( i=0; i < mConnections.Count();i++) - { - mConnections.GetObject( i )->UpdatePosition( this ); - } - } - else // !IsMouseCaptured() - { - if ( rMEvt.IsLeaveWindow() ) - aTipTimer.Stop(); - else - aTipTimer.Start(); - - MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel()); - - GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove - } -} - -/*****************************************************************************/ -USHORT ObjectWin::Save( SvFileStream& rOutFile ) -/*****************************************************************************/ -{ - return 0; -} - -/*****************************************************************************/ -USHORT ObjectWin::Load( SvFileStream& rInFile ) -/*****************************************************************************/ -{ - return 0; -} - -/*****************************************************************************/ -void ObjectWin::SetId( ULONG nId ) -/*****************************************************************************/ -{ - mnObjectId = nId; -} - -/*****************************************************************************/ -ULONG ObjectWin::GetId() -/*****************************************************************************/ -{ - return mnObjectId; -} - -/*****************************************************************************/ -void ObjectWin::UpdateConnectors() -/*****************************************************************************/ -{ - USHORT i; - - for ( i = 0; i < mConnections.Count(); i++ ) - { - mConnections.GetObject( i )->UpdatePosition( this ); - } -} - -IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l ) -{ - USHORT nItemId = mpPopup_l->GetCurItemId(); - - switch( nItemId ) - { - case OBJWIN_EDIT_TEXT : - DBG_ASSERT( FALSE,"edit"); - break; - case OBJWIN_REMOVE_WIN : -// DBG_ASSERT( FALSE,"remove"); -// DBG_ASSERT( mpDepperDontuseme,"remove"); - //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId()); - break; - case OBJWIN_ADD_CONNECTOR : -// DBG_ASSERT( FALSE,"add con"); - ((DepWin*)GetParent())->NewConnector( this ); - break; - case OBJWIN_VIEW_CONTENT : -// DBG_ASSERT( FALSE,"view cnt"); -// mpDepperDontuseme->ViewContent( msBodyText ); -// TBD: CallEventListener - break; - default : -// DBG_ASSERT( FALSE, String (nItemId) ); - Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1); - pCon = 0; -// delete pCon; -// mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId()); -// TBD: CallEventListener - - break; - } - return 0; -} - -/*****************************************************************************/ -IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG ) -/*****************************************************************************/ -{ - aTipTimer.Stop(); - - if ( msTipText.Len()) { - Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel()); - Help::ShowBalloon( GetpApp()->GetAppWindow(), - Point( aPos.X(), aPos.Y()), - String( msTipText, RTL_TEXTENCODING_UTF8 )); - } - return 0; -} - -/*****************************************************************************/ -//void ObjectWin::GetFocus() -/*****************************************************************************/ -//{ - //SetMarkMode( MARKMODE_SELECTED ); -//} - -/*****************************************************************************/ -void ObjectWin::LoseFocus() -/*****************************************************************************/ -{ - if ( !mbMenuExecute && !msbHideMode ) { - UnsetMarkMode( MARKMODE_SELECTED ); - UnsetMarkMode( MARKMODE_ACTIVATED ); - MarkNeeded( TRUE ); - MarkDepending( TRUE ); - } - else - mbMenuExecute = FALSE; -} - -/*****************************************************************************/ -IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l ) -/*****************************************************************************/ -{ - mbMenuExecute = FALSE; - - if ( !HasFocus()) { - UnsetMarkMode( MARKMODE_SELECTED ); - UnsetMarkMode( MARKMODE_ACTIVATED ); - MarkNeeded( TRUE ); - MarkDepending( TRUE ); - } - - return 0; -} - -/*****************************************************************************/ -void ObjectWin::Command( const CommandEvent& rEvent) -/*****************************************************************************/ -{ - fprintf(stdout, "ObjectWin::Command"); -// mpDepperDontuseme->GetGraphWin()->Command( rEvent ); -// TBD: CallEventListener - -} - -/*****************************************************************************/ -/*****************************************************************************/ - -ObjectList::ObjectList() : ObjWinList() -{ -} - -/*****************************************************************************/ -void ObjectList::ResetSelectedObject() -/*****************************************************************************/ -{ -// return; - - ULONG nCount_l = Count(); - ObjectWin* pObjectWin = NULL; - for (ULONG i=0; i < nCount_l; i++ ) - { - pObjectWin = GetObject( i ); - pObjectWin->UnsetMarkMode( MARKMODE_SELECTED ); - pObjectWin->UnsetMarkMode( MARKMODE_NEEDED ); - pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING ); - pObjectWin->SetActualWallpaper(*pDefaultWallpaper); - pObjectWin->SetAllConnectorsUnvisible(); - } - return; -} - -/*****************************************************************************/ -ObjectWin* ObjectList::GetPtrByName( const ByteString& rText ) -/*****************************************************************************/ -{ - ULONG i = 0; - ULONG nCount_l = Count(); - ObjectWin* pObjectWin = NULL; - while ( i < nCount_l ) - { - pObjectWin = GetObject( i ); - ByteString sPrj = pObjectWin->GetBodyText(); - if (sPrj == rText) return pObjectWin; - i++; - } - return 0; +}
+
+/*****************************************************************************/
+void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+ //Notify Soldep to clear ObjectList
+ SetZOrder( NULL, WINDOW_ZORDER_FIRST );
+ GrabFocus();
+
+ // workaround fuer vcl-bug
+// GetWindow( WINDOW_REALPARENT)->Invalidate();
+// MyApp *pApp = (MyApp*)GetpApp();
+// SolDep *pSoldep = pApp->GetSolDep();
+
+ maMouseOffset = rMEvt.GetPosPixel();
+ if ( rMEvt.IsLeft() )
+ {
+
+ if ( rMEvt.IsMod2() ) // alt + mouse click left
+ {
+ CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );
+ }
+ else {
+ CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );
+ }
+ if( rMEvt.GetClicks() == 2 )
+ CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );
+ else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())
+ {
+ //((DepWin*)GetParent())->SaveSelectedObjWin(&this);
+ CaptureMouse();
+ }
+ }
+}
+
+/*****************************************************************************/
+void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+ fprintf(stdout,"ObjectWin::MouseButtonUp\n");
+ if ( rMEvt.IsLeft() )
+ {
+ if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())
+ CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );
+// ((DepWin*)GetParent())->NewConnector( this );
+ else
+ {
+ CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );
+ if ( IsMouseCaptured() ) ReleaseMouse();
+ }
+ }
+ else if ( rMEvt.IsRight() )
+ {
+ USHORT i;
+
+ while ( mnPopupStaticItems < mpPopup->GetItemCount() )
+ {
+ mpPopup->RemoveItem( mnPopupStaticItems );
+ }
+
+ if ( mConnections.Count()) {
+ mpPopup->InsertSeparator();
+
+ for( i = 0; i < mConnections.Count() ; i++ )
+ {
+ mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
+ }
+ }
+ mbMenuExecute = TRUE;
+ mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());
+ }
+}
+
+/*****************************************************************************/
+void ObjectWin::MouseMove( const MouseEvent& rMEvt )
+/*****************************************************************************/
+{
+ if ( IsMouseCaptured() )
+ {
+ USHORT i;
+
+ Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );
+
+ aNewWinPos.X() = Max( 0L, aNewWinPos.X());
+ aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
+ SetPosPixel( aNewWinPos );
+ //int t = mConnections.Count();
+
+ for ( i=0; i < mConnections.Count();i++)
+ {
+ mConnections.GetObject( i )->UpdatePosition( this );
+ }
+ }
+ else // !IsMouseCaptured()
+ {
+ if ( rMEvt.IsLeaveWindow() )
+ aTipTimer.Stop();
+ else
+ aTipTimer.Start();
+
+ MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());
+
+ GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove
+ }
+}
+
+/*****************************************************************************/
+USHORT ObjectWin::Save( SvFileStream& rOutFile )
+/*****************************************************************************/
+{
+ return 0;
+}
+
+/*****************************************************************************/
+USHORT ObjectWin::Load( SvFileStream& rInFile )
+/*****************************************************************************/
+{
+ return 0;
+}
+
+/*****************************************************************************/
+void ObjectWin::SetId( ULONG nId )
+/*****************************************************************************/
+{
+ mnObjectId = nId;
+}
+
+/*****************************************************************************/
+ULONG ObjectWin::GetId()
+/*****************************************************************************/
+{
+ return mnObjectId;
+}
+
+/*****************************************************************************/
+void ObjectWin::UpdateConnectors()
+/*****************************************************************************/
+{
+ USHORT i;
+
+ for ( i = 0; i < mConnections.Count(); i++ )
+ {
+ mConnections.GetObject( i )->UpdatePosition( this );
+ }
+}
+
+IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
+{
+ USHORT nItemId = mpPopup_l->GetCurItemId();
+
+ switch( nItemId )
+ {
+ case OBJWIN_EDIT_TEXT :
+ DBG_ASSERT( FALSE,"edit");
+ break;
+ case OBJWIN_REMOVE_WIN :
+// DBG_ASSERT( FALSE,"remove");
+// DBG_ASSERT( mpDepperDontuseme,"remove");
+ //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());
+ break;
+ case OBJWIN_ADD_CONNECTOR :
+// DBG_ASSERT( FALSE,"add con");
+ ((DepWin*)GetParent())->NewConnector( this );
+ break;
+ case OBJWIN_VIEW_CONTENT :
+// DBG_ASSERT( FALSE,"view cnt");
+// mpDepperDontuseme->ViewContent( msBodyText );
+// TBD: CallEventListener
+ break;
+ default :
+// DBG_ASSERT( FALSE, String (nItemId) );
+ Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
+ pCon = 0;
+// delete pCon;
+// mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
+// TBD: CallEventListener
+
+ break;
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )
+/*****************************************************************************/
+{
+ aTipTimer.Stop();
+
+ if ( msTipText.Len()) {
+ Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());
+ Help::ShowBalloon( GetpApp()->GetAppWindow(),
+ Point( aPos.X(), aPos.Y()),
+ String( msTipText, RTL_TEXTENCODING_UTF8 ));
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+//void ObjectWin::GetFocus()
+/*****************************************************************************/
+//{
+ //SetMarkMode( MARKMODE_SELECTED );
+//}
+
+/*****************************************************************************/
+void ObjectWin::LoseFocus()
+/*****************************************************************************/
+{
+ if ( !mbMenuExecute && !msbHideMode ) {
+ UnsetMarkMode( MARKMODE_SELECTED );
+ UnsetMarkMode( MARKMODE_ACTIVATED );
+ MarkNeeded( TRUE );
+ MarkDepending( TRUE );
+ }
+ else
+ mbMenuExecute = FALSE;
+}
+
+/*****************************************************************************/
+IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
+/*****************************************************************************/
+{
+ mbMenuExecute = FALSE;
+
+ if ( !HasFocus()) {
+ UnsetMarkMode( MARKMODE_SELECTED );
+ UnsetMarkMode( MARKMODE_ACTIVATED );
+ MarkNeeded( TRUE );
+ MarkDepending( TRUE );
+ }
+
+ return 0;
+}
+
+/*****************************************************************************/
+void ObjectWin::Command( const CommandEvent& rEvent)
+/*****************************************************************************/
+{
+ fprintf(stdout, "ObjectWin::Command");
+// mpDepperDontuseme->GetGraphWin()->Command( rEvent );
+// TBD: CallEventListener
+
+}
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+ObjectList::ObjectList() : ObjWinList()
+{
+}
+
+/*****************************************************************************/
+void ObjectList::ResetSelectedObject()
+/*****************************************************************************/
+{
+// return;
+
+ ULONG nCount_l = Count();
+ ObjectWin* pObjectWin = NULL;
+ for (ULONG i=0; i < nCount_l; i++ )
+ {
+ pObjectWin = GetObject( i );
+ pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
+ pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );
+ pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );
+ pObjectWin->SetActualWallpaper(*pDefaultWallpaper);
+ pObjectWin->SetAllConnectorsUnvisible();
+ }
+ return;
+}
+
+/*****************************************************************************/
+ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
+/*****************************************************************************/
+{
+ ULONG i = 0;
+ ULONG nCount_l = Count();
+ ObjectWin* pObjectWin = NULL;
+ while ( i < nCount_l )
+ {
+ pObjectWin = GetObject( i );
+ ByteString sPrj = pObjectWin->GetBodyText();
+ if (sPrj == rText) return pObjectWin;
+ i++;
+ }
+ return 0;
+}
+
+ObjectList* ObjectList::FindTopLevelModules()
+{
+ ObjectList* pList = new ObjectList;
+ for ( USHORT i=0; i<Count(); i++ )
+ {
+ ObjectWin* pObjectWin = GetObject( i );
+ if ( pObjectWin->IsTop() )
+ pList->Insert( pObjectWin );
+ }
+
+ return pList;
+}
+
+BOOL ObjectWin::IsTop()
+{
+ ULONG nConCount = mConnections.Count();
+ for ( ULONG i = 0; i < nConCount; i++ )
+ {
+ Connector* pCon = mConnections.GetObject( i );
+ if ( pCon && pCon->IsStart( this) )
+ return FALSE;
+ }
+
+ return TRUE;
}
\ No newline at end of file diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index 6c6abf80c33b..bc4d096f764e 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -1,243 +1,243 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: soldep.cxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -//TBD: ToolBox handling prjview/back - -#include <osl/file.hxx> -#include <rtl/ustring.hxx> -#include <tools/debug.hxx> -#include <bootstrp/sstring.hxx> -#include <svtools/filedlg.hxx> -#include <tools/iparser.hxx> -#include <tools/geninfo.hxx> +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soldep.cxx,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+//TBD: ToolBox handling prjview/back
+
+#include <osl/file.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/debug.hxx>
+#include <bootstrp/sstring.hxx>
+#include <svtools/filedlg.hxx>
+#include <tools/iparser.hxx>
+#include <tools/geninfo.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/bitmap.hxx>
-#include <appdef.hxx> -#include "time.h" -#include <soldep/depper.hxx> -#include <soldep/soldep.hxx> -#include <soldep/soldlg.hxx> -#include "dtsodcmp.hrc" - -IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* ); -//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* ); -#define EVENT_RESIZE 0x00000001 -#define MIN(a,b) (a)<(b)?(a):(b) -#define MAX(a,b) (a)>(b)?(a):(b) - - -//ByteString sDelimiterLine("#=========================================================================="); - - -// -// class SolDep -// - -/*****************************************************************************/ -SolDep::SolDep( Window* pBaseWindow ) -/*****************************************************************************/ - : Depper( pBaseWindow ), - mbBServer(FALSE), - mpTravellerList( NULL ), - mbIsHide( FALSE ) -{ - mnSolWinCount = 0; - mnSolLastId = 0; -// mpPrjIdMapper = new SolIdMapper( 63997 ); - maTaskBarFrame.EnableAlwaysOnTop(); - maTaskBarFrame.Show(); - maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 )); - maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect )); - maToolBox.Show(); - - mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener )); - - // Kontext-Menue (gehrt zu soldep.cxx) - InitContextMenueMainWnd(); - InitContextMenuePrjViewWnd( mpBasePrjWin ); -} - -/*****************************************************************************/ -SolDep::~SolDep() -/*****************************************************************************/ -{ - mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) ); - delete mpSolIdMapper; - delete mpStarWriter; - delete mpStandLst; -} - -/*****************************************************************************/ -void SolDep::Init() -/*****************************************************************************/ -{ - InformationParser aParser; - String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US ); - mpStandLst = aParser.Execute( sStandLst ); - ByteString aUpdater( getenv("UPDATER") ); - if ( mpStandLst && (aUpdater == "YES") ) { - if ( GetVersion() ) - ReadSource( TRUE ); - } else - { - ReadSource(); // if stand.lst isn't available - } -} - -/*****************************************************************************/ -void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList ) -/*****************************************************************************/ -{ - // Interface for bs - mbBServer=TRUE; - if ( pVersionList ) - mpStandLst = new GenericInformationList( *pVersionList ); - else { - InformationParser aParser; - String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US ); - mpStandLst = aParser.Execute( sStandLst ); - } - if ( mpStandLst ) { - msVersionMajor = ByteString( rVersion ); - ReadSource(TRUE); //call from build server set UPDATER to TRUE - } -} - -/*****************************************************************************/ -IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent ) -/*****************************************************************************/ -{ - if ( pEvent && pEvent->ISA( VclWindowEvent ) ) - { - ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) ); - } - return 0; -} - - -/*****************************************************************************/ -void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent ) -/*****************************************************************************/ -{ - Window* pChildWin = _rVclWindowEvent.GetWindow(); -// Window* pParentWin = pChildWin->GetParent(); -//Resize(); - if ( isAlive() ) - { - ULONG id = _rVclWindowEvent.GetId(); - switch ( id ) - { - case VCLEVENT_USER_MOUSEBUTTON_DOWN: - { - ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); - if( pObjWin ) - { - // handle mouse click on ObjectWin object - ObjectWin* pWin = (ObjectWin*) pChildWin; - //GetObjectList()->ResetSelectedObject(); - if (IsHideMode()) // simple mouse click left - { - pWin->CaptureMouse(); - pWin->SetMarkMode( MARKMODE_SELECTED ); - pWin->MarkNeeded(); - pWin->MarkDepending(); - pWin->Invalidate(); - } else - { - pWin->LoseFocus(); - pWin->SetMarkMode( MARKMODE_SELECTED ); - pWin->UnsetMarkMode( MARKMODE_ACTIVATED ); - pWin->MarkNeeded( TRUE ); - pWin->MarkDepending( TRUE ); - } - - } - } - break; - case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT: - { - ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); - if( pObjWin ) - { - ObjectWin* pWin = (ObjectWin*) pChildWin; - MarkObjects( pWin ); - } - } - break; - case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK: - { - ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); - if( pObjWin ) - { - if (IsHideMode()) ToggleHideDependency(); - ByteString text = ((ObjectWin*) pChildWin)->GetBodyText(); - ViewContent(text); - } - } - break; - case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT: - { - ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); - if( pObjWin ) - { - ObjectWin* pWin = (ObjectWin*) pChildWin; - GetDepWin()->NewConnector( pWin ); - } - } - break; - case VCLEVENT_USER_MOUSEBUTTON_UP: - { - ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); - if( pObjWin ) - { - ObjectWin* pWin = (ObjectWin*) pChildWin; - pWin->ReleaseMouse(); - pWin->SetMarkMode(MARKMODE_SELECTED); - GetDepWin()->Invalidate(); - } - } - break; - } // switch - } // if isAlive - //fprintf(stdout,"BLA::Resize: %d\n",pChildWin); -} - -/*****************************************************************************/ -IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) -/*****************************************************************************/ -{ - USHORT nItemId = pBox->GetCurItemId(); - switch ( nItemId ) - { - case TID_SOLDEP_FIND: - FindProject(); - break; +#include <appdef.hxx>
+#include "time.h"
+#include <soldep/depper.hxx>
+#include <soldep/soldep.hxx>
+#include <soldep/soldlg.hxx>
+#include "dtsodcmp.hrc"
+
+IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
+//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );
+#define EVENT_RESIZE 0x00000001
+#define MIN(a,b) (a)<(b)?(a):(b)
+#define MAX(a,b) (a)>(b)?(a):(b)
+
+
+//ByteString sDelimiterLine("#==========================================================================");
+
+
+//
+// class SolDep
+//
+
+/*****************************************************************************/
+SolDep::SolDep( Window* pBaseWindow )
+/*****************************************************************************/
+ : Depper( pBaseWindow ),
+ mbBServer(FALSE),
+ mpTravellerList( NULL ),
+ mbIsHide( FALSE )
+{
+ mnSolWinCount = 0;
+ mnSolLastId = 0;
+// mpPrjIdMapper = new SolIdMapper( 63997 );
+ maTaskBarFrame.EnableAlwaysOnTop();
+ maTaskBarFrame.Show();
+ maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
+ maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));
+ maToolBox.Show();
+
+ mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));
+
+ // Kontext-Menue (gehrt zu soldep.cxx)
+ InitContextMenueMainWnd();
+ InitContextMenuePrjViewWnd( mpBasePrjWin );
+}
+
+/*****************************************************************************/
+SolDep::~SolDep()
+/*****************************************************************************/
+{
+ mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );
+ delete mpSolIdMapper;
+ delete mpStarWriter;
+ delete mpStandLst;
+}
+
+/*****************************************************************************/
+void SolDep::Init()
+/*****************************************************************************/
+{
+ InformationParser aParser;
+ String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
+ mpStandLst = aParser.Execute( sStandLst );
+ ByteString aUpdater( getenv("UPDATER") );
+ if ( mpStandLst && (aUpdater == "YES") ) {
+ if ( GetVersion() )
+ ReadSource( TRUE );
+ } else
+ {
+ ReadSource(); // if stand.lst isn't available
+ }
+}
+
+/*****************************************************************************/
+void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )
+/*****************************************************************************/
+{
+ // Interface for bs
+ mbBServer=TRUE;
+ if ( pVersionList )
+ mpStandLst = new GenericInformationList( *pVersionList );
+ else {
+ InformationParser aParser;
+ String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
+ mpStandLst = aParser.Execute( sStandLst );
+ }
+ if ( mpStandLst ) {
+ msVersionMajor = ByteString( rVersion );
+ ReadSource(TRUE); //call from build server set UPDATER to TRUE
+ }
+}
+
+/*****************************************************************************/
+IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )
+/*****************************************************************************/
+{
+ if ( pEvent && pEvent->ISA( VclWindowEvent ) )
+ {
+ ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
+ }
+ return 0;
+}
+
+
+/*****************************************************************************/
+void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
+/*****************************************************************************/
+{
+ Window* pChildWin = _rVclWindowEvent.GetWindow();
+// Window* pParentWin = pChildWin->GetParent();
+//Resize();
+ if ( isAlive() )
+ {
+ ULONG id = _rVclWindowEvent.GetId();
+ switch ( id )
+ {
+ case VCLEVENT_USER_MOUSEBUTTON_DOWN:
+ {
+ ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+ if( pObjWin )
+ {
+ // handle mouse click on ObjectWin object
+ ObjectWin* pWin = (ObjectWin*) pChildWin;
+ //GetObjectList()->ResetSelectedObject();
+ if (IsHideMode()) // simple mouse click left
+ {
+ pWin->CaptureMouse();
+ pWin->SetMarkMode( MARKMODE_SELECTED );
+ pWin->MarkNeeded();
+ pWin->MarkDepending();
+ pWin->Invalidate();
+ } else
+ {
+ pWin->LoseFocus();
+ pWin->SetMarkMode( MARKMODE_SELECTED );
+ pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
+ pWin->MarkNeeded( TRUE );
+ pWin->MarkDepending( TRUE );
+ }
+
+ }
+ }
+ break;
+ case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
+ {
+ ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+ if( pObjWin )
+ {
+ ObjectWin* pWin = (ObjectWin*) pChildWin;
+ MarkObjects( pWin );
+ }
+ }
+ break;
+ case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
+ {
+ ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+ if( pObjWin )
+ {
+ if (IsHideMode()) ToggleHideDependency();
+ ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
+ ViewContent(text);
+ }
+ }
+ break;
+ case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
+ {
+ ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+ if( pObjWin )
+ {
+ ObjectWin* pWin = (ObjectWin*) pChildWin;
+ GetDepWin()->NewConnector( pWin );
+ }
+ }
+ break;
+ case VCLEVENT_USER_MOUSEBUTTON_UP:
+ {
+ ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+ if( pObjWin )
+ {
+ ObjectWin* pWin = (ObjectWin*) pChildWin;
+ pWin->ReleaseMouse();
+ pWin->SetMarkMode(MARKMODE_SELECTED);
+ GetDepWin()->Invalidate();
+ }
+ }
+ break;
+ } // switch
+ } // if isAlive
+ //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
+}
+
+/*****************************************************************************/
+IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
+/*****************************************************************************/
+{
+ USHORT nItemId = pBox->GetCurItemId();
+ switch ( nItemId )
+ {
+ case TID_SOLDEP_FIND:
+ FindProject();
+ break;
case TID_SOLDEP_CREATEMETA :
{
VirtualDevice aVDev;
@@ -282,1515 +282,1529 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
aMtf.Write( aStream );
break;
- } - case TID_SOLDEP_HIDE_INDEPENDEND: - { - ToggleHideDependency(); + }
+ case TID_SOLDEP_HIDE_INDEPENDEND:
+ {
+ ToggleHideDependency();
for ( USHORT i=0; i<mpObjectList->Count(); i++ )
mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
- - maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode()); - GetDepWin()->Invalidate(); //repaint Main-View - } - break; - case TID_SOLDEP_SELECT_WORKSPACE: - if (mpStandLst) - { - if (GetVersion()) // Version dialog box - { - delete mpSolIdMapper; - delete mpStarWriter; - mpObjectList->ClearAndDelete(); - ReadSource(TRUE); - } - } - break; - case TID_SOLDEP_BACK: - maToolBox.HideItem(TID_SOLDEP_BACK); - maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE); //disabled for prj view (doubleclick ObjWin) - maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND); //disabled for prj view (doubleclick ObjWin) - maToolBox.ShowItem(TID_SOLDEP_FIND); //disabled for prj view (doubleclick ObjWin) - maToolBox.Resize(); - TogglePrjViewStatus(); - break; - } - return 0; -} - -/*****************************************************************************/ -void SolDep::ToggleHideDependency() -/*****************************************************************************/ -{ - mbIsHide = !mbIsHide; - maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode()); - ObjectWin* pWin = GetObjectList()->GetObject( 0 ); - pWin->ToggleHideMode(); -}; - -/*****************************************************************************/ -BOOL SolDep::GetVersion() -/*****************************************************************************/ -{ - SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst ); - if ( aVersionDlg.Execute() == RET_OK ) { - msVersionMajor = aVersionDlg.GetVersionMajor(); - msVersionMinor = aVersionDlg.GetVersionMinor(); - return TRUE; - } - return FALSE; -} - -void SolDep::InitContextMenueMainWnd() -{ - InitContextMenuePrjViewWnd( mpBaseWin ); - return; // Disable not actually supported items - - mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ; - mpBaseWin->mpPopup->InsertSeparator(); - mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") ); - mpBaseWin->mpPopup->InsertSeparator(); - mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") ); - mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") ); -} - -void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin ) -{ - // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") ); - pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") ); - pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") ); - pBaseWin->mpPopup->InsertSeparator(); - // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") ); - pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") ); -} - -/*****************************************************************************/ -ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete ) -/*****************************************************************************/ -{ - Prj* pPrj; - -//hshtable auf stand halten - ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE ); - if ( pWin ) - { - ByteString aBodyText( pWin->GetBodyText() ); - if( (pPrj = mpStarWriter->GetPrj( aBodyText )) ) - { - mpStarWriter->Remove( pPrj ); -//cleanup ist teuer... - mpStarWriter->CleanUp(); - delete pPrj; - } - else - DBG_ASSERT( FALSE, "project not found - write" ); - - mpSolIdMapper->Delete( aBodyText ); - if ( bDelete ) - delete pWin; - return pWin; - } - else - return NULL; -} - -/*****************************************************************************/ -ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract ) -/*****************************************************************************/ -{ - ULONG nObjectId; - if ( bInteract ) - { - nObjectId = HandleNewPrjDialog( rBodyText ); - } - else - { -//hashtable auf stand halten - MyHashObject* pHObject; - nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE ); - pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId )); - mpSolIdMapper->Insert( rBodyText, pHObject ); - } - return nObjectId; -} - -/*****************************************************************************/ -ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract ) -/*****************************************************************************/ -{ - ULONG nObjectId; - if ( bInteract ) - { - nObjectId = HandleNewDirectoryDialog( rBodyText ); - } - else - { -//hshtable auf stand halten - MyHashObject* pHObject; - nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText ); - pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId )); - mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper - } - return nObjectId; -} - -/*****************************************************************************/ -USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) -/*****************************************************************************/ -{ -// DBG_ASSERT( FALSE , "not yet" ); - ByteString sEndName = pEndWin->GetBodyText(); - ByteString sStartName = pStartWin->GetBodyText(); - - Prj* pPrj = mpStarWriter->GetPrj( sEndName ); - if ( pPrj ) - { - pPrj->AddDependencies( sStartName ); - return AddConnectorToObjects( pStartWin, pEndWin ); - } - else - { - DBG_ASSERT( FALSE , "non existing Project" ); - return 1; - } -} - -/*****************************************************************************/ -USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) -/*****************************************************************************/ -{ - SByteStringList* pPrjDeps = NULL; - ByteString sEndName = pEndWin->GetBodyText(); - ByteString sStartName = pStartWin->GetBodyText(); - - Prj* pPrj = mpStarWriter->GetPrj( sEndName ); - pPrjDeps = pPrj->GetDependencies( FALSE ); - if ( pPrjDeps ) - { - ByteString* pString; - ULONG nPrjDepsCount = pPrjDeps->Count(); - for ( ULONG j = nPrjDepsCount; j > 0; j-- ) - { - pString = pPrjDeps->GetObject( j - 1 ); - if ( pString->GetToken( 0, '.') == sStartName ) - pPrjDeps->Remove( pString ); - } - } - - return RemoveConnectorFromObjects( pStartWin, pEndWin ); -} - -/*****************************************************************************/ -void SolDep::RemoveAllObjects( ObjectList* pObjLst ) -/*****************************************************************************/ -{ - - Depper::RemoveAllObjects( pObjLst ); - - if ( mpSolIdMapper ) - { - delete mpSolIdMapper; - mpSolIdMapper = NULL; - } - if ( mpStarWriter ) - { - delete mpStarWriter; - mpStarWriter = NULL; - } -} - -/*****************************************************************************/ -ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList) -/*****************************************************************************/ -{ -// DBG_ASSERT( FALSE , "soldep" ); - MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project - - if ( !pHObject ) { - ByteString sNullPrj = "null";//null_project - ULONG nObjectId = AddObject( sNullPrj, FALSE ); - ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 ); - return nObjectId; - } - - return pHObject->GetId(); -} - -/*****************************************************************************/ -ULONG SolDep::GetStartPrj(SolIdMapper* pIdMapper, ObjectList* pObjList) -/*****************************************************************************/ -{ -// DBG_ASSERT( FALSE , "prjdep" ); - MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir - if ( !pHObject ) - { - ByteString bsNull("null"); - ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir - return nObjectId; - } - else - return pHObject->GetId(); -} - -/*****************************************************************************/ -USHORT SolDep::OpenSource() -/*****************************************************************************/ -{ - if ( mpStandLst ) { - if ( GetVersion()) - return ReadSource(); - } - return 0; -} - -/*****************************************************************************/ -USHORT SolDep::ReadSource(BOOL bUpdater) -/*****************************************************************************/ -{ - mpBaseWin->EnablePaint( FALSE ); - mpBaseWin->Hide(); - ULONG nObjectId, nHashedId; - ULONG i; - MyHashObject* pHObject; - ByteString* pStr; - ObjectWin *pStartWin, *pEndWin; - - mpSolIdMapper = new SolIdMapper( 63997 ); - if (mpStandLst && bUpdater) - { - mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE ); - } else - { - SolarFileList* pSolarFileList; - pSolarFileList = GetPrjListFromDir(); - mpStarWriter = new StarWriter( pSolarFileList, TRUE ); - } - ByteString sTitle( SOLDEPL_NAME ); - if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) { - sTitle += ByteString( " - mode: single file [" ); - sTitle += (ByteString) mpStarWriter->GetName(); - sTitle += ByteString( "]" ); - } - else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) { - sTitle += ByteString( " - mode: multiple files [" ); - sTitle += ByteString( "]" ); - } - SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) ); - - ULONG nCount = mpStarWriter->Count(); - for ( i=0; i<nCount; i++ ) - { - Prj *pPrj = mpStarWriter->GetObject(i); - ByteString sPrjName = pPrj->GetProjectName(); - nObjectId = AddObject( sPrjName, FALSE ); - ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 ); - } - for ( i=0; i<nCount; i++ ) - { - Prj *pPrj = mpStarWriter->GetObject(i); - SByteStringList *pLst = pPrj->GetDependencies( FALSE ); - if ( pLst ) - { - ULONG nDepCount = pLst->Count(); - for ( ULONG m=0; m<nDepCount; m++) - { - pStr = pLst->GetObject(m); - pHObject = mpSolIdMapper->Find( *pStr ); - /*if ( !pHObject ) - { - // create new prj - Prj *pNewPrj = new Prj( *pStr ); - ByteString sPrjName = pNewPrj->GetProjectName(); - nObjectId = AddObject( sPrjName, FALSE ); - pHObject = mpSolIdMapper->Find( *pStr ); - ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 ); - }*/ - - if ( pHObject ) - { - nHashedId = pHObject->GetId(); - ByteString sF_Os2 = pPrj->GetProjectName(); - pStr = &sF_Os2; - pHObject = mpSolIdMapper->Find( *pStr ); - nObjectId = pHObject->GetId(); - pStartWin = ObjIdToPtr( mpObjectList, nHashedId ); - pEndWin = ObjIdToPtr( mpObjectList, nObjectId ); - AddConnectorToObjects( pStartWin, pEndWin ); - } - } - } - } - if (!IsPrjView()) - { - AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) ); - GetDepWin()->EnablePaint( TRUE ); - } - return 0; -} - -SolarFileList* SolDep::GetPrjListFromDir() -{ - SolarFileList* pSolarFileList = new SolarFileList(); - String sPrjDir( String::CreateFromAscii( "prj" )); - String sBuildLst( String::CreateFromAscii( "build.lst" )); - DirEntry aCurrent( getenv( SOURCEROOT ) ); - - aCurrent.ToAbs(); - Dir aDir( aCurrent, FSYS_KIND_DIR ); - - USHORT nEntries = aDir.Count(); - if( nEntries ) - { - UniStringList aSortDirList; - for ( USHORT n = 0; n < nEntries; n++ ) - { - DirEntry& rEntry = aDir[n]; - UniString aName( rEntry.GetName() ); - if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() ) - { - rEntry += DirEntry( sPrjDir ); - rEntry += DirEntry( sBuildLst ); - if (rEntry.Exists()) - { - pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND ); - ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8); - fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer()); - } - } - } - } - if ( !pSolarFileList->Count() ) - { - //is empty!! TBD - delete pSolarFileList; - return NULL; - } - return pSolarFileList; -} - -/*****************************************************************************/ -USHORT SolDep::WriteSource() -/*****************************************************************************/ -{ -/* zur Sicherheit deaktiviert - USHORT nMode = mpStarWriter->GetMode(); - if ( nMode == STAR_MODE_SINGLE_PARSE ) { - ByteString sFileName = mpStarWriter->GetName(); - if ( sFileName.Len()) { - mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) ); - mpStarWriter->RemoveProject( ByteString( "null")); //null_project - } - } - else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) { - // *OBO* - //String sRoot = mpStarWriter->GetSourceRoot(); - //nicht mehr untersttzt mpStarWriter->GetSourceRoot() - ByteString sFileName = mpStarWriter->GetName(); - DirEntry aEntry( sFileName ); - aEntry.ToAbs(); - aEntry = aEntry.GetPath().GetPath().GetPath(); - String sRoot = aEntry.GetFull(); - - if ( sRoot.Len()) { - mpStarWriter->RemoveProject( ByteString( "null")); //null_project - mpStarWriter->WriteMultiple( sRoot ); - } - } -*/ - return 1; -} - -USHORT SolDep::Load( const ByteString& rFileName ) -{ -// moved from depper class - DBG_ASSERT( FALSE , "you are dead!" ); - SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ ); - depper_head dh; - ULONG i; - ULONG nLoadOffs = mnSolLastId; //or Prj?? - ObjectWin* pNewWin; - aInFile.Read( &dh, sizeof( dh )); - - ULONG nObjCount = dh.nObjectCount; - ULONG nCnctrCount = dh.nCnctrCount; - - for ( i=0; i < nObjCount ; i++ ) - { - ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER ); - pWin->Load( aInFile ); - pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE )); - pNewWin->SetId( nLoadOffs + pWin->GetId()); - pNewWin->SetPosPixel( pWin->GetPosPixel()); - pNewWin->SetSizePixel( pWin->GetSizePixel()); - } - - ULONG nStartId; - ULONG nEndId; -// ueber addconnector fuehren! - for ( i=0; i < nCnctrCount ; i++ ) - { - Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER ); - pCon->Load( aInFile ); - - nStartId = nLoadOffs + pCon->GetStartId(); - nEndId = nLoadOffs + pCon->GetEndId(); - - ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId ); - ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId ); - - pCon->Initialize( pStartWin, pEndWin ); - } - - - return 0; -} - -/*****************************************************************************/ -BOOL SolDep::ViewContent( ByteString& rObjectName ) -/*****************************************************************************/ -{ - mpFocusWin = NULL; - SetPrjViewStatus(TRUE); - - for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ ) - if ( mpObjectList->GetObject( i )->HasFocus()) - mpFocusWin = mpObjectList->GetObject( i ); - //HideObjectsAndConnections( mpObjectList ); - mpProcessWin->Resize(); - GetDepWin()->Show(); - return InitPrj( rObjectName ); -} - -/*****************************************************************************/ -BOOL SolDep::InitPrj( ByteString& rListName ) -/*****************************************************************************/ -{ - ULONG nObjectId, nHashedId; - ULONG i, j; - MyHashObject* pHObject; - ByteString *pDepName; - ByteString *pFlagName; - Prj* pPrj; - ObjectWin *pStartWin, *pEndWin; - maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE); - maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND); - maToolBox.HideItem(TID_SOLDEP_FIND); - maToolBox.ShowItem(TID_SOLDEP_BACK); - maToolBox.Invalidate(); - - //clean up - mpObjectPrjList->ClearAndDelete(); - GetDepWin()->ClearConnectorList(); - if (mpPrjIdMapper) delete mpPrjIdMapper; - mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper - mnPrjWinCount = 0; - mnPrjLastId = 0; - - ULONG nCount = mpStarWriter->Count(); - GetDepWin()->EnablePaint( FALSE ); - Point aPnt = GetGraphWin()->GetPosPixel(); - Size aSize = GetGraphWin()->GetSizePixel(); - - GetGraphWin()->SetPosSizePixel( aPnt, aSize ); // Hier wird das Window gesetzt - - BOOL bReturn = FALSE; - - for ( i=0; i<nCount; i++ ) - { -// pPrj->GetProjectName() returns the name of -// the project e.g. svtools - pPrj = mpStarWriter->GetObject(i); - ByteString sPrjName = pPrj->GetProjectName(); - if ( sPrjName == rListName ) - { - bReturn = TRUE; - - mpPrj = mpStarWriter->GetObject(i); - ULONG nDirCount = mpPrj->Count(); - for ( j=0; j<nDirCount; j++ ) - { - CommandData *pData = mpPrj->GetObject(j); - fprintf( stdout, "\tProjectDir : %s\n", - pData->GetLogFile().GetBuffer()); -// pData->GetLogFile() contains internal project IDs -// e.g. st_mkout etc. - if ( pData->GetLogFile() != "" ) - { - ByteString sItem = pData->GetLogFile(); - nObjectId = AddPrjObject( sItem, FALSE); -// there may be faster ways...... - ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); - pWin->SetViewMask( 0x0001 ); -// pData->GetPath() contains internal project directories -// e.g. svtools/inc etc. - ByteString sPath = pData->GetPath(); - pWin->SetTipText( sPath ); - } - } - -// set connectors for dependencies here - for ( j=0; j<nDirCount; j++ ) - { - CommandData *pData = mpPrj->GetObject(j); - SByteStringList *pDeps = pData->GetDependencies(); - if ( pDeps ) - { - ByteString sFlagName = pData->GetLogFile(); - pFlagName = &sFlagName; - //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource() - pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.')); - if (pHObject) - { - - nObjectId = pHObject->GetId(); - - ULONG nDepCount = pDeps->Count(); - for ( ULONG k=0; k<nDepCount; k++ ) - { - pDepName = pDeps->GetObject(k); - pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.')); - if (pHObject ) - { - nHashedId = pHObject->GetId(); - pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId ); - pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); - - AddConnectorToObjects( pStartWin, pEndWin ); - } - else - { - String sMessage; - sMessage += String::CreateFromAscii("can't find "); - sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 ); - sMessage += String::CreateFromAscii(".\ndependency ignored"); - WarningBox aBox( GetDepWin(), WB_OK, sMessage); - aBox.Execute(); - } - } - } - } - - } - - break; - } - } - ByteString sNullDir = "null"; - nObjectId = AddPrjObject( sNullDir, FALSE); - ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); - pWin->SetViewMask( 0x0001 ); - mpGraphPrjWin->EnablePaint( TRUE ); - //debug -// int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList); -// ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l ); - AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) ); - mpGraphWin->Hide(); - mpGraphPrjWin->Show(); - mpGraphPrjWin->Invalidate(); - - return bReturn; -} - -/*****************************************************************************/ -USHORT SolDep::CloseWindow() -/*****************************************************************************/ -{ - - ((SystemWindow*)mpProcessWin)->Close(); - return 0; -} - -/*****************************************************************************/ -void SolDep::ShowHelp() -/*****************************************************************************/ -{ - SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ ); - String aHelpText; - ByteString aGetStr; - - if ( aHelpFile.IsOpen() ) - { - while ( aHelpFile.ReadLine( aGetStr ) ) - { - aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8); - aHelpText += String::CreateFromAscii("\n"); - } - } - else - aHelpText = String::CreateFromAscii("No Helpfile found."); - - SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP )); - aHelpDlg.maMLEHelp.SetText( aHelpText ); - aHelpDlg.maMLEHelp.SetReadOnly(); - aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE ); - aHelpDlg.Execute(); -} - -/*****************************************************************************/ -BOOL SolDep::FindProject() -/*****************************************************************************/ -{ - SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() ); - ObjectWin* pObjectWin = NULL; - mpObjectList->ResetSelectedObject(); - if (IsHideMode()) - { - GetDepWin()->Invalidate(); - } - - mpFocusWin=NULL; - - if ( aFindProjectDlg.Execute() == RET_OK ) { - msProject = aFindProjectDlg.GetProject(); - //now we have a project string - pObjectWin = mpObjectList->GetPtrByName( msProject ); - mpObjectList->ResetSelectedObject(); - MarkObjects( pObjectWin ); - } - return FALSE; -} - -BOOL SolDep::MarkObjects( ObjectWin* pObjectWin ) -{ - if (pObjectWin) - { - if (!(pObjectWin->IsNullObject())) - { - pObjectWin->SetMarkMode( MARKMODE_SELECTED ); - pObjectWin->MarkNeeded(); - pObjectWin->MarkDepending(); - if (IsHideMode()) - { - GetDepWin()->Invalidate(); - } - } else - { - fprintf(stdout,"null\n"); - } - } - return TRUE; -} - -void SolDep::Resize() -{ -//funzt! mu aber von der applikation aufgerufen werden. - Point aOutPos = Point( 0, 0 ); - Size aOutSize = mpProcessWin->GetOutputSizePixel(); - // calculate output size - ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height(); - ULONG nTaskWidth = maToolBox.CalcWindowSizePixel().Width(); - Size aSize( aOutSize.Width(), nTaskHeight ); - -// ULONG nMenuHeight = 0; - Point aGraphWinPos = Point(0,0); - Size aGraphWinSize = Size(0,0); - -//wei nicht wie: nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Hhe des Menues - - //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize ); - // Set Docking-Rectangle for ToolBar - Rectangle aInRect; - - if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP )) - { - // waagerechte Toolbar oben - maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height())); - if( maToolBox.IsVisible()) - { - Point aOutPosTmp; - Size aOutSizeTmp; - aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height()); - aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height()); - aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); - aGraphWinPos = Point( 0, nTaskHeight ); - aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight); - } - } - if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM )) - { - // waagerechte Toolbar unten - Point aTbPos = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height()); - Size aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()); - maToolBox.SetPosSizePixel( aTbPos, aTbSize ); - if( maToolBox.IsVisible()) - { - Point aOutPosTmp; - Size aOutSizeTmp; - aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height()); - aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height()); - aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); - aGraphWinPos = Point( 0, 0 ); - aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight); - } - } - if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT )) - { - // senkrechte ToolBar links - maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height())); - if( maToolBox.IsVisible()) - { - Point aOutPosTmp; - Size aOutSizeTmp; - aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y()); - aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()); - aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); - aGraphWinPos = Point( nTaskWidth, 0 ); - aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height()); - } - } - if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT )) - { - // senkrechte ToolBar rechts - Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y()); - Size aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()); - maToolBox.SetPosSizePixel( aTbPos, aTbSize); - if( maToolBox.IsVisible()) - { - Point aOutPosTmp; - Size aOutSizeTmp; - aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y()); - aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()); - aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); - aGraphWinPos = Point( 0, 0 ); - aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height()); - } - } - - Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos ) - Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top()) - Size( aOutSize.Width(), aOutSize.Height())); -/* - Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos ); - Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top()) - Size( aOutSize.Width(), aOutSize.Height())); -*/ - maToolBox.SetDockingRects( rout, rin ); - - BOOL bFloating = maToolBox.IsFloatingMode(); - - if ( bFloating ) - { - GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize); - //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize(); - if (maToolBox.IsVisible()) maToolBox.Show(); - } else - { - GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize ); - } - if (maToolBox.IsVisible()) maToolBox.Show(); -} - -USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) -{ -// DBG_ASSERT( FALSE , "not yet" ); - ByteString sEndName = pEndWin->GetBodyText(); - ByteString sStartName = pStartWin->GetBodyText(); - if ( sStartName != ByteString("null")) - { - CommandData* pEndData = mpPrj->GetDirectoryData( sEndName ); - SByteStringList* pDeps = pEndData->GetDependencies(); - if ( pDeps ) - pDeps->PutString( &sStartName ); - else - { - pDeps = new SByteStringList(); - pEndData->SetDependencies( pDeps ); - pDeps->PutString( &sStartName ); - pEndData->GetDependencies(); - } - } - return AddConnectorToObjects( pStartWin, pEndWin ); -} - -USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) -{ - ByteString sEndName = pEndWin->GetBodyText(); - ByteString sStartName = pStartWin->GetBodyText(); - CommandData* pEndData = mpPrj->GetDirectoryData( sEndName ); - SByteStringList* pDeps = pEndData->GetDependencies(); - if ( pDeps ) - { - ByteString* pString; - ULONG nDepsCount = pDeps->Count(); - for ( ULONG j = nDepsCount; j > 0; j-- ) - { - pString = pDeps->GetObject( j - 1 ); - if ( pString->GetToken( 0, '.') == sStartName ) - pDeps->Remove( pString ); - } - } - return RemoveConnectorFromObjects( pStartWin, pEndWin ); -} - -USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ) -{ - AutoArrangeDlgStart(); - OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID ); - AutoArrangeDlgStop(); - return 0; -} - -Point SolDep::CalcPos( USHORT nSet, USHORT nIndex ) -{ - int nRowIndex = nIndex / DEPPER_MAX_WIDTH; - ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING ); - - ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING; - Point aPos( nPosX, nPosY ); - return aPos; -} - -ULONG SolDep::CalcXOffset( ULONG nObjectsToFit ) -{ - long nDynXOffs; - long nXMiddle; - ULONG nTrigger; - - nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2; - if ( nObjectsToFit > DEPPER_MAX_WIDTH ) - nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2; - nTrigger = ( nObjectsToFit - 1 ) / 2; - nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger; - ULONG nXOffs = nXMiddle - nDynXOffs; - - if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs ) - mnMinDynXOffs = nXMiddle - nDynXOffs; - - return nXOffs; - -} - -double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType ) -{ - ObjectWin* pWin; - Connector* pCon; - ULONG nObjCount = pObjList->Count(); - double dRetVal = 0; - double dWinVal; - USHORT i, j; - BOOL bIsStart; - - for ( i = 0; i < nObjCount; i++ ) - { - pWin = pObjList->GetObject( i ); - - if ( pWin && pWin->IsVisible()) - { - j = 0; - dWinVal = 0; - while ( (pCon = pWin->GetConnector( j )) ) - { - if ( pCon->IsVisible()) { - bIsStart = pCon->IsStart( pWin ); - if ( eDistType != BOTH ) - if ( eDistType == TOPDOWN ) - { - if ( bIsStart ) - { - pCon->UpdatePosition( pWin, FALSE ); - dWinVal += pCon->GetLen() * pWin->mnHeadDist; - } - } - else - { - if ( !bIsStart ) - { - pCon->UpdatePosition( pWin, FALSE ); - dWinVal += pCon->GetLen() * pWin->mnRootDist; - } - - } - else - { - pCon->UpdatePosition( pWin, FALSE ); - if ( !bIsStart ) - dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 ); - else - dWinVal += pCon->GetLen() * pWin->mnRootDist; - } - } - j++; - } -// if ( j != 0 ) -// dWinVal /= j; - dRetVal += dWinVal; - } - } - - return dRetVal; -} - -USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth ) -{ - USHORT i = 0; - ObjectWin* pNewWin; - Connector* pCon; - - nDepth++; - - USHORT nMaxDepth = nDepth; - - pWin->mbVisited = TRUE; - pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist ); - if ( nDepth > DEPPER_MAX_DEPTH ) - { - DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabhngigkeit!" ); - nDepth++; - return DEP_ENDLES_RECURSION_FOUND; - } - - while ( (pCon = pWin->GetConnector( i )) ) - { - if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project - { - pNewWin = pCon->GetOtherWin( pWin ); - nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth ); - if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND ) - { - mpTravellerList->Insert( pWin, LIST_APPEND ); - return DEP_ENDLES_RECURSION_FOUND; - } - } - i++; - } - pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth ); - return nMaxDepth; -} - - -double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType ) -{ - - ULONG i, j, l; - ULONG nEnd = nStart + nSize; - ObjectWin* pSwapWin; - ULONG nLevelObjCount = rObjList.Count(); - -//dont use full recusion for more than 6 objects - if ( nLevelObjCount > 6 ) - { - srand(( unsigned ) time( NULL )); - - ULONG nIdx1, nIdx2; - for ( i = 0; i < 101; i++ ) - { - UpdateSubProgrssBar(i); - for ( j = 0; j < 100; j++ ) - { - nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); - while ( rObjList.GetObject( nIdx1 ) == NULL ) - nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); - nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); - while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount ) - nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); - - pSwapWin = rObjList.GetObject( nIdx1 ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] ); - pSwapWin = rObjList.Replace( pSwapWin, nIdx2 ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] ); - rObjList.Replace( pSwapWin, nIdx1 ); - - double dCurDist = CalcDistSum( &rObjList, eDistType ); - - if ( dCurDist < dMinDist ) - { - dMinDist = dCurDist; - rResultList.Clear(); - for ( l = 0; l < nLevelObjCount; l++ ) - { - pSwapWin = rObjList.GetObject( l ); - rResultList.Insert( pSwapWin, LIST_APPEND); - } - } -// if ( dCurDist > dMinDist * 1.5 ) - if ( dCurDist > dMinDist * 15 ) - { - pSwapWin = rObjList.GetObject( nIdx1 ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] ); - pSwapWin = rObjList.Replace( pSwapWin, nIdx2 ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] ); - rObjList.Replace( pSwapWin, nIdx1 ); - } - } - } - } - else - { - for ( i = nStart ; i < nEnd; i++) - { - if ( nSize > 1 ) - { - pSwapWin = rObjList.GetObject( i ); - pSwapWin = rObjList.Replace( pSwapWin, nStart ); - rObjList.Replace( pSwapWin, i ); - double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType ); - dMinDist = MIN( dMinDist, dPermuteDist); - pSwapWin = rObjList.GetObject( i ); - pSwapWin = rObjList.Replace( pSwapWin, nStart ); - rObjList.Replace( pSwapWin, i ); - - } - else - { - for ( l = 0; l < nLevelObjCount; l++ ) - { - pSwapWin = rObjList.GetObject( l ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( pPosArray[ l ] ); - } - - double dCurDist = CalcDistSum( &rObjList, eDistType ); - - if ( dCurDist < dMinDist ) - { - dMinDist = dCurDist; - rResultList.Clear(); - for ( l = 0; l < nLevelObjCount; l++ ) - { - pSwapWin = rObjList.GetObject( l ); - rResultList.Insert( pSwapWin, LIST_APPEND); - } - } - - } - } - } - - return dMinDist; -} - - -USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ) -{ - ObjWinList aWorkList; - ObjectWin* pWin; - Connector* pCon; - USHORT nRootDist = (USHORT) -1; - USHORT i, j, k, l, nRetVal; - USHORT LevelUse[ DEPPER_MAX_DEPTH ]; - USHORT LevelSecUse[ DEPPER_MAX_DEPTH ]; - ObjWinList* LevelList[ DEPPER_MAX_DEPTH ]; - ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ]; - Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ]; - - mnMinDynXOffs = 0xffff; - - for ( i = 0; i < DEPPER_MAX_DEPTH; i++ ) - { - LevelUse[ i ] = 0; - LevelList[ i ] = NULL; - LevelSecUse[ i ] = 0; - LevelSecList[ i ] = NULL; - } - - GetDepWin()->EnablePaint( FALSE ); - - ULONG nObjCount = pObjLst->Count(); - for ( i = 0; i < nObjCount; i++ ) - { - pWin = pObjLst->GetObject( i ); - if ( pWin->IsVisible()) { - pWin->mbVisited = FALSE; - pWin->mnHeadDist = 0; - pWin->mnRootDist = 0; - - // find initial objects which need to be connected with - // root object - j = 0; - USHORT nStartCount = 0; - USHORT nEndCount = 0; - while ( (pCon = pWin->GetConnector( j )) ) - { - if ( pCon->IsVisible()) { //null_project - if( pCon->IsStart( pWin )) - nStartCount++; - else - { - nEndCount = 1; - break; - } - } - j++; - } - - if ( nStartCount > 0 && nEndCount == 0 ) - if ( nTopId != pWin->GetId()) - AddConnectorToObjects( pObjLst, nTopId, pWin->GetId()); - - } - } - - pWin = ObjIdToPtr( pObjLst, nTopId ); - - if ( mpTravellerList ) - { - mpTravellerList->Clear(); - delete mpTravellerList; - } - mpTravellerList = new ObjWinList(); - // set root and top distance - nRetVal = Impl_Traveller( pWin, nRootDist ); - - DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" ); - if ( nRetVal == DEP_ENDLES_RECURSION_FOUND ) - { - WriteToErrorFile(); - return nRetVal; - } - - ULONG nUnvisited = 0; - ULONG nUnvisYOffs = 0; - - // seperate mainstream, secondary and unconnected - for ( i = 0; i < nObjCount; i++ ) - { - pWin = pObjLst->GetObject( i ); - if ( pWin->IsVisible()) { - if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal ) - { - if ( !LevelList[ pWin->mnHeadDist ] ) - LevelList[ pWin->mnHeadDist ] = new ObjWinList; - LevelList[ pWin->mnHeadDist ]->Insert( pWin ); - LevelUse[ pWin->mnHeadDist ]++; - } - else - if ( pWin->mbVisited ) - { - if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] ) - LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList; - LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin ); - LevelSecUse[ nRetVal - pWin->mnRootDist ]++; - } - else - { - // need to be arranged more intelligent... - Point aPos( 5, nUnvisYOffs ); - pWin->SetCalcPosPixel( aPos ); - - Point aTmpPos = pWin->GetCalcPosPixel(); - pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos )); - - nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height(); - nUnvisited++; - } - } - } - - mnLevelOffset = 0; - - USHORT nScaleVal; - - if ( nRetVal == 0 ) - nScaleVal = 1; - else - nScaleVal = nRetVal; - - i = 0; - - USHORT nStep = 0; - - while ( LevelList[ i ] ) - { - UpdateMainProgressBar(i, nScaleVal, nStep); - DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." ); - ObjectWin* pSwapWin; - ULONG nLevelObjCount = LevelList[ i ]->Count(); - - if ( nLevelObjCount % 2 == 0 ) - { - LevelList[ i ]->Insert( NULL, LIST_APPEND ); - nLevelObjCount++; -// LevelUse bleibt orginal... -// LevelUse[ i ]++; - } - -// catch too big lists - DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" ); - if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ) - { - WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking")); - aWBox.Execute(); - break; - } - mnXOffset = CalcXOffset( nLevelObjCount ); - aWorkList.Clear(); - - // initial positioning for mainstream - for ( j = 0; j < nLevelObjCount; j++ ) - { - pSwapWin = LevelList[ i ]->GetObject( j ); - aWorkList.Insert( pSwapWin, LIST_APPEND); - Point aPos = CalcPos( i, j ); - aPosArray[ j ] = aPos; - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - - double dMinDist = CalcDistSum( LevelList[ i ] ); - - // optimize mainstream order and return best matching list in "aWorkList" - dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount )); - - // set optimized positions - may still be wrong from later tries - for ( j = 0; j < nLevelObjCount; j++ ) - { - pSwapWin = aWorkList.GetObject( j ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - - if ( LevelSecList[ i ] != NULL ) - { - ULONG nLevelSecObjCount = LevelSecList[ i ]->Count(); - // expand list for better positioning - while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 ) - { - LevelSecList[ i ]->Insert( NULL, LIST_APPEND ); - nLevelSecObjCount++; - } - if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 ) - { - LevelSecList[ i ]->Insert( NULL, LIST_APPEND ); - nLevelSecObjCount++; - } - - DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" ); - if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ) - { - WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking")); - aWBox.Execute(); - break; - } - mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount ); - aWorkList.Clear(); - - l = 0; - BOOL bUsedPos; - - // find free positions for secondary objects - for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ ) - { - Point aPos = CalcPos( i, j ); - bUsedPos = FALSE; - // is already occupied? - for ( k = 0; k < nLevelObjCount; k++ ) - { - if ( LevelList[ i ]->GetObject( k ) ) - if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() ) - bUsedPos = TRUE; - } - // if its free, add to pool - if ( !bUsedPos ) - { - aPosArray[ l ] = aPos; - l++; - } - } - - // initial positioning for secodaries - for ( j = 0 ; j < nLevelSecObjCount ; j++ ) - { - pSwapWin = LevelSecList[ i ]->GetObject( j ); - aWorkList.Insert( pSwapWin, LIST_APPEND); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - dMinDist = CalcDistSum( LevelSecList[ i ] ); - - dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount )); - - // set optimized positions - may still be wrong from later tries - for ( j = 0; j < nLevelSecObjCount; j++ ) - { - pSwapWin = aWorkList.GetObject( j ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH ) - mnLevelOffset++; - } - if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH ) - mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ; - i++; - } - - mnMinDynXOffs = 0xffff; - -// and back again... - // get better results form already preoptimized upper and lower rows - - do - { - i--; - UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down - if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH ) - mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ; - ObjectWin* pSwapWin; - ULONG nLevelObjCount = LevelList[ i ]->Count(); - mnXOffset = CalcXOffset( nLevelObjCount ); - aWorkList.Clear(); - - for ( j = 0; j < nLevelObjCount; j++ ) - { - pSwapWin = LevelList[ i ]->GetObject( j ); - aWorkList.Insert( pSwapWin, LIST_APPEND); - Point aPos = CalcPos( i, j ); - aPosArray[ j ] = aPos; -//no need to do this stuff....... ????? - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - - double dMinDist = CalcDistSum( LevelList[ i ], BOTH ); - - dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH )); -// wrong position for remaping - keep old positions for comparing - for ( j = 0; j < nLevelObjCount; j++ ) - { - pSwapWin = aWorkList.GetObject( j ); - if ( pSwapWin ) -// pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] )); - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - - if ( LevelSecList[ i ] != NULL ) - { - ULONG nLevelSecObjCount = LevelSecList[ i ]->Count(); - mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount ); - aWorkList.Clear(); - - l = 0; - BOOL bUsedPos; - - for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ ) - { - Point aPos = CalcPos( i, j ); - bUsedPos = FALSE; -// could be faster - for ( k = 0; k < nLevelObjCount; k++ ) - { - if ( LevelList[ i ]->GetObject( k ) ) - if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() ) - bUsedPos = TRUE; - } - if ( !bUsedPos ) - { - aPosArray[ l ] = aPos; - l++; - } - } - - for ( j = 0 ; j < nLevelSecObjCount ; j++ ) - { - pSwapWin = LevelSecList[ i ]->GetObject( j ); - aWorkList.Insert( pSwapWin, LIST_APPEND); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - dMinDist = CalcDistSum( LevelSecList[ i ], BOTH ); - - dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH )); -// wrong position for remaping - keep old positions for comparing - for ( j = 0; j < nLevelSecObjCount; j++ ) - { - pSwapWin = aWorkList.GetObject( j ); - if ( pSwapWin ) - pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); - } - } -// i--; - } while ( i != 0 ); - SetMainProgressBar( 100 ); - - ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() ); - - // ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu man switchen GetStart/GetPrjStart oder so - - ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID); - - ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING; - if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize ) - nNewYSize = nUnvisYOffs + GetDefSize().Height(); - - MapMode aMapMode = GetDepWin()->GetMapMode(); - Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY()))); - - Size aNowSize( GetGraphWin()->GetSizePixel()); - - if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() ) - aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ; - - if ( GetDepWin()->LogicToPixel( aNowSize ).Height() > aTmpSize.Height() ) - aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ; - -// if ( nZoomed <= 0 ) -// { -// mpBaseWin->SetSizePixel( aTmpSize ); -// mpGraphWin->SetTotalSize( aTmpSize ); -// mpGraphWin->EndScroll( 0, 0 ); -// } - -// now remap all objects - ULONG nAllObjCount = pObjLst->Count(); - Point aTmpPos; - for ( j = 0; j < nAllObjCount; j++ ) - { - pWin = pObjLst->GetObject( j ); - if ( pWin->IsVisible()) { - aTmpPos = pWin->GetCalcPosPixel(); - if ( pWin->mbVisited ) - { -// reserve space for unconnected - aTmpPos.X() -= mnMinDynXOffs; - aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING; -// center window - aTmpPos.X() += GetDefSize().Width() / 2; - aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ; - } - pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos )); - } - } - aWorkList.Clear(); - GetDepWin()->EnablePaint( TRUE ); - GetDepWin()->Invalidate(); -//LevelListen loeschen H? Welche Levellisten? - -//Update all Connectors -// --> To be done: Don't call twice Object1-Connector-Object2 - ObjectWin* pObject1; - for ( i = 0 ; i < nObjCount ; i++) - { - pObject1 = pObjLst->GetObject( i ); - if ( pObject1->IsVisible()) - pObject1->UpdateConnectors(); - }; - return 0; -} - -void SolDep::WriteToErrorFile() -{ -//Needs some improvement - ObjectWin* pWin; - WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects")); - aWBox.Execute(); - char *tmpdir = getenv("TMP"); - char *errfilebasename = "depper.err"; - char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 ); - *ErrFileName = '\0'; - strcat( ErrFileName, tmpdir ); - strcat( ErrFileName, "\\" ); - strcat( ErrFileName, errfilebasename ); - FILE* pErrFile = fopen( "depper.err", "w+" ); - if ( pErrFile ) - { - for ( USHORT i = 0; i < mpTravellerList->Count(); i++ ) - { - pWin = mpTravellerList->GetObject( i ); - fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer()); - } - fclose( pErrFile ); - } -} +
+ maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
+ GetDepWin()->Invalidate(); //repaint Main-View
+ }
+ break;
+ case TID_SOLDEP_SELECT_WORKSPACE:
+ if (mpStandLst)
+ {
+ if (GetVersion()) // Version dialog box
+ {
+ delete mpSolIdMapper;
+ delete mpStarWriter;
+ mpObjectList->ClearAndDelete();
+ ReadSource(TRUE);
+ }
+ }
+ break;
+ case TID_SOLDEP_BACK:
+ maToolBox.HideItem(TID_SOLDEP_BACK);
+ maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE); //disabled for prj view (doubleclick ObjWin)
+ maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND); //disabled for prj view (doubleclick ObjWin)
+ maToolBox.ShowItem(TID_SOLDEP_FIND); //disabled for prj view (doubleclick ObjWin)
+ maToolBox.Resize();
+ TogglePrjViewStatus();
+ break;
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+void SolDep::ToggleHideDependency()
+/*****************************************************************************/
+{
+ mbIsHide = !mbIsHide;
+ maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
+ ObjectWin* pWin = GetObjectList()->GetObject( 0 );
+ pWin->ToggleHideMode();
+};
+
+/*****************************************************************************/
+BOOL SolDep::GetVersion()
+/*****************************************************************************/
+{
+ SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );
+ if ( aVersionDlg.Execute() == RET_OK ) {
+ msVersionMajor = aVersionDlg.GetVersionMajor();
+ msVersionMinor = aVersionDlg.GetVersionMinor();
+ return TRUE;
+ }
+ return FALSE;
+}
+
+void SolDep::InitContextMenueMainWnd()
+{
+ InitContextMenuePrjViewWnd( mpBaseWin );
+ return; // Disable not actually supported items
+
+ mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;
+ mpBaseWin->mpPopup->InsertSeparator();
+ mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );
+ mpBaseWin->mpPopup->InsertSeparator();
+ mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );
+ mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );
+}
+
+void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )
+{
+ // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );
+ pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );
+ pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );
+ pBaseWin->mpPopup->InsertSeparator();
+ // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );
+ pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );
+}
+
+/*****************************************************************************/
+ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
+/*****************************************************************************/
+{
+ Prj* pPrj;
+
+//hshtable auf stand halten
+ ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );
+ if ( pWin )
+ {
+ ByteString aBodyText( pWin->GetBodyText() );
+ if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
+ {
+ mpStarWriter->Remove( pPrj );
+//cleanup ist teuer...
+ mpStarWriter->CleanUp();
+ delete pPrj;
+ }
+ else
+ DBG_ASSERT( FALSE, "project not found - write" );
+
+ mpSolIdMapper->Delete( aBodyText );
+ if ( bDelete )
+ delete pWin;
+ return pWin;
+ }
+ else
+ return NULL;
+}
+
+/*****************************************************************************/
+ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )
+/*****************************************************************************/
+{
+ ULONG nObjectId;
+ if ( bInteract )
+ {
+ nObjectId = HandleNewPrjDialog( rBodyText );
+ }
+ else
+ {
+//hashtable auf stand halten
+ MyHashObject* pHObject;
+ nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );
+ pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
+ mpSolIdMapper->Insert( rBodyText, pHObject );
+ }
+ return nObjectId;
+}
+
+/*****************************************************************************/
+ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
+/*****************************************************************************/
+{
+ ULONG nObjectId;
+ if ( bInteract )
+ {
+ nObjectId = HandleNewDirectoryDialog( rBodyText );
+ }
+ else
+ {
+//hshtable auf stand halten
+ MyHashObject* pHObject;
+ nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
+ pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
+ mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
+ }
+ return nObjectId;
+}
+
+/*****************************************************************************/
+USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
+/*****************************************************************************/
+{
+// DBG_ASSERT( FALSE , "not yet" );
+ ByteString sEndName = pEndWin->GetBodyText();
+ ByteString sStartName = pStartWin->GetBodyText();
+
+ Prj* pPrj = mpStarWriter->GetPrj( sEndName );
+ if ( pPrj )
+ {
+ pPrj->AddDependencies( sStartName );
+ return AddConnectorToObjects( pStartWin, pEndWin );
+ }
+ else
+ {
+ DBG_ASSERT( FALSE , "non existing Project" );
+ return 1;
+ }
+}
+
+/*****************************************************************************/
+USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
+/*****************************************************************************/
+{
+ SByteStringList* pPrjDeps = NULL;
+ ByteString sEndName = pEndWin->GetBodyText();
+ ByteString sStartName = pStartWin->GetBodyText();
+
+ Prj* pPrj = mpStarWriter->GetPrj( sEndName );
+ pPrjDeps = pPrj->GetDependencies( FALSE );
+ if ( pPrjDeps )
+ {
+ ByteString* pString;
+ ULONG nPrjDepsCount = pPrjDeps->Count();
+ for ( ULONG j = nPrjDepsCount; j > 0; j-- )
+ {
+ pString = pPrjDeps->GetObject( j - 1 );
+ if ( pString->GetToken( 0, '.') == sStartName )
+ pPrjDeps->Remove( pString );
+ }
+ }
+
+ return RemoveConnectorFromObjects( pStartWin, pEndWin );
+}
+
+/*****************************************************************************/
+void SolDep::RemoveAllObjects( ObjectList* pObjLst )
+/*****************************************************************************/
+{
+
+ Depper::RemoveAllObjects( pObjLst );
+
+ if ( mpSolIdMapper )
+ {
+ delete mpSolIdMapper;
+ mpSolIdMapper = NULL;
+ }
+ if ( mpStarWriter )
+ {
+ delete mpStarWriter;
+ mpStarWriter = NULL;
+ }
+}
+
+/*****************************************************************************/
+ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
+/*****************************************************************************/
+{
+// DBG_ASSERT( FALSE , "soldep" );
+ MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
+
+ if ( !pHObject ) {
+ ByteString sNullPrj = "null";//null_project
+ ULONG nObjectId = AddObject( sNullPrj, FALSE );
+ ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );
+ return nObjectId;
+ }
+
+ return pHObject->GetId();
+}
+
+/*****************************************************************************/
+ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )
+/*****************************************************************************/
+{
+// DBG_ASSERT( FALSE , "prjdep" );
+ MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
+ if ( !pHObject )
+ {
+ ByteString bsNull("null");
+ ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir
+ return nObjectId;
+ }
+ else
+ return pHObject->GetId();
+}
+
+/*****************************************************************************/
+USHORT SolDep::OpenSource()
+/*****************************************************************************/
+{
+ if ( mpStandLst ) {
+ if ( GetVersion())
+ return ReadSource();
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+USHORT SolDep::ReadSource(BOOL bUpdater)
+/*****************************************************************************/
+{
+ mpBaseWin->EnablePaint( FALSE );
+ mpBaseWin->Hide();
+ ULONG nObjectId, nHashedId;
+ ULONG i;
+ MyHashObject* pHObject;
+ ByteString* pStr;
+ ObjectWin *pStartWin, *pEndWin;
+
+ mpSolIdMapper = new SolIdMapper( 63997 );
+ if (mpStandLst && bUpdater)
+ {
+ mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );
+ } else
+ {
+ SolarFileList* pSolarFileList;
+ pSolarFileList = GetPrjListFromDir();
+ mpStarWriter = new StarWriter( pSolarFileList, TRUE );
+ }
+ ByteString sTitle( SOLDEPL_NAME );
+ if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {
+ sTitle += ByteString( " - mode: single file [" );
+ sTitle += (ByteString) mpStarWriter->GetName();
+ sTitle += ByteString( "]" );
+ }
+ else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {
+ sTitle += ByteString( " - mode: multiple files [" );
+ sTitle += ByteString( "]" );
+ }
+ SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );
+
+ ULONG nCount = mpStarWriter->Count();
+ for ( i=0; i<nCount; i++ )
+ {
+ Prj *pPrj = mpStarWriter->GetObject(i);
+ ByteString sPrjName = pPrj->GetProjectName();
+ nObjectId = AddObject( sPrjName, FALSE );
+ ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );
+ }
+ for ( i=0; i<nCount; i++ )
+ {
+ Prj *pPrj = mpStarWriter->GetObject(i);
+ SByteStringList *pLst = pPrj->GetDependencies( FALSE );
+ if ( pLst )
+ {
+ ULONG nDepCount = pLst->Count();
+ for ( ULONG m=0; m<nDepCount; m++)
+ {
+ pStr = pLst->GetObject(m);
+ pHObject = mpSolIdMapper->Find( *pStr );
+ /*if ( !pHObject )
+ {
+ // create new prj
+ Prj *pNewPrj = new Prj( *pStr );
+ ByteString sPrjName = pNewPrj->GetProjectName();
+ nObjectId = AddObject( sPrjName, FALSE );
+ pHObject = mpSolIdMapper->Find( *pStr );
+ ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
+ }*/
+
+ if ( pHObject )
+ {
+ nHashedId = pHObject->GetId();
+ ByteString sF_Os2 = pPrj->GetProjectName();
+ pStr = &sF_Os2;
+ pHObject = mpSolIdMapper->Find( *pStr );
+ nObjectId = pHObject->GetId();
+ pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
+ pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
+ AddConnectorToObjects( pStartWin, pEndWin );
+ }
+ }
+ }
+ }
+ if (!IsPrjView())
+ {
+ AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
+ GetDepWin()->EnablePaint( TRUE );
+ }
+ return 0;
+}
+
+SolarFileList* SolDep::GetPrjListFromDir()
+{
+ SolarFileList* pSolarFileList = new SolarFileList();
+ String sPrjDir( String::CreateFromAscii( "prj" ));
+ String sBuildLst( String::CreateFromAscii( "build.lst" ));
+ DirEntry aCurrent( getenv( SOURCEROOT ) );
+
+ aCurrent.ToAbs();
+ Dir aDir( aCurrent, FSYS_KIND_DIR );
+
+ USHORT nEntries = aDir.Count();
+ if( nEntries )
+ {
+ UniStringList aSortDirList;
+ for ( USHORT n = 0; n < nEntries; n++ )
+ {
+ DirEntry& rEntry = aDir[n];
+ UniString aName( rEntry.GetName() );
+ if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )
+ {
+ rEntry += DirEntry( sPrjDir );
+ rEntry += DirEntry( sBuildLst );
+ if (rEntry.Exists())
+ {
+ pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );
+ ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);
+ fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());
+ }
+ }
+ }
+ }
+ if ( !pSolarFileList->Count() )
+ {
+ //is empty!! TBD
+ delete pSolarFileList;
+ return NULL;
+ }
+ return pSolarFileList;
+}
+
+/*****************************************************************************/
+USHORT SolDep::WriteSource()
+/*****************************************************************************/
+{
+/* zur Sicherheit deaktiviert
+ USHORT nMode = mpStarWriter->GetMode();
+ if ( nMode == STAR_MODE_SINGLE_PARSE ) {
+ ByteString sFileName = mpStarWriter->GetName();
+ if ( sFileName.Len()) {
+ mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
+ mpStarWriter->RemoveProject( ByteString( "null")); //null_project
+ }
+ }
+ else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
+ // *OBO*
+ //String sRoot = mpStarWriter->GetSourceRoot();
+ //nicht mehr untersttzt mpStarWriter->GetSourceRoot()
+ ByteString sFileName = mpStarWriter->GetName();
+ DirEntry aEntry( sFileName );
+ aEntry.ToAbs();
+ aEntry = aEntry.GetPath().GetPath().GetPath();
+ String sRoot = aEntry.GetFull();
+
+ if ( sRoot.Len()) {
+ mpStarWriter->RemoveProject( ByteString( "null")); //null_project
+ mpStarWriter->WriteMultiple( sRoot );
+ }
+ }
+*/
+ return 1;
+}
+
+USHORT SolDep::Load( const ByteString& rFileName )
+{
+// moved from depper class
+ DBG_ASSERT( FALSE , "you are dead!" );
+ SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
+ depper_head dh;
+ ULONG i;
+ ULONG nLoadOffs = mnSolLastId; //or Prj??
+ ObjectWin* pNewWin;
+ aInFile.Read( &dh, sizeof( dh ));
+
+ ULONG nObjCount = dh.nObjectCount;
+ ULONG nCnctrCount = dh.nCnctrCount;
+
+ for ( i=0; i < nObjCount ; i++ )
+ {
+ ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );
+ pWin->Load( aInFile );
+ pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));
+ pNewWin->SetId( nLoadOffs + pWin->GetId());
+ pNewWin->SetPosPixel( pWin->GetPosPixel());
+ pNewWin->SetSizePixel( pWin->GetSizePixel());
+ }
+
+ ULONG nStartId;
+ ULONG nEndId;
+// ueber addconnector fuehren!
+ for ( i=0; i < nCnctrCount ; i++ )
+ {
+ Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
+ pCon->Load( aInFile );
+
+ nStartId = nLoadOffs + pCon->GetStartId();
+ nEndId = nLoadOffs + pCon->GetEndId();
+
+ ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );
+ ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );
+
+ pCon->Initialize( pStartWin, pEndWin );
+ }
+
+
+ return 0;
+}
+
+/*****************************************************************************/
+BOOL SolDep::ViewContent( ByteString& rObjectName )
+/*****************************************************************************/
+{
+ mpFocusWin = NULL;
+ SetPrjViewStatus(TRUE);
+
+ for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
+ if ( mpObjectList->GetObject( i )->HasFocus())
+ mpFocusWin = mpObjectList->GetObject( i );
+ //HideObjectsAndConnections( mpObjectList );
+ mpProcessWin->Resize();
+ GetDepWin()->Show();
+ return InitPrj( rObjectName );
+}
+
+/*****************************************************************************/
+BOOL SolDep::InitPrj( ByteString& rListName )
+/*****************************************************************************/
+{
+ ULONG nObjectId, nHashedId;
+ ULONG i, j;
+ MyHashObject* pHObject;
+ ByteString *pDepName;
+ ByteString *pFlagName;
+ Prj* pPrj;
+ ObjectWin *pStartWin, *pEndWin;
+ maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);
+ maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);
+ maToolBox.HideItem(TID_SOLDEP_FIND);
+ maToolBox.ShowItem(TID_SOLDEP_BACK);
+ maToolBox.Invalidate();
+
+ //clean up
+ mpObjectPrjList->ClearAndDelete();
+ GetDepWin()->ClearConnectorList();
+ if (mpPrjIdMapper) delete mpPrjIdMapper;
+ mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper
+ mnPrjWinCount = 0;
+ mnPrjLastId = 0;
+
+ ULONG nCount = mpStarWriter->Count();
+ GetDepWin()->EnablePaint( FALSE );
+ Point aPnt = GetGraphWin()->GetPosPixel();
+ Size aSize = GetGraphWin()->GetSizePixel();
+
+ GetGraphWin()->SetPosSizePixel( aPnt, aSize ); // Hier wird das Window gesetzt
+
+ BOOL bReturn = FALSE;
+
+ for ( i=0; i<nCount; i++ )
+ {
+// pPrj->GetProjectName() returns the name of
+// the project e.g. svtools
+ pPrj = mpStarWriter->GetObject(i);
+ ByteString sPrjName = pPrj->GetProjectName();
+ if ( sPrjName == rListName )
+ {
+ bReturn = TRUE;
+
+ mpPrj = mpStarWriter->GetObject(i);
+ ULONG nDirCount = mpPrj->Count();
+ for ( j=0; j<nDirCount; j++ )
+ {
+ CommandData *pData = mpPrj->GetObject(j);
+ fprintf( stdout, "\tProjectDir : %s\n",
+ pData->GetLogFile().GetBuffer());
+// pData->GetLogFile() contains internal project IDs
+// e.g. st_mkout etc.
+ if ( pData->GetLogFile() != "" )
+ {
+ ByteString sItem = pData->GetLogFile();
+ nObjectId = AddPrjObject( sItem, FALSE);
+// there may be faster ways......
+ ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
+ pWin->SetViewMask( 0x0001 );
+// pData->GetPath() contains internal project directories
+// e.g. svtools/inc etc.
+ ByteString sPath = pData->GetPath();
+ pWin->SetTipText( sPath );
+ }
+ }
+
+// set connectors for dependencies here
+ for ( j=0; j<nDirCount; j++ )
+ {
+ CommandData *pData = mpPrj->GetObject(j);
+ SByteStringList *pDeps = pData->GetDependencies();
+ if ( pDeps )
+ {
+ ByteString sFlagName = pData->GetLogFile();
+ pFlagName = &sFlagName;
+ //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
+ pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
+ if (pHObject)
+ {
+
+ nObjectId = pHObject->GetId();
+
+ ULONG nDepCount = pDeps->Count();
+ for ( ULONG k=0; k<nDepCount; k++ )
+ {
+ pDepName = pDeps->GetObject(k);
+ pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));
+ if (pHObject )
+ {
+ nHashedId = pHObject->GetId();
+ pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );
+ pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
+
+ AddConnectorToObjects( pStartWin, pEndWin );
+ }
+ else
+ {
+ String sMessage;
+ sMessage += String::CreateFromAscii("can't find ");
+ sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );
+ sMessage += String::CreateFromAscii(".\ndependency ignored");
+ WarningBox aBox( GetDepWin(), WB_OK, sMessage);
+ aBox.Execute();
+ }
+ }
+ }
+ }
+
+ }
+
+ break;
+ }
+ }
+ ByteString sNullDir = "null";
+ nObjectId = AddPrjObject( sNullDir, FALSE);
+ ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
+ pWin->SetViewMask( 0x0001 );
+ mpGraphPrjWin->EnablePaint( TRUE );
+ //debug
+// int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
+// ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
+ AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
+ mpGraphWin->Hide();
+ mpGraphPrjWin->Show();
+ mpGraphPrjWin->Invalidate();
+
+ return bReturn;
+}
+
+/*****************************************************************************/
+USHORT SolDep::CloseWindow()
+/*****************************************************************************/
+{
+
+ ((SystemWindow*)mpProcessWin)->Close();
+ return 0;
+}
+
+/*****************************************************************************/
+void SolDep::ShowHelp()
+/*****************************************************************************/
+{
+ SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );
+ String aHelpText;
+ ByteString aGetStr;
+
+ if ( aHelpFile.IsOpen() )
+ {
+ while ( aHelpFile.ReadLine( aGetStr ) )
+ {
+ aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);
+ aHelpText += String::CreateFromAscii("\n");
+ }
+ }
+ else
+ aHelpText = String::CreateFromAscii("No Helpfile found.");
+
+ SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));
+ aHelpDlg.maMLEHelp.SetText( aHelpText );
+ aHelpDlg.maMLEHelp.SetReadOnly();
+ aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );
+ aHelpDlg.Execute();
+}
+
+/*****************************************************************************/
+BOOL SolDep::FindProject()
+/*****************************************************************************/
+{
+ SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );
+ ObjectWin* pObjectWin = NULL;
+ mpObjectList->ResetSelectedObject();
+ if (IsHideMode())
+ {
+ GetDepWin()->Invalidate();
+ }
+
+ mpFocusWin=NULL;
+
+ if ( aFindProjectDlg.Execute() == RET_OK ) {
+ msProject = aFindProjectDlg.GetProject();
+ //now we have a project string
+
+ pObjectWin = mpObjectList->GetPtrByName( msProject );
+ if (pObjectWin)
+ {
+ mpObjectList->ResetSelectedObject();
+ MarkObjects( pObjectWin );
+ }
+ else
+ {
+ mpObjectList->ResetSelectedObject();
+ for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+ {
+ ObjectWin* pObjectWin = mpObjectList->GetObject( i );
+ if ( !pObjectWin->IsTop() )
+ pObjectWin->SetViewMask(FALSE);
+ }
+ }
+ }
+ return FALSE;
+}
+
+BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )
+{
+ if (pObjectWin)
+ {
+ if (!(pObjectWin->IsNullObject()))
+ {
+ pObjectWin->SetMarkMode( MARKMODE_SELECTED );
+ pObjectWin->MarkNeeded();
+ pObjectWin->MarkDepending();
+ if (IsHideMode())
+ {
+ GetDepWin()->Invalidate();
+ }
+ } else
+ {
+ fprintf(stdout,"null\n");
+ }
+ }
+ return TRUE;
+}
+
+void SolDep::Resize()
+{
+//funzt! mu aber von der applikation aufgerufen werden.
+ Point aOutPos = Point( 0, 0 );
+ Size aOutSize = mpProcessWin->GetOutputSizePixel();
+ // calculate output size
+ ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
+ ULONG nTaskWidth = maToolBox.CalcWindowSizePixel().Width();
+ Size aSize( aOutSize.Width(), nTaskHeight );
+
+// ULONG nMenuHeight = 0;
+ Point aGraphWinPos = Point(0,0);
+ Size aGraphWinSize = Size(0,0);
+
+//wei nicht wie: nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Hhe des Menues
+
+ //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
+ // Set Docking-Rectangle for ToolBar
+ Rectangle aInRect;
+
+ if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))
+ {
+ // waagerechte Toolbar oben
+ maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));
+ if( maToolBox.IsVisible())
+ {
+ Point aOutPosTmp;
+ Size aOutSizeTmp;
+ aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
+ aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
+ aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+ aGraphWinPos = Point( 0, nTaskHeight );
+ aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
+ }
+ }
+ if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))
+ {
+ // waagerechte Toolbar unten
+ Point aTbPos = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
+ Size aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());
+ maToolBox.SetPosSizePixel( aTbPos, aTbSize );
+ if( maToolBox.IsVisible())
+ {
+ Point aOutPosTmp;
+ Size aOutSizeTmp;
+ aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
+ aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
+ aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+ aGraphWinPos = Point( 0, 0 );
+ aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
+ }
+ }
+ if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))
+ {
+ // senkrechte ToolBar links
+ maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));
+ if( maToolBox.IsVisible())
+ {
+ Point aOutPosTmp;
+ Size aOutSizeTmp;
+ aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
+ aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
+ aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+ aGraphWinPos = Point( nTaskWidth, 0 );
+ aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
+ }
+ }
+ if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))
+ {
+ // senkrechte ToolBar rechts
+ Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
+ Size aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
+ maToolBox.SetPosSizePixel( aTbPos, aTbSize);
+ if( maToolBox.IsVisible())
+ {
+ Point aOutPosTmp;
+ Size aOutSizeTmp;
+ aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
+ aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
+ aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
+ aGraphWinPos = Point( 0, 0 );
+ aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
+ }
+ }
+
+ Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
+ Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
+ Size( aOutSize.Width(), aOutSize.Height()));
+/*
+ Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
+ Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
+ Size( aOutSize.Width(), aOutSize.Height()));
+*/
+ maToolBox.SetDockingRects( rout, rin );
+
+ BOOL bFloating = maToolBox.IsFloatingMode();
+
+ if ( bFloating )
+ {
+ GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
+ //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
+ if (maToolBox.IsVisible()) maToolBox.Show();
+ } else
+ {
+ GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
+ }
+ if (maToolBox.IsVisible()) maToolBox.Show();
+}
+
+USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
+{
+// DBG_ASSERT( FALSE , "not yet" );
+ ByteString sEndName = pEndWin->GetBodyText();
+ ByteString sStartName = pStartWin->GetBodyText();
+ if ( sStartName != ByteString("null"))
+ {
+ CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
+ SByteStringList* pDeps = pEndData->GetDependencies();
+ if ( pDeps )
+ pDeps->PutString( &sStartName );
+ else
+ {
+ pDeps = new SByteStringList();
+ pEndData->SetDependencies( pDeps );
+ pDeps->PutString( &sStartName );
+ pEndData->GetDependencies();
+ }
+ }
+ return AddConnectorToObjects( pStartWin, pEndWin );
+}
+
+USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
+{
+ ByteString sEndName = pEndWin->GetBodyText();
+ ByteString sStartName = pStartWin->GetBodyText();
+ CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
+ SByteStringList* pDeps = pEndData->GetDependencies();
+ if ( pDeps )
+ {
+ ByteString* pString;
+ ULONG nDepsCount = pDeps->Count();
+ for ( ULONG j = nDepsCount; j > 0; j-- )
+ {
+ pString = pDeps->GetObject( j - 1 );
+ if ( pString->GetToken( 0, '.') == sStartName )
+ pDeps->Remove( pString );
+ }
+ }
+ return RemoveConnectorFromObjects( pStartWin, pEndWin );
+}
+
+USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
+{
+ AutoArrangeDlgStart();
+ OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );
+ AutoArrangeDlgStop();
+ return 0;
+}
+
+Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )
+{
+ int nRowIndex = nIndex / DEPPER_MAX_WIDTH;
+ ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );
+
+ ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;
+ Point aPos( nPosX, nPosY );
+ return aPos;
+}
+
+ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )
+{
+ long nDynXOffs;
+ long nXMiddle;
+ ULONG nTrigger;
+
+ nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;
+ if ( nObjectsToFit > DEPPER_MAX_WIDTH )
+ nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;
+ nTrigger = ( nObjectsToFit - 1 ) / 2;
+ nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;
+ ULONG nXOffs = nXMiddle - nDynXOffs;
+
+ if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )
+ mnMinDynXOffs = nXMiddle - nDynXOffs;
+
+ return nXOffs;
+
+}
+
+double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
+{
+ ObjectWin* pWin;
+ Connector* pCon;
+ ULONG nObjCount = pObjList->Count();
+ double dRetVal = 0;
+ double dWinVal;
+ USHORT i, j;
+ BOOL bIsStart;
+
+ for ( i = 0; i < nObjCount; i++ )
+ {
+ pWin = pObjList->GetObject( i );
+
+ if ( pWin && pWin->IsVisible())
+ {
+ j = 0;
+ dWinVal = 0;
+ while ( (pCon = pWin->GetConnector( j )) )
+ {
+ if ( pCon->IsVisible()) {
+ bIsStart = pCon->IsStart( pWin );
+ if ( eDistType != BOTH )
+ if ( eDistType == TOPDOWN )
+ {
+ if ( bIsStart )
+ {
+ pCon->UpdatePosition( pWin, FALSE );
+ dWinVal += pCon->GetLen() * pWin->mnHeadDist;
+ }
+ }
+ else
+ {
+ if ( !bIsStart )
+ {
+ pCon->UpdatePosition( pWin, FALSE );
+ dWinVal += pCon->GetLen() * pWin->mnRootDist;
+ }
+
+ }
+ else
+ {
+ pCon->UpdatePosition( pWin, FALSE );
+ if ( !bIsStart )
+ dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );
+ else
+ dWinVal += pCon->GetLen() * pWin->mnRootDist;
+ }
+ }
+ j++;
+ }
+// if ( j != 0 )
+// dWinVal /= j;
+ dRetVal += dWinVal;
+ }
+ }
+
+ return dRetVal;
+}
+
+USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )
+{
+ USHORT i = 0;
+ ObjectWin* pNewWin;
+ Connector* pCon;
+
+ nDepth++;
+
+ USHORT nMaxDepth = nDepth;
+
+ pWin->mbVisited = TRUE;
+ pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );
+ if ( nDepth > DEPPER_MAX_DEPTH )
+ {
+ DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabhngigkeit!" );
+ nDepth++;
+ return DEP_ENDLES_RECURSION_FOUND;
+ }
+
+ while ( (pCon = pWin->GetConnector( i )) )
+ {
+ if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project
+ {
+ pNewWin = pCon->GetOtherWin( pWin );
+ nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );
+ if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )
+ {
+ mpTravellerList->Insert( pWin, LIST_APPEND );
+ return DEP_ENDLES_RECURSION_FOUND;
+ }
+ }
+ i++;
+ }
+ pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );
+ return nMaxDepth;
+}
+
+
+double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )
+{
+
+ ULONG i, j, l;
+ ULONG nEnd = nStart + nSize;
+ ObjectWin* pSwapWin;
+ ULONG nLevelObjCount = rObjList.Count();
+
+//dont use full recusion for more than 6 objects
+ if ( nLevelObjCount > 6 )
+ {
+ srand(( unsigned ) time( NULL ));
+
+ ULONG nIdx1, nIdx2;
+ for ( i = 0; i < 101; i++ )
+ {
+ UpdateSubProgrssBar(i);
+ for ( j = 0; j < 100; j++ )
+ {
+ nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+ while ( rObjList.GetObject( nIdx1 ) == NULL )
+ nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+ nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+ while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )
+ nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
+
+ pSwapWin = rObjList.GetObject( nIdx1 );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
+ pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
+ rObjList.Replace( pSwapWin, nIdx1 );
+
+ double dCurDist = CalcDistSum( &rObjList, eDistType );
+
+ if ( dCurDist < dMinDist )
+ {
+ dMinDist = dCurDist;
+ rResultList.Clear();
+ for ( l = 0; l < nLevelObjCount; l++ )
+ {
+ pSwapWin = rObjList.GetObject( l );
+ rResultList.Insert( pSwapWin, LIST_APPEND);
+ }
+ }
+// if ( dCurDist > dMinDist * 1.5 )
+ if ( dCurDist > dMinDist * 15 )
+ {
+ pSwapWin = rObjList.GetObject( nIdx1 );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
+ pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
+ rObjList.Replace( pSwapWin, nIdx1 );
+ }
+ }
+ }
+ }
+ else
+ {
+ for ( i = nStart ; i < nEnd; i++)
+ {
+ if ( nSize > 1 )
+ {
+ pSwapWin = rObjList.GetObject( i );
+ pSwapWin = rObjList.Replace( pSwapWin, nStart );
+ rObjList.Replace( pSwapWin, i );
+ double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );
+ dMinDist = MIN( dMinDist, dPermuteDist);
+ pSwapWin = rObjList.GetObject( i );
+ pSwapWin = rObjList.Replace( pSwapWin, nStart );
+ rObjList.Replace( pSwapWin, i );
+
+ }
+ else
+ {
+ for ( l = 0; l < nLevelObjCount; l++ )
+ {
+ pSwapWin = rObjList.GetObject( l );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( pPosArray[ l ] );
+ }
+
+ double dCurDist = CalcDistSum( &rObjList, eDistType );
+
+ if ( dCurDist < dMinDist )
+ {
+ dMinDist = dCurDist;
+ rResultList.Clear();
+ for ( l = 0; l < nLevelObjCount; l++ )
+ {
+ pSwapWin = rObjList.GetObject( l );
+ rResultList.Insert( pSwapWin, LIST_APPEND);
+ }
+ }
+
+ }
+ }
+ }
+
+ return dMinDist;
+}
+
+
+USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
+{
+ ObjWinList aWorkList;
+ ObjectWin* pWin;
+ Connector* pCon;
+ USHORT nRootDist = (USHORT) -1;
+ USHORT i, j, k, l, nRetVal;
+ USHORT LevelUse[ DEPPER_MAX_DEPTH ];
+ USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];
+ ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];
+ ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];
+ Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];
+
+ mnMinDynXOffs = 0xffff;
+
+ for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )
+ {
+ LevelUse[ i ] = 0;
+ LevelList[ i ] = NULL;
+ LevelSecUse[ i ] = 0;
+ LevelSecList[ i ] = NULL;
+ }
+
+ GetDepWin()->EnablePaint( FALSE );
+
+ ULONG nObjCount = pObjLst->Count();
+ for ( i = 0; i < nObjCount; i++ )
+ {
+ pWin = pObjLst->GetObject( i );
+ if ( pWin->IsVisible()) {
+ pWin->mbVisited = FALSE;
+ pWin->mnHeadDist = 0;
+ pWin->mnRootDist = 0;
+
+ // find initial objects which need to be connected with
+ // root object
+ j = 0;
+ USHORT nStartCount = 0;
+ USHORT nEndCount = 0;
+ while ( (pCon = pWin->GetConnector( j )) )
+ {
+ if ( pCon->IsVisible()) { //null_project
+ if( pCon->IsStart( pWin ))
+ nStartCount++;
+ else
+ {
+ nEndCount = 1;
+ break;
+ }
+ }
+ j++;
+ }
+
+ if ( nStartCount > 0 && nEndCount == 0 )
+ if ( nTopId != pWin->GetId())
+ AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());
+
+ }
+ }
+
+ pWin = ObjIdToPtr( pObjLst, nTopId );
+
+ if ( mpTravellerList )
+ {
+ mpTravellerList->Clear();
+ delete mpTravellerList;
+ }
+ mpTravellerList = new ObjWinList();
+ // set root and top distance
+ nRetVal = Impl_Traveller( pWin, nRootDist );
+
+ DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );
+ if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )
+ {
+ WriteToErrorFile();
+ return nRetVal;
+ }
+
+ ULONG nUnvisited = 0;
+ ULONG nUnvisYOffs = 0;
+
+ // seperate mainstream, secondary and unconnected
+ for ( i = 0; i < nObjCount; i++ )
+ {
+ pWin = pObjLst->GetObject( i );
+ if ( pWin->IsVisible()) {
+ if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )
+ {
+ if ( !LevelList[ pWin->mnHeadDist ] )
+ LevelList[ pWin->mnHeadDist ] = new ObjWinList;
+ LevelList[ pWin->mnHeadDist ]->Insert( pWin );
+ LevelUse[ pWin->mnHeadDist ]++;
+ }
+ else
+ if ( pWin->mbVisited )
+ {
+ if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )
+ LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;
+ LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );
+ LevelSecUse[ nRetVal - pWin->mnRootDist ]++;
+ }
+ else
+ {
+ // need to be arranged more intelligent...
+ Point aPos( 5, nUnvisYOffs );
+ pWin->SetCalcPosPixel( aPos );
+
+ Point aTmpPos = pWin->GetCalcPosPixel();
+ pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));
+
+ nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();
+ nUnvisited++;
+ }
+ }
+ }
+
+ mnLevelOffset = 0;
+
+ USHORT nScaleVal;
+
+ if ( nRetVal == 0 )
+ nScaleVal = 1;
+ else
+ nScaleVal = nRetVal;
+
+ i = 0;
+
+ USHORT nStep = 0;
+
+ while ( LevelList[ i ] )
+ {
+ UpdateMainProgressBar(i, nScaleVal, nStep);
+ DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );
+ ObjectWin* pSwapWin;
+ ULONG nLevelObjCount = LevelList[ i ]->Count();
+
+ if ( nLevelObjCount % 2 == 0 )
+ {
+ LevelList[ i ]->Insert( NULL, LIST_APPEND );
+ nLevelObjCount++;
+// LevelUse bleibt orginal...
+// LevelUse[ i ]++;
+ }
+
+// catch too big lists
+ DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
+ if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
+ {
+ WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
+ aWBox.Execute();
+ break;
+ }
+ mnXOffset = CalcXOffset( nLevelObjCount );
+ aWorkList.Clear();
+
+ // initial positioning for mainstream
+ for ( j = 0; j < nLevelObjCount; j++ )
+ {
+ pSwapWin = LevelList[ i ]->GetObject( j );
+ aWorkList.Insert( pSwapWin, LIST_APPEND);
+ Point aPos = CalcPos( i, j );
+ aPosArray[ j ] = aPos;
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+
+ double dMinDist = CalcDistSum( LevelList[ i ] );
+
+ // optimize mainstream order and return best matching list in "aWorkList"
+ dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));
+
+ // set optimized positions - may still be wrong from later tries
+ for ( j = 0; j < nLevelObjCount; j++ )
+ {
+ pSwapWin = aWorkList.GetObject( j );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+
+ if ( LevelSecList[ i ] != NULL )
+ {
+ ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
+ // expand list for better positioning
+ while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )
+ {
+ LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
+ nLevelSecObjCount++;
+ }
+ if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )
+ {
+ LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
+ nLevelSecObjCount++;
+ }
+
+ DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
+ if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
+ {
+ WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
+ aWBox.Execute();
+ break;
+ }
+ mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
+ aWorkList.Clear();
+
+ l = 0;
+ BOOL bUsedPos;
+
+ // find free positions for secondary objects
+ for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
+ {
+ Point aPos = CalcPos( i, j );
+ bUsedPos = FALSE;
+ // is already occupied?
+ for ( k = 0; k < nLevelObjCount; k++ )
+ {
+ if ( LevelList[ i ]->GetObject( k ) )
+ if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
+ bUsedPos = TRUE;
+ }
+ // if its free, add to pool
+ if ( !bUsedPos )
+ {
+ aPosArray[ l ] = aPos;
+ l++;
+ }
+ }
+
+ // initial positioning for secodaries
+ for ( j = 0 ; j < nLevelSecObjCount ; j++ )
+ {
+ pSwapWin = LevelSecList[ i ]->GetObject( j );
+ aWorkList.Insert( pSwapWin, LIST_APPEND);
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+ dMinDist = CalcDistSum( LevelSecList[ i ] );
+
+ dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));
+
+ // set optimized positions - may still be wrong from later tries
+ for ( j = 0; j < nLevelSecObjCount; j++ )
+ {
+ pSwapWin = aWorkList.GetObject( j );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+ if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
+ mnLevelOffset++;
+ }
+ if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
+ mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
+ i++;
+ }
+
+ mnMinDynXOffs = 0xffff;
+
+// and back again...
+ // get better results form already preoptimized upper and lower rows
+
+ do
+ {
+ i--;
+ UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down
+ if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
+ mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
+ ObjectWin* pSwapWin;
+ ULONG nLevelObjCount = LevelList[ i ]->Count();
+ mnXOffset = CalcXOffset( nLevelObjCount );
+ aWorkList.Clear();
+
+ for ( j = 0; j < nLevelObjCount; j++ )
+ {
+ pSwapWin = LevelList[ i ]->GetObject( j );
+ aWorkList.Insert( pSwapWin, LIST_APPEND);
+ Point aPos = CalcPos( i, j );
+ aPosArray[ j ] = aPos;
+//no need to do this stuff....... ?????
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+
+ double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
+
+ dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
+// wrong position for remaping - keep old positions for comparing
+ for ( j = 0; j < nLevelObjCount; j++ )
+ {
+ pSwapWin = aWorkList.GetObject( j );
+ if ( pSwapWin )
+// pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+
+ if ( LevelSecList[ i ] != NULL )
+ {
+ ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
+ mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
+ aWorkList.Clear();
+
+ l = 0;
+ BOOL bUsedPos;
+
+ for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
+ {
+ Point aPos = CalcPos( i, j );
+ bUsedPos = FALSE;
+// could be faster
+ for ( k = 0; k < nLevelObjCount; k++ )
+ {
+ if ( LevelList[ i ]->GetObject( k ) )
+ if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
+ bUsedPos = TRUE;
+ }
+ if ( !bUsedPos )
+ {
+ aPosArray[ l ] = aPos;
+ l++;
+ }
+ }
+
+ for ( j = 0 ; j < nLevelSecObjCount ; j++ )
+ {
+ pSwapWin = LevelSecList[ i ]->GetObject( j );
+ aWorkList.Insert( pSwapWin, LIST_APPEND);
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+ dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
+
+ dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
+// wrong position for remaping - keep old positions for comparing
+ for ( j = 0; j < nLevelSecObjCount; j++ )
+ {
+ pSwapWin = aWorkList.GetObject( j );
+ if ( pSwapWin )
+ pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
+ }
+ }
+// i--;
+ } while ( i != 0 );
+ SetMainProgressBar( 100 );
+
+ ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() );
+
+ // ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu man switchen GetStart/GetPrjStart oder so
+
+ ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
+
+ ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
+ if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )
+ nNewYSize = nUnvisYOffs + GetDefSize().Height();
+
+ MapMode aMapMode = GetDepWin()->GetMapMode();
+ Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));
+
+ Size aNowSize( GetGraphWin()->GetSizePixel());
+
+ if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )
+ aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;
+
+ if ( GetDepWin()->LogicToPixel( aNowSize ).Height() > aTmpSize.Height() )
+ aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
+
+// if ( nZoomed <= 0 )
+// {
+// mpBaseWin->SetSizePixel( aTmpSize );
+// mpGraphWin->SetTotalSize( aTmpSize );
+// mpGraphWin->EndScroll( 0, 0 );
+// }
+
+// now remap all objects
+ ULONG nAllObjCount = pObjLst->Count();
+ Point aTmpPos;
+ for ( j = 0; j < nAllObjCount; j++ )
+ {
+ pWin = pObjLst->GetObject( j );
+ if ( pWin->IsVisible()) {
+ aTmpPos = pWin->GetCalcPosPixel();
+ if ( pWin->mbVisited )
+ {
+// reserve space for unconnected
+ aTmpPos.X() -= mnMinDynXOffs;
+ aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
+// center window
+ aTmpPos.X() += GetDefSize().Width() / 2;
+ aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
+ }
+ pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));
+ }
+ }
+ aWorkList.Clear();
+ GetDepWin()->EnablePaint( TRUE );
+ GetDepWin()->Invalidate();
+//LevelListen loeschen H? Welche Levellisten?
+
+//Update all Connectors
+// --> To be done: Don't call twice Object1-Connector-Object2
+ ObjectWin* pObject1;
+ for ( i = 0 ; i < nObjCount ; i++)
+ {
+ pObject1 = pObjLst->GetObject( i );
+ if ( pObject1->IsVisible())
+ pObject1->UpdateConnectors();
+ };
+ return 0;
+}
+
+void SolDep::WriteToErrorFile()
+{
+//Needs some improvement
+ ObjectWin* pWin;
+ WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
+ aWBox.Execute();
+ char *tmpdir = getenv("TMP");
+ char *errfilebasename = "depper.err";
+ char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );
+ *ErrFileName = '\0';
+ strcat( ErrFileName, tmpdir );
+ strcat( ErrFileName, "\\" );
+ strcat( ErrFileName, errfilebasename );
+ FILE* pErrFile = fopen( "depper.err", "w+" );
+ if ( pErrFile )
+ {
+ for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )
+ {
+ pWin = mpTravellerList->GetObject( i );
+ fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());
+ }
+ fclose( pErrFile );
+ }
+}
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh index 0400f461666e..e64b8fd2aa4c 100755 --- a/solenv/bin/checkdll.sh +++ b/solenv/bin/checkdll.sh @@ -60,16 +60,6 @@ if [ -x $checkdll ]; then *) DYLD_LIBRARY_PATH=$libpath;; esac export DYLD_LIBRARY_PATH;; - IRIX) case "${LD_LIBRARYN32_PATH+X}" in - X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;; - *) LD_LIBRARYN32_PATH=$libpath;; - esac - export LD_LIBRARYN32_PATH;; - IRIX64) case "${LD_LIBRARYN32_PATH+X}" in - X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;; - *) LD_LIBRARYN32_PATH=$libpath;; - esac - export LD_LIBRARYN32_PATH;; *) case "${LD_LIBRARY_PATH+X}" in X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;; *) LD_LIBRARY_PATH=$libpath;; diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index d4d6c9c0bf5a..0d6c8b27afa4 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -552,7 +552,7 @@ sub get_base } if ( $#field == -1 ) { - print_error("can't determine module"); + print_error("can't find d.lst"); exit(2); } else { diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm index 8c3a87e4ddc5..205e4c933193 100755 --- a/solenv/bin/modules/osarch.pm +++ b/solenv/bin/modules/osarch.pm @@ -27,8 +27,7 @@ chop( $m_str, $s_str ); # "SCO_SV", "scouw21", "Darwin", "macosxp", "Mac OS", "macosxp", - "SINIX-N", "sinix", - "IRIX", "irix" + "SINIX-N", "sinix" ); %osDefTable = ("SunOS", "-DSYSV -DSOLARIS", @@ -42,8 +41,7 @@ chop( $m_str, $s_str ); # "SCO_SV", "-DSYSV -DSCO -DSCO_UW21", "Darwin", "-DBSD -DMACOSX", "Mac OS", "-DBSD -DMACOSX", - "SINIX-N", "-DSYSV -DSINIX", - "IRIX", "-DSYSV -DIRIX" + "SINIX-N", "-DSYSV -DSINIX" ); %osDosTable = ("SunOS", "sol", @@ -56,8 +54,7 @@ chop( $m_str, $s_str ); "SCO_SV", "sco", "Darwin", "macx", "Mac OS", "macx", - "SINIX-N", "sni", - "IRIX", "irx" + "SINIX-N", "sni" ); %archTable = ("sun4c", "sparc", diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 7550f86aedc5..c3b6f91c9dd7 100644..100755 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1,17 +1,12 @@ -common +common { - environment + environment { - btarget - { - BTARGET btarget=%BUILD_TARGET% - } - common + common { ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native BIG_SVX TRUE BMP_WRITES_FLAG TRUE - BTARGET 1 BUILD_SPECIAL TRUE BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE common_build TRUE @@ -50,7 +45,6 @@ common WITH_FONTOOO YES WITH_LDAP YES wrapper_override_cc_wrapper TRUE - ZIPSOURCE 1 BUILD_QADEVOOO YES MAXPROC maxproc=15 } @@ -71,9 +65,8 @@ common } common:3 IF %UPDATER% != YES { - ENABLE_CRASHDUMP DUMMY } - crashdump + crashdump { ENABLE_CRASHDUMP STATIC } @@ -89,10 +82,6 @@ common { UPDMINOREXT .%UPDMINOR% } - nojava - { - DISABLE_JAVA TRUE - } nosource { LU_NOSOURCE no_source @@ -100,7 +89,6 @@ common pro:0 IF %UPDATER% == YES { DELIVER_TO_ZIP TRUE - ENABLE_CRASHDUMP STATIC product full PROEXT .pro PROFULLSWITCH product=full @@ -116,74 +104,67 @@ common { LU_RFLAG r_only } - shell + shell { SHELL %STAR_USE_SHELL% USE_SHELL %STAR_USE_SHELL% } - tmp + tmp { SOL_TMP %SOL_TMP_DIR% } - verbose + verbose { VERBOSE VERBOSE } - zipsource - { - ZIPSOURCE zipsource=%ZIP_SOURCE_URL% - } } - extern + extern { - ENVROOT - PATH - SRC_ROOT - STL_ROOT - UPDATER + ENVROOT + PATH + SRC_ROOT + UPDATER } - order minorext common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource - reset + order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource + reset { ALT_L10N_MODULE - ENVCFLAGS - HOMEDRIVE - HOMEPATH - JAVAHOME - JAVA_HOME + ENVCFLAGS + HOMEDRIVE + HOMEPATH + JAVAHOME + JAVA_HOME LU_HGFLAG LU_NOSOURCE LU_RFLAGS MKDIRHIER - PROEXT - PROFULLSWITCH - SHIPDRIVE - SOLARSRC - SOLAR_JAVA - SPEW - STLPORT4 + PROEXT + PROFULLSWITCH + SHIPDRIVE + SOLARSRC + SOLAR_JAVA + SPEW + STLPORT4 UPDMINOREXT - WITH_FONTOOO - WITH_LANG + WITH_FONTOOO + WITH_LANG } - restore + restore { - PATH + PATH } - standlst + standlst { DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume } - switches + switches { - btarget BUILD_TARGET - crashdump + crashdump cwsname CWS_WORK_STAMP - envroot + envroot hg minorext - nojava nosource pro maxproc MAXPROCESS @@ -191,40 +172,34 @@ common shell STAR_USE_SHELL tmp SOL_TMP_DIR verbose VERBOSE - zipsource ZIP_SOURCE_URL } } -finish +finish { - environment + environment { - ca - { - SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% - SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) - } - cap + cap { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) } - cax + cax { SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) } common_0:0 IF %OS% == MACOSX { - ENABLE_GCONF - ENABLE_GNOMEVFS - ENABLE_GTK + ENABLE_GCONF + ENABLE_GNOMEVFS + ENABLE_GTK SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC% } common_0:3 IF %SOLARINCLUDES% == { SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC% } - common_1 + common_1 { BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple @@ -255,8 +230,8 @@ finish } cwsname:0 IF X%SOURCE_ROOT_USED%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT SOURCE_ROOT_not_used SOLARINC SOURCE_ROOT_not_used SOLARINCLUDE SOURCE_ROOT_not_used @@ -270,8 +245,8 @@ finish } cwsname:1 IF X%SOURCE_ROOT%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT SOURCE_ROOT_not_set SOLARINC SOURCE_ROOT_not_set SOLARINCLUDE SOURCE_ROOT_not_set @@ -285,8 +260,8 @@ finish } cwsname:2 IF X%UPDMINOR%X == XX { - *build - *deliver + *build + *deliver DMAKEROOT UPDMINOR_not_used SOLARINC UPDMINOR_not_used SOLARINCLUDE UPDMINOR_not_used @@ -298,63 +273,47 @@ finish SO_GEN_ERROR2 ...resetting path to source tree SRC_ROOT UPDMINOR_not_used } - jdk13 + jdk14 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - jdk14 + jdk15 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } - jdk15 - { - CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar - ILIB %LIB%$;%JDKLIB% - LIB %LIB%$;%JDKLIB% - } - l10n + l10n { framework %L10N_framework% L10N-framework %L10N_framework% } - ojdk16 + ojdk16 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% } } - order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a - switches + order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a + switches { cwsname CWS_WORK_STAMP } } -unxfbsdi +unxfbsdi { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -366,7 +325,7 @@ unxfbsdi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -377,7 +336,7 @@ unxfbsdi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice perl %SOLARENV%/bin/build_client.pl @@ -398,12 +357,12 @@ unxfbsdi SOLAR_JAVA TRUE ZIPDEP perl %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux DEVROOT %SOLAR_ENV_ROOT% @@ -420,7 +379,7 @@ unxfbsdi SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin COM GCC @@ -446,11 +405,11 @@ unxfbsdi TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } - debug + debug { LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% } @@ -464,22 +423,7 @@ unxfbsdi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux - JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client - JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar - } - jdk13path:0 IF X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux @@ -494,7 +438,7 @@ unxfbsdi { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -509,19 +453,7 @@ unxfbsdi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - pre - { - ILIB %PRE%/lib:%ILIB% - LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } - pro + pro { PROSWITCH -DPRODUCT } @@ -530,48 +462,38 @@ unxfbsdi SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -579,10 +501,10 @@ unxfbsdi 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -600,54 +522,37 @@ unxfbsdi 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + sysbaseroot } } -unxlngi6 +unxlngi6 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -660,7 +565,7 @@ unxlngi6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -672,7 +577,7 @@ unxlngi6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -696,15 +601,15 @@ unxlngi6 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% - SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2 + SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2 } - common1 + common1 { - COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32 + COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32 DEVROOT %SOLAR_ENV_ROOT% LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl @@ -722,7 +627,7 @@ unxlngi6 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin @@ -759,7 +664,7 @@ unxlngi6 { FORCE2ARCHIVE TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -773,22 +678,7 @@ unxlngi6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux - JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client - JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar - } - jdk13path:0 IF X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux @@ -803,7 +693,7 @@ unxlngi6 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -818,11 +708,7 @@ unxlngi6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -837,14 +723,7 @@ unxlngi6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } - pro + pro { PROSWITCH -DPRODUCT } @@ -853,48 +732,38 @@ unxlngi6 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16 + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -902,10 +771,10 @@ unxlngi6 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -923,56 +792,39 @@ unxlngi6 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path - pre PRE - pro - sourceroot - stl - sysbaseroot + ojdk16 + ojdk16path + pro + sourceroot + sysbaseroot } } -unxlngx6 +unxlngx6 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -985,7 +837,7 @@ unxlngx6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -997,7 +849,7 @@ unxlngx6 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1021,19 +873,18 @@ unxlngx6 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6 } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/ DEVROOT %SOLAR_ENV_ROOT% PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl PKGFORMAT rpm - PTHREAD_CFLAGS -DNPTL SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv @@ -1048,7 +899,7 @@ unxlngx6 USE_SYSTEM_STL YES XAU_LIBS -lXau } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin @@ -1086,7 +937,7 @@ unxlngx6 { FORCE2ARCHIVE TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1100,7 +951,7 @@ unxlngx6 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk14 + jdk14 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1115,7 +966,7 @@ unxlngx6 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1130,11 +981,7 @@ unxlngx6 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -1149,14 +996,7 @@ unxlngx6 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } - pro + pro { PROSWITCH -DPRODUCT } @@ -1165,48 +1005,38 @@ unxlngx6 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 common3:0 pro common jdk14 jdk15 ojdk16 + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1214,10 +1044,10 @@ unxlngx6 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1235,54 +1065,39 @@ unxlngx6 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path - pre PRE - pro - sourceroot - stl - sysbaseroot + ojdk16 + ojdk16path + pro + sourceroot + sysbaseroot } } -unxmacxi +unxmacxi { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1295,7 +1110,7 @@ unxmacxi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1307,7 +1122,7 @@ unxmacxi SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1329,7 +1144,7 @@ unxmacxi SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0 SOLAR_ENV_ROOT /so/env @@ -1337,7 +1152,7 @@ unxmacxi SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk } - common1 + common1 { BUILD_OS_APPLEOSX TRUE BUILD_OS_MAJOR 10 @@ -1365,7 +1180,6 @@ unxmacxi SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% - SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/mac_jdk13_unknown SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% @@ -1380,7 +1194,7 @@ unxmacxi BUILD_PIXMAN YES WITH_MOZILLA YES } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin COM GCC @@ -1407,7 +1221,7 @@ unxmacxi TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1421,22 +1235,7 @@ unxmacxi { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux - JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client - JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar - } - jdk13path:0 IF X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1451,7 +1250,7 @@ unxmacxi { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux @@ -1466,18 +1265,7 @@ unxmacxi { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - pre - { - ILIB %PRE%/lib:%ILIB% - LIB %PRE%/lib:%LIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } - pro + pro { PROSWITCH -DPRODUCT } @@ -1486,48 +1274,38 @@ unxmacxi SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 + reset { - CLASSPATH - COPYALL + CLASSPATH + COPYALL } - restore + restore { - INCLUDE + INCLUDE } - script + script { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1535,10 +1313,10 @@ unxmacxi 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1556,54 +1334,37 @@ unxmacxi 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - debug - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + debug + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + sysbaseroot } } -unxsoli4 +unxsoli4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1616,7 +1377,7 @@ unxsoli4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1628,7 +1389,7 @@ unxsoli4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1649,13 +1410,13 @@ unxsoli4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -1675,7 +1436,7 @@ unxsoli4 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin COM C52 @@ -1703,7 +1464,7 @@ unxsoli4 TEMP /var/tmp TMP /var/tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -1717,22 +1478,7 @@ unxsoli4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris - JDKLIB %JDK13PATH%/jre/lib/i386:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/i386/native_threads:%JDK13PATH%/jre/plugin/i386:%JDK13PATH%/jre/lib/i386/motif21 - JDKLIBS -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/i386/native_threads -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/lib/i386/motif21 - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris @@ -1747,7 +1493,7 @@ unxsoli4 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -1762,11 +1508,7 @@ unxsoli4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris @@ -1781,13 +1523,7 @@ unxsoli4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% - } - pro + pro { PROSWITCH -DPRODUCT } @@ -1796,43 +1532,33 @@ unxsoli4 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16 + reset { - CLASSPATH + CLASSPATH } - script + script { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1840,10 +1566,10 @@ unxsoli4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1861,55 +1587,38 @@ unxsoli4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path - pre PRE - pro - sourceroot - stl - sysbaseroot + ojdk16 + ojdk16path + pro + sourceroot + sysbaseroot } } -unxsols4 +unxsols4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -1922,7 +1631,7 @@ unxsols4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -1934,7 +1643,7 @@ unxsols4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -1955,14 +1664,14 @@ unxsols4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1 SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -1982,7 +1691,7 @@ unxsols4 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin COM C52 @@ -2016,7 +1725,7 @@ unxsols4 TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2030,22 +1739,7 @@ unxsols4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris - JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris - JDKLIB %JDK13PATH%/jre/lib/sparc:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/sparc/native_threads:%JDK13PATH%/jre/plugin/sparc:%JDK13PATH%/jre/lib/sparc/motif21 - JDKLIBS -L%JDK13PATH%/jre/lib/sparc -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/sparc/native_threads -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/lib/sparc/motif21 - JDKPATH %JDK13PATH%/bin - JDK_VERSION 131 - XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { JAVA_HOME %JDK14PATH% JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris @@ -2060,7 +1754,7 @@ unxsols4 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -2075,11 +1769,7 @@ unxsols4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris @@ -2094,13 +1784,7 @@ unxsols4 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - ILIB %PRE%/lib:%ILIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% - } - pro + pro { PROSWITCH -DPRODUCT } @@ -2109,44 +1793,34 @@ unxsols4 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LM_LICENSE_FILE - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LM_LICENSE_FILE + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16 + reset { - CLASSPATH + CLASSPATH } - script + script { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2154,10 +1828,10 @@ unxsols4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2175,55 +1849,38 @@ unxsols4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path - pre PRE - pro - sourceroot - stl - sysbaseroot + ojdk16 + ojdk16path + pro + sourceroot + sysbaseroot } } -unxsolu4 +unxsolu4 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -2236,7 +1893,7 @@ unxsolu4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -2248,7 +1905,7 @@ unxsolu4 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -2261,7 +1918,7 @@ unxsolu4 COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%/bin/deliver.pl DMAKEROOT %SOLARENV%/inc/startup - ENABLE_GNOMEVFS + ENABLE_GNOMEVFS FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2 FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2 @@ -2279,13 +1936,13 @@ unxsolu4 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } - common1 + common1 { COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% @@ -2302,7 +1959,7 @@ unxsolu4 SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% USE_SYSTEM_STL YES } - common2 + common2 { BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin COM C52 @@ -2331,7 +1988,7 @@ unxsolu4 TEMP /tmp TMP /tmp } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2345,7 +2002,7 @@ unxsolu4 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk15 + jdk15 { JAVA_HOME %JDK15PATH% JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris @@ -2360,17 +2017,7 @@ unxsolu4 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - pre - { - ILIB %PRE%/lib:%ILIB% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L%PRE%/lib %SOLARLIB% - } - pro + pro { PROSWITCH -DPRODUCT } @@ -2379,44 +2026,34 @@ unxsolu4 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - sysbaseroot + sysbaseroot { SOLAR_SYSBASE_ROOT %SYSBASE_ROOT% } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LM_LICENSE_FILE - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - SYSBASE_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LM_LICENSE_FILE + LOCALINI + SOL_TMP + SOURCE_ROOT + SYSBASE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15 + reset { - CLASSPATH + CLASSPATH } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2424,10 +2061,10 @@ unxsolu4 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2445,49 +2082,34 @@ unxsolu4 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk15 - jdk15path + distroot + envroot + jdk15 + jdk15path l10n L10N_framework - nativecvs STAR_NATIVECVS - pre PRE - pro - sourceroot - stl - sysbaseroot + pro + sourceroot + sysbaseroot } } -unxubti8 +unxubti8 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% - } - cap + cap { COPYALL TRUE COPY_PACKED TRUE @@ -2500,7 +2122,7 @@ unxubti8 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COPYALL FALSE DEVROOT %SOL_TMP%$/r @@ -2512,7 +2134,7 @@ unxubti8 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH% *build_client nice %PERL% %SOLARENV%/bin/build_client.pl @@ -2533,12 +2155,12 @@ unxubti8 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% } - common1 + common1 { AGG_VERSION 2300 ANT /usr/share/ant/bin/ant @@ -2562,7 +2184,6 @@ unxubti8 PAM_LINK NO PERL /usr/bin/perl PKGFORMAT deb - PTHREAD_CFLAGS -DNPTL SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% @@ -2579,7 +2200,7 @@ unxubti8 XINERAMA_LINK dynamic ZIPDEP zipdep.pl } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin @@ -2602,11 +2223,11 @@ unxubti8 TEMP /tmp TMP /tmp } - compath + compath { COMPATH /usr/bin } - debug + debug { LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH% } @@ -2619,7 +2240,7 @@ unxubti8 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk15 + jdk15 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -2633,11 +2254,7 @@ unxubti8 { SOLAR_JDK15PATH %JDK_PATH% } - nativecvs - { - *cvs %STAR_NATIVECVS% - } - ojdk16 + ojdk16 { JAVA_HOME %OJDK16PATH% JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux @@ -2651,17 +2268,11 @@ unxubti8 { SOLAR_OJDK16PATH %JDK_PATH% } - pre - { - LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH% - SOLARINC -I. -I%PRE%/inc %SOLARINC% - SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib - } - pro + pro { PROSWITCH -DPRODUCT } - shell + shell { USE_SHELL STAR_USE_SHELL } @@ -2670,109 +2281,82 @@ unxubti8 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } } - extern + extern { - DIST_ROOT - ENV_ROOT - HOME - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT - USER + DIST_ROOT + ENV_ROOT + HOME + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT + USER } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug + reset { - CLASSPATH - COPYALL - ENABLE_CRASHDUMP + CLASSPATH + COPYALL + ENABLE_CRASHDUMP } - restore + restore { - INCLUDE + INCLUDE } - script + script { - csh + csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash } - sh + sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax - debug - distroot - envroot - jdk15 + bsclient + cap + cax + debug + distroot + envroot + jdk15 l10n L10N_framework - nativecvs STAR_NATIVECVS - ojdk16 - ojdk16path - pre PRE - pro - sourceroot + ojdk16 + ojdk16path + pro + sourceroot } } -wntgcci1 +wntgcci1 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COMPATH %SOL_TMP%$/r$/MinGW - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl - PSDK %SOL_TMP%$/r$/MinGW$/w32api - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - } - cap + cap { COMPATH %SOL_TMP%$/r$/MinGW COPYALL TRUE COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl PSDK %SOL_TMP%$/r$/MinGW$/w32api @@ -2783,11 +2367,12 @@ wntgcci1 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COMPATH %SOL_TMP%$/r$/MinGW COPYALL FALSE FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl PSDK %SOL_TMP%$/r$/MinGW$/w32api @@ -2798,7 +2383,7 @@ wntgcci1 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -2810,7 +2395,7 @@ wntgcci1 *r cd %SOLARROOT% *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl - BIG_SVX + BIG_SVX COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl DMAKEROOT %SOLARENV%$/inc$/startup @@ -2827,13 +2412,13 @@ wntgcci1 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0 { SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL bash } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/MinGW # FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK @@ -2852,7 +2437,7 @@ wntgcci1 SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% @@ -2881,7 +2466,7 @@ wntgcci1 SORT sort -T %TMP% use_shl_versions TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -2895,26 +2480,7 @@ wntgcci1 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk141 @@ -2933,7 +2499,7 @@ wntgcci1 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk151 @@ -2952,16 +2518,11 @@ wntgcci1 { SOLAR_JDK15PATH %JDK_PATH% } - pre - { - ILIB %PRE%$/lib$:%ILIB% - LIB %PRE%$/lib$:%LIB% - } - psdk + psdk { PSDK %STAR_PSDK% } - shell + shell { USE_SHELL STAR_USE_SHELL } @@ -2970,42 +2531,32 @@ wntgcci1 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15 + reset { - COPYALL - NSIS_PATH - SOLAR_ENV_ROOT - WST + COPYALL + NSIS_PATH + SOLAR_ENV_ROOT + WST } - script + script { - csh + csh { 150: setenv MYENV_PATH $PATH 160: setenv PATH $SSX_PATH - 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: setenv PATH $MYENV_PATH 270: unsetenv MYENV_PATH 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -3013,14 +2564,14 @@ wntgcci1 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 } - sh + sh { 150: export MYENV_PATH=$PATH 160: export PATH=$SSX_PATH 260: export PATH=$MYENV_PATH 270: unset MYENV_PATH 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3036,59 +2587,37 @@ wntgcci1 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot } } -wntmsci11 +wntmsci11 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT %SOURCE_ROOT_TMP% SOURCE_ROOT_USED TRUE } - ca - { - COMPATH %SOL_TMP%$/r$/msvc8p - COMPROOT %SOL_TMP%$/r$/msvc8p - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK - FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0 - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl - PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - } - cap + cap { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3107,7 +2636,7 @@ wntmsci11 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - cax + cax { COMPATH %SOL_TMP%$/r$/msvc8p COMPROOT %SOL_TMP%$/r$/msvc8p @@ -3124,7 +2653,7 @@ wntmsci11 SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3136,7 +2665,7 @@ wntmsci11 *r cdd %SOLARROOT% *s cdd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl @@ -3159,14 +2688,14 @@ wntmsci11 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0 + common0 { BS_ROOT n: SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: USE_SHELL 4nt } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc8p COMPROOT %SOLAR_ENV_ROOT%$/msvc8p @@ -3185,7 +2714,7 @@ wntmsci11 SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% @@ -3217,7 +2746,7 @@ wntmsci11 SORT sort -T %TMP% use_shl_versions TRUE } - compath + compath { COMPATH %STAR_COMPATH% } @@ -3231,26 +2760,7 @@ wntmsci11 { SOLAR_ENV_ROOT %ENV_ROOT% } - jdk13 - { - HOMEDRIVE %DEVROOT% - HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH %JDK_PATH% - } - jdk14 + jdk14 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk141 @@ -3269,7 +2779,7 @@ wntmsci11 { SOLAR_JDK14PATH %JDK_PATH% } - jdk15 + jdk15 { HOMEDRIVE %DEVROOT% HOMEPATH $/jdk151 @@ -3288,16 +2798,11 @@ wntmsci11 { SOLAR_JDK15PATH %JDK_PATH% } - pre - { - ILIB %PRE%$/lib$:%ILIB% - LIB %PRE%$/lib$:%LIB% - } - psdk + psdk { PSDK %STAR_PSDK% } - shell + shell { use_shell STAR_USE_SHELL } @@ -3306,105 +2811,68 @@ wntmsci11 SOLAR_SOURCE_ROOT %SOURCE_ROOT% SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib - SOLAR_STLPATH %STL_ROOT% - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI - SOL_TMP - SOURCE_ROOT - STL_ROOT + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + SOL_TMP + SOURCE_ROOT } - order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre - reset + order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15 + reset { - COPYALL - SOLAR_ENV_ROOT - WST + COPYALL + SOLAR_ENV_ROOT + WST } - script + script { - post + post { 150: set MYENV_PATH=%PATH 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: set PATH=%MYENV_PATH 270: unset MYENV_PATH 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - pre PRE - pro + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot } } -wntmsci12 +wntmsci12 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT_USED TRUE } - ca - { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% - COMPATH %SOL_TMP%$/r$/msvc9p - COMPROOT %SOL_TMP%$/r$/msvc9p - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 - F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/%PERLDIR% - PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% -# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe - - } - cap + cap { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3416,6 +2884,7 @@ wntmsci12 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 @@ -3428,7 +2897,7 @@ wntmsci12 # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - cax + cax { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3438,6 +2907,7 @@ wntmsci12 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %COMPATH%$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 @@ -3449,7 +2919,7 @@ wntmsci12 SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3462,7 +2932,7 @@ wntmsci12 *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe @@ -3507,7 +2977,7 @@ wntmsci12 { PERL perl } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc9p COMPROOT %SOLAR_ENV_ROOT%$/msvc9p @@ -3530,7 +3000,7 @@ wntmsci12 # TEMP $dp(%TEMP%) # TMP $dp(%TMP%) } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% @@ -3569,7 +3039,7 @@ wntmsci12 { SHIPDRIVE %BS_ROOT%$/ship$/install } - compath + compath { COMPATH $dp(%STAR_COMPATH%) } @@ -3583,26 +3053,7 @@ wntmsci12 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 - { -# HOMEDRIVE %DEVROOT% -# HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH $dp(%JDK_PATH%) - } - jdk14 + jdk14 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk141 @@ -3621,7 +3072,7 @@ wntmsci12 { SOLAR_JDK14PATH $dp(%JDK_PATH%) } - jdk15 + jdk15 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk151 @@ -3640,11 +3091,7 @@ wntmsci12 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava - { - DISABLE_JAVA TRUE - } - ojdk16 + ojdk16 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/openjdk-6-b08-windows-i586 @@ -3662,16 +3109,11 @@ wntmsci12 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre - { - ILIB %PRE%$/lib;%ILIB% - LIB %PRE%$/lib;%LIB% - } - pro + pro { RES_ENUS TRUE } - psdk + psdk { PSDK $dp(%STAR_PSDK%) } @@ -3680,59 +3122,49 @@ wntmsci12 SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%) SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib) - SOLAR_STLPATH $dp(%STL_ROOT%) - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - tmp + tmp { SOL_TMP $dp(%SOL_TMP_DIR%) } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI OSTYPE - $dp(SOL_TMP) - $dp(SOURCE_ROOT) - $dp(STL_ROOT) + $dp(SOL_TMP) + $dp(SOURCE_ROOT) $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset - { - COPYALL - CXX_X64_BINARY - DB2IMP - GCRINC - GCRLIB - GCRPATH - LIBMGR_X64_BINARY - LINK_X64_BINARY - NSIS_PATH - OLD_CHAOS + order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16 + reset + { + COPYALL + CXX_X64_BINARY + DB2IMP + GCRINC + GCRLIB + GCRPATH + LIBMGR_X64_BINARY + LINK_X64_BINARY + NSIS_PATH + OLD_CHAOS PERLDIR - SOLAR_ENV_ROOT - TFDEF - TFDIR - WST + SOLAR_ENV_ROOT + TFDEF + TFDIR + WST } - script + script { sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -3750,68 +3182,40 @@ wntmsci12 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nojava - ojdk16 - ojdk16path - pre PRE - pro + ojdk16 + ojdk16path + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot tmp SOL_TMP_DIR } } -wntmsci13 +wntmsci13 { - environment + environment { - bs_sourceroot + bs_sourceroot { SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) SOURCE_ROOT_USED TRUE } - ca - { - BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% - COMPATH %SOL_TMP%$/r$/msvc9p - COMPROOT %SOL_TMP%$/r$/msvc9p - COPYALL TRUE - DEVROOT %SOL_TMP%$/r - DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK - ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% - FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 - F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 - PCLEAN_PATH %SOLARROOT%$/etw - PERL %SOL_TMP%$/r$/%PERLDIR% - PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 - SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE - SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv - SOLARROOT %SOL_TMP%$/r - SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% - SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% -# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe - - } - cap + cap { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3823,6 +3227,7 @@ wntmsci13 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOLARROOT%$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 @@ -3835,7 +3240,7 @@ wntmsci13 # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - cax + cax { BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% COMPATH %SOL_TMP%$/r$/msvc9p @@ -3845,6 +3250,7 @@ wntmsci13 ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% FSDK %COMPATH%$/Sdk$/v3.5 F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOL_TMP%$/NSIS_242_unicode PCLEAN_PATH %SOL_TMP%$/r$/etw PERL %SOL_TMP%$/r$/%PERLDIR% PSDK %COMPATH%$/PlatformSDK$/V6.1 @@ -3856,7 +3262,7 @@ wntmsci13 SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% # TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe } - common + common { *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% *build_client %PERL% %SOLARENV%$/bin$/build_client.pl @@ -3869,7 +3275,7 @@ wntmsci13 *s cd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl - BIG_SVX + BIG_SVX BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe @@ -3914,7 +3320,7 @@ wntmsci13 { PERL perl } - common1 + common1 { COMPATH %SOLAR_ENV_ROOT%$/msvc9p COMPROOT %SOLAR_ENV_ROOT%$/msvc9p @@ -3937,7 +3343,7 @@ wntmsci13 # TEMP $dp(%TEMP%) # TMP $dp(%TMP%) } - common2 + common2 { ENABLE_GRAPHITE TRUE BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% @@ -3976,7 +3382,7 @@ wntmsci13 { SHIPDRIVE %BS_ROOT%$/ship$/install } - compath + compath { COMPATH $dp(%STAR_COMPATH%) } @@ -3990,26 +3396,7 @@ wntmsci13 { SOLAR_ENV_ROOT $dp(%ENV_ROOT%) } - jdk13 - { -# HOMEDRIVE %DEVROOT% -# HOMEPATH $/jdk131 - JAVAHOME %JDK13PATH% - JAVA_HOME %JDK13PATH% - JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32 - JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 - JDKLIB %JDK13PATH%$/lib - JDKLIBS %JDK13PATH%$/lib - JDKPATH %JDK13PATH%$/bin - JDK_VERSION 131 - JREPATH %JDK13PATH%$/jre$/bin$/hotspot - XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar - } - jdk13path:0 if X%JDK_PATH%X != XX - { - SOLAR_JDK13PATH $dp(%JDK_PATH%) - } - jdk14 + jdk14 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk141 @@ -4028,7 +3415,7 @@ wntmsci13 { SOLAR_JDK14PATH $dp(%JDK_PATH%) } - jdk15 + jdk15 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/jdk151 @@ -4047,11 +3434,7 @@ wntmsci13 { SOLAR_JDK15PATH $dp(%JDK_PATH%) } - nojava - { - DISABLE_JAVA TRUE - } - ojdk16 + ojdk16 { # HOMEDRIVE %DEVROOT% # HOMEPATH $/openjdk-6-b08-windows-i586 @@ -4069,16 +3452,11 @@ wntmsci13 { SOLAR_OJDK16PATH $dp(%JDK_PATH%) } - pre - { - ILIB %PRE%$/lib;%ILIB% - LIB %PRE%$/lib;%LIB% - } - pro + pro { RES_ENUS TRUE } - psdk + psdk { PSDK $dp(%STAR_PSDK%) } @@ -4087,59 +3465,49 @@ wntmsci13 SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%) SOURCE_ROOT_USED TRUE } - stl:0 IF X%STL_ROOT%X != XX - { - SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib) - SOLAR_STLPATH $dp(%STL_ROOT%) - } - stl:1 IF X%STL_ROOT%X == XX - { - SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl - } - tmp + tmp { SOL_TMP $dp(%SOL_TMP_DIR%) } } - extern + extern { - COMSPEC - DIST_ROOT - ENV_ROOT - JDK_PATH - LOCALINI + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI OSTYPE - $dp(SOL_TMP) - $dp(SOURCE_ROOT) - $dp(STL_ROOT) + $dp(SOL_TMP) + $dp(SOURCE_ROOT) $dp(TMP) $dp(TEMP) } - order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre - reset - { - COPYALL - CXX_X64_BINARY - DB2IMP - GCRINC - GCRLIB - GCRPATH - LIBMGR_X64_BINARY - LINK_X64_BINARY - NSIS_PATH - OLD_CHAOS + order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16 + reset + { + COPYALL + CXX_X64_BINARY + DB2IMP + GCRINC + GCRLIB + GCRPATH + LIBMGR_X64_BINARY + LINK_X64_BINARY + NSIS_PATH + OLD_CHAOS PERLDIR - SOLAR_ENV_ROOT - TFDEF - TFDIR - WST + SOLAR_ENV_ROOT + TFDEF + TFDIR + WST } - script + script { sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -4157,32 +3525,26 @@ wntmsci13 882: fi } } - switches + switches { bs_sourceroot SOURCE_ROOT_TMP - bsclient - ca - cap - cax + bsclient + cap + cax compath STAR_COMPATH - distroot - envroot - jdk13 - jdk13path - jdk14 - jdk14path - jdk15 - jdk15path + distroot + envroot + jdk14 + jdk14path + jdk15 + jdk15path l10n L10N_framework - nojava - ojdk16 - ojdk16path - pre PRE - pro + ojdk16 + ojdk16path + pro psdk STAR_PSDK shell STAR_USE_SHELL - sourceroot - stl + sourceroot tmp SOL_TMP_DIR } } diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index a862ec39897f..19f6e30ad175 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -100,9 +100,7 @@ $(USE_SHL1VERSIONMAP) .PHONY: .ENDIF # "$(SHL1VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) -.ENDIF $(USE_SHL1VERSIONMAP): \ $(SHL1OBJS)\ @@ -139,9 +137,7 @@ $(USE_SHL1VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL1VERSIONMAP)"!="" USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS) @@ -189,11 +185,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL1SONAME=$(SONAME_SWITCH)$(SHL1TARGETN:f) -.ELSE SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -654,9 +646,7 @@ $(USE_SHL2VERSIONMAP) .PHONY: .ENDIF # "$(SHL2VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) -.ENDIF $(USE_SHL2VERSIONMAP): \ $(SHL2OBJS)\ @@ -693,9 +683,7 @@ $(USE_SHL2VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL2VERSIONMAP)"!="" USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS) @@ -743,11 +731,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL2SONAME=$(SONAME_SWITCH)$(SHL2TARGETN:f) -.ELSE SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -1208,9 +1192,7 @@ $(USE_SHL3VERSIONMAP) .PHONY: .ENDIF # "$(SHL3VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) -.ENDIF $(USE_SHL3VERSIONMAP): \ $(SHL3OBJS)\ @@ -1247,9 +1229,7 @@ $(USE_SHL3VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL3VERSIONMAP)"!="" USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS) @@ -1297,11 +1277,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL3SONAME=$(SONAME_SWITCH)$(SHL3TARGETN:f) -.ELSE SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -1762,9 +1738,7 @@ $(USE_SHL4VERSIONMAP) .PHONY: .ENDIF # "$(SHL4VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) -.ENDIF $(USE_SHL4VERSIONMAP): \ $(SHL4OBJS)\ @@ -1801,9 +1775,7 @@ $(USE_SHL4VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL4VERSIONMAP)"!="" USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS) @@ -1851,11 +1823,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL4SONAME=$(SONAME_SWITCH)$(SHL4TARGETN:f) -.ELSE SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -2316,9 +2284,7 @@ $(USE_SHL5VERSIONMAP) .PHONY: .ENDIF # "$(SHL5VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) -.ENDIF $(USE_SHL5VERSIONMAP): \ $(SHL5OBJS)\ @@ -2355,9 +2321,7 @@ $(USE_SHL5VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL5VERSIONMAP)"!="" USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS) @@ -2405,11 +2369,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL5SONAME=$(SONAME_SWITCH)$(SHL5TARGETN:f) -.ELSE SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -2870,9 +2830,7 @@ $(USE_SHL6VERSIONMAP) .PHONY: .ENDIF # "$(SHL6VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) -.ENDIF $(USE_SHL6VERSIONMAP): \ $(SHL6OBJS)\ @@ -2909,9 +2867,7 @@ $(USE_SHL6VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL6VERSIONMAP)"!="" USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS) @@ -2959,11 +2915,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL6SONAME=$(SONAME_SWITCH)$(SHL6TARGETN:f) -.ELSE SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -3424,9 +3376,7 @@ $(USE_SHL7VERSIONMAP) .PHONY: .ENDIF # "$(SHL7VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) -.ENDIF $(USE_SHL7VERSIONMAP): \ $(SHL7OBJS)\ @@ -3463,9 +3413,7 @@ $(USE_SHL7VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL7VERSIONMAP)"!="" USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS) @@ -3513,11 +3461,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL7SONAME=$(SONAME_SWITCH)$(SHL7TARGETN:f) -.ELSE SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -3978,9 +3922,7 @@ $(USE_SHL8VERSIONMAP) .PHONY: .ENDIF # "$(SHL8VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) -.ENDIF $(USE_SHL8VERSIONMAP): \ $(SHL8OBJS)\ @@ -4017,9 +3959,7 @@ $(USE_SHL8VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL8VERSIONMAP)"!="" USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS) @@ -4067,11 +4007,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL8SONAME=$(SONAME_SWITCH)$(SHL8TARGETN:f) -.ELSE SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -4532,9 +4468,7 @@ $(USE_SHL9VERSIONMAP) .PHONY: .ENDIF # "$(SHL9VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) -.ENDIF $(USE_SHL9VERSIONMAP): \ $(SHL9OBJS)\ @@ -4571,9 +4505,7 @@ $(USE_SHL9VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL9VERSIONMAP)"!="" USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS) @@ -4621,11 +4553,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL9SONAME=$(SONAME_SWITCH)$(SHL9TARGETN:f) -.ELSE SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" @@ -5086,9 +5014,7 @@ $(USE_SHL10VERSIONMAP) .PHONY: .ENDIF # "$(SHL10VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) -.ENDIF $(USE_SHL10VERSIONMAP): \ $(SHL10OBJS)\ @@ -5125,9 +5051,7 @@ $(USE_SHL10VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL10VERSIONMAP)"!="" USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS) @@ -5175,11 +5099,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL10SONAME=$(SONAME_SWITCH)$(SHL10TARGETN:f) -.ELSE SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index e63b590a2e9e..4d40600ba368 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -243,7 +243,7 @@ SFXDEBUGLIB= FWELIB=-lfwe$(DLLPOSTFIX) FWILIB=-lfwi$(DLLPOSTFIX) SVXCORELIB=-lsvxcore$(DLLPOSTFIX) -SVXMSFILTERLIB=-lsvxmsfilter$(DLLPOSTFIX) +MSFILTERLIB=-lmsfilter$(DLLPOSTFIX) SVXLIB=-lsvx$(DLLPOSTFIX) BASCTLLIB=-lbasctl$(DLLPOSTFIX) BASICIDELIB=-lybctl @@ -271,10 +271,11 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) JVMACCESSLIB = -ljvmaccess$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" CPPUNITLIB = -lcppunit$(DLLPOSTFIX) +TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX) .IF "$(SYSTEM_LIBXSLT)"=="YES" XSLTLIB=$(LIBXSLT_LIBS) .ELSE -XSLTLIB=-lxslt $(ZLIB3RDLIB) $(LIBXML2LIB) +XSLTLIB=-lxslt $(LIBXML2LIB) .ENDIF .IF "$(GUI)$(COM)"=="WNTGCC" JVMFWKLIB = -ljvmfwk$(UDK_MAJOR) @@ -429,7 +430,7 @@ VBAHELPERLIB=vbahelper.lib TKTLIB=tkt.lib SJLIB=sj.lib SVXCORELIB=isvxcore.lib -SVXMSFILTERLIB=isvxmsfilter.lib +MSFILTERLIB=imsfilter.lib SVXLIB=isvx.lib BASCTLLIB=basctl.lib BASICIDELIB=ybctl.lib @@ -478,7 +479,8 @@ PKGCHKLIB=ipkgchk.lib HELPLINKERLIB=ihelplinker.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = cppunit.lib -XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB) +TESTSHL2LIB = testshl2.lib +XSLTLIB = libxslt.lib $(LIBXML2LIB) .IF "$(GUI)"=="OS2" REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib .ELSE diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index a7c1a50e911b..74248a6e8cd7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m67(Build:9466) -BUILD=9466 -LAST_MINOR=m67 +RSCREVISION=300m69(Build:9475) +BUILD=9475 +LAST_MINOR=m69 SOURCEVERSION=DEV300 diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 7b8e6f2aaadd..991309d6de6e 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -160,7 +160,7 @@ $(SLO)/precompiled_ex.% .PHONY: $(SLO)/%.obj : %.cxx @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< -.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) +.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" ) # just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) # cleanup first diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 8d068bd28c04..6110498edd29 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -191,7 +191,6 @@ CDEFSPROF= CDEFSDEBUG= CDEFSDBGUTIL= CDEFSOPT= -HDEFS= CFLAGS= CFLAGSCALL= @@ -849,12 +848,7 @@ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf .ENDIF # "$(LOCALIZESDF)"=="" .ENDIF # "$(WITH_LANG)"!="" -.IF "$(PRE)"=="" -#JARDIR=$(CLASSDIR) JARDIR=$(OUT)/class -.ELSE -JARDIR=$(PRE)/class -.ENDIF # needs to be expanded!!! @@ -897,9 +891,6 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD) UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER) -.IF "$(PRE)"!="" -UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC) -.ENDIF UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR) CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME) @@ -928,7 +919,6 @@ CDEFSDEBUG=-DDEBUG .ENDIF CDEFSDBGUTIL=-DDBG_UTIL CDEFSOPT=-DOPTIMIZE -HDEFS=-D:$(GUI) -D:$(COM) MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/) MKDEPALLINC=$(SOLARINC:s/-I/ -I/) @@ -1136,11 +1126,8 @@ RSCDEFS+=-DDBG_UTIL .IF "$(product)"!="" CDEFS+= -DPRODUCT -DNDEBUG -HDEFS+= -D:PRODUCT RSCDEFS+= -DPRODUCT -CDEFS+=-DPRODUCT_FULL -HDEFS+=-D:PRODUCT_FULL -RSCDEFS+= -DPRODUCT_FULL -DNDEBUG +RSCDEFS+= -DNDEBUG .ENDIF .IF "$(DBG_LEVEL)"!="" @@ -1231,26 +1218,9 @@ STDLIB+=$(FILLUPARC) STDSHL+=$(FILLUPARC) .ENDIF # "$(FILUPARC)"!="" -.IF "$(DISABLE_JAVA)"=="" .IF "$(SOLAR_JAVA)"!="" CDEFS+=$(JAVADEF) .ENDIF # "$(SOLAR_JAVA)"!="" -.ELSE # "$(DISABLE_JAVA)"=="" -SOLAR_JAVA!:= -.EXPORT : SOLAR_JAVA -.IF "$(JDKPATH)"!="" -environment_confusion: - @echo ---------------------------------------------------------- - @echo - - @echo - Error! - @echo - - @echo - $$JDKPATH and $$DISABLE_JAVA are set. this will lead - @echo - to impropper results. - @echo - - @echo ---------------------------------------------------------- - force_dmake_to_error -.ENDIF # "$(JDKPATH)"!="" -.ENDIF # "$(DISABLE_JAVA)"=="" .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc index 07853e84862e..c114458617de 100644 --- a/solenv/inc/shlinfo.rc +++ b/solenv/inc/shlinfo.rc @@ -29,7 +29,7 @@ #define LG_D // generate always german version #endif -#define VER_FIRSTYEAR 2008 +#define VER_FIRSTYEAR 2010 #if defined(OS2) diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index eb4b35008e8a..2330aa64e49b 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -55,9 +55,6 @@ target_empty=warn_target_empty INCEXT*=. INCPRE*=. INCPOST*=. -.IF "$(PRE)"!="" -ENVINCPRE+=-I$(PRE)/inc -.ENDIF # "$(PRE)"!="" .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" UNOINCLUDES=$(SOLARINCDIR)/offuh .ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" @@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS) INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ENDIF # "$(PRJINC)"!="" INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB @@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L .IF "$(UNOTYPES)" != "" # makeing all in one .DIRCACHE=no -.IF "$(ENVINCPRE)"!="" -MKDEPFLAGS+=-I:$(ENVINCPRE) -.ENDIF # "$(ENVINCPRE))"!="" .IF "$(OBJFILES)"!="" $(OBJFILES) : $(UNOUCRTARGET) .ENDIF # "$(OBJFILES)"!="" diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk new file mode 100755 index 000000000000..a8a33051f0fc --- /dev/null +++ b/solenv/inc/tg_help.mk @@ -0,0 +1,86 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.pmk,v $ +# +# $Revision: 1.25 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# to make it usable with special lang selection of +# helpcontent2 + +aux_alllangiso*:=$(alllangiso) + +SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) +HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) + +ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix + +$(HLANGXHPFILES) : $$(@:d)thisdir.created + +$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp + @$(TOUCH) $@ +# internal dependencies not sufficient to trigger merge? +# @$(NULL) + + +$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) +.IF "$(WITH_LANG)"!="" + $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ +.ELSE # "$(WITH_LANG)"!="" + cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ +.ENDIF # "$(WITH_LANG)"!="" +.IF "$(OS)"=="SOLARIS" + @$(ECHONL) " " +.ELSE # "$(OS)"=="SOLARIS" + @$(ECHONL) +.ENDIF # "$(OS)"=="SOLARIS" + +$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) + @$(TOUCH) $@ + +# urks - dmake mixes up operators and strings :-( +.IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" + +.IF "$(HELPTRANSPHONY)"!="" +$(COMMONMISC)$/$(TARGET).done .PHONY : +.ELSE # "$(HELPTRANSPHONY)"!="" + +$(COMMONMISC)$/$(TARGET).done : makefile.mk +.IF "$(WITH_LANG)"!="" +$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF) +.ENDIF # "$(WITH_LANG)"!="" +.ENDIF # "$(HELPTRANSPHONY)"!="" +.ENDIF # "$(HLANGXHPFILES)"!="" + +optix: $(COMMONMISC)$/$(TARGET).done + @echo done + +%.created : + @@-$(MKDIRHIER) $(@:d) + @$(TOUCH) $@ + + diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 496e95926981..8cb6653f334e 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -133,9 +133,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY: .ENDIF # "$(SHL$(TNR)VERSIONMAP)"!="" -.IF "$(OS)"!="IRIX" SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) -.ENDIF $(USE_SHL$(TNR)VERSIONMAP): \ $(SHL$(TNR)OBJS)\ @@ -172,9 +170,7 @@ $(USE_SHL$(TNR)VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL$(TNR)VERSIONMAP)"!="" USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e) -.IF "$(OS)"!="IRIX" SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) -.ENDIF .IF "$(OS)"=="MACOSX" $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS) @@ -222,11 +218,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP) .IF "$(UNIXVERSIONNAMES)"!="" .IF "$(OS)"!="MACOSX" .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="IRIX" -SHL$(TNR)SONAME=$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f) -.ELSE SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\" -.ENDIF .ENDIF # "$(GUI)"!="UNX" .ENDIF # "$(OS)"!="MACOSX" .ENDIF # "$(UNIXVERSIONNAMES)"!="" diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index bb5a4864484d..36e5cd70447f 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -151,18 +151,6 @@ .INCLUDE : unxfbsd.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM" -.INCLUDE : unxirxm3.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)" == "GCCIRIXM" -.INCLUDE : unxirgm.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)" == "C710IRIXM" -.INCLUDE : unxirxm.mk -.ENDIF - .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" .INCLUDE : unxmacxp.mk .ENDIF diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk deleted file mode 100644 index b3abfb76d2c3..000000000000 --- a/solenv/inc/unxirgm.mk +++ /dev/null @@ -1,163 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxirgm.mk,v $ -# -# $Revision: 1.15 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI -ASM= -AFLAGS= - -SOLAR_JAVA=TRUE -JAVADEF=-DSOLAR_JAVA -#JAVAFLAGSDEBUG=-g - -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -CC= gcc -CXX= g++ -CFLAGS=-c -CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR -CFLAGSCC=$(ARCH_FLAGS) -CFLAGSCXX=$(ARCH_FLAGS) -PICSWITCH:=-fpic - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -CFLAGSOPT=-O2 -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC=-w -CFLAGSWALLCC=-Wall -CFLAGSWERRCC=-Werror - -# exception flags -CFLAGSEXCEPTIONS=-fexceptions -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -STATIC= -Wl,-Bstatic -DYNAMIC= -Wl,-Bdynamic - -# -# To use the map files, you need to have a gcc_specs file which contains: -# *linker: -# /path/to/bin/ld.sh -# where ld.sh is a wrapper script that does some conversion of the -# map files on the fly. -# -LINK= g++ -LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved -LINKVERSIONMAPFLAG= -Wl,-exports_file - -LINKFLAGSAPPGUI= $(THREADLIB) -LINKFLAGSAPPCUI= $(THREADLIB) -LINKFLAGSSHLGUI= $(THREADLIB) -LINKFLAGSSHLCUI= $(THREADLIB) - -LINKFLAGSAPPGUI+= -Wl,-multigot -LINKFLAGSAPPCUI+= -Wl,-multigot -LINKFLAGSSHLGUI+= -shared -LINKFLAGSSHLCUI+= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG= -g -LINKFLAGSOPT= - -LINKFLAGSSHLGUI += -Wl,-Bsymbolic -LINKFLAGSSHLCUI += -Wl,-Bsymbolic - -APPLINKSTATIC=-Bstatic -APPLINKSHARED=-Bsymbolic - -SONAME_SWITCH = -Wl,-soname -Wl, - -# Sequence of libraries DOES matter! -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= -STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc -STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm -STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc -STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc -THREADLIB= -lpthread - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST= -lstlport -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST= -lstlport_gcc -.ENDIF - -LIBMGR= ar -LIBFLAGS= -r - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC= irc -RCFLAGS= -fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -DLLPOSTFIX= im -DLLPRE= lib -DLLPOST= .so - - -LDUMP=c++filt diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk deleted file mode 100644 index 80aae3d5b382..000000000000 --- a/solenv/inc/unxirxm.mk +++ /dev/null @@ -1,162 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxirxm.mk,v $ -# -# $Revision: 1.10 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# mak-file for IRIX/mips -ASM= -AFLAGS= - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# -# Zu den Compilerflags: -# -# -ptused : instantisiert Templates, wenn sie benutzt werden. -# Der Schalter wurde neu eingefuegt, weil sich eine -# statische Memberfunktion nicht instantisieren liess. -# (ts&sdo/10.06.98) -# -CC= cc -KPIC -c -n32 -CXX= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 -CDEFS+=-D_PTHREADS -CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -# 1009 ...nested comment is not allowed... -# 1021 ...type qualifiers are meaningless in this declaration... -# 1107 ...signed bit field of length 1... -# 1110 ...statement not reached... -# 1155 ...unrecognized #pragma... -# 1171 ...expression has no effect... -# 1183 ...comparison of unsigned integer with zero... -# 1185 ...enumerated type mixed with another type... -# 1188 ...type qualifier is meaningless on cast type... -# 1233 ...explicit type is missing ("int" assumed)... -# 1234 ...access control not specified... -# 1257 ...NULL reference is not allowed... -# 1440 ...initial value of reference to non-const must be an lvalue... -# 1516 ...pointless comparison of unsigned integer with a negative constant -# 1681 ...virtual function override intended... -# 1682 ...is only partially overridden in class... -CFLAGSCC= -Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS) -CFLAGSCXX= -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS) -CFLAGSOBJGUIMT= -CFLAGSOBJCUIMT= -CFLAGSSLOGUIMT= -CFLAGSSLOCUIMT= -CFLAGSPROF= -CFLAGSDEBUG= -g -CFLAGSDBGUTIL= -CFLAGSOPT= -O -CFLAGSNOOPT= -CFLAGSOUTOBJ= -o - -STATIC= -B static -DYNAMIC= -B dynamic - -# -# Zu den Linkflags: -# -# -update_registry <file> : fuer das Linken mehrerer shared Libraries -# erforderlich. -# **FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER -# MECHANISMUS** -# -LINK= CC -LINKFLAGS= -LINKFLAGSAPPGUI=-n32 -multigot -LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations -LINKFLAGSAPPCUI=-n32 -multigot -LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG= -LINKFLAGSOPT= -APPLINKSTATIC=-Bstatic -APPLINKSHARED=-Bsymbolic - -# Reihenfolge der Libraries NICHT egal! -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= -# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm -# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm -STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm -THREADLIB= -lpthread - -LIBMGR= ar -LIBFLAGS= -r -# LIBEXT= .so - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC= irc -RCFLAGS= -fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -DLLPOSTFIX= im -.IF "$(WORK_STAMP)"=="MIX364" -DLLPOSTFIX= -.ENDIF -DLLPRE= lib -DLLPOST= .so - - -LDUMP= - - -# -------------------------- -# AUS DEM ALTEN ENVIRONMENT: -# -------------------------- -# -# Linken einer statischen Library: -# ar -r ... -# -# Linken einer shared Library: -# CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot -# -update_registry <...> ... -# -# Linken einer Applikation mit statischen Librarys: -# CC -B static ... -# -# Linken einer Applikation mit stared Librarys: -# CC -n32 -multigot ... -# - diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk deleted file mode 100644 index 8d24d2c54032..000000000000 --- a/solenv/inc/unxirxm3.mk +++ /dev/null @@ -1,162 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxirxm3.mk,v $ -# -# $Revision: 1.12 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -# Makefile for IRIX/mips -ASM= -AFLAGS= - -SOLAR_JAVA*=TRUE -JAVADEF=-DSOLAR_JAVA -#JAVAFLAGSDEBUG=-g - -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -CC= cc -CXX= CC -CFLAGS= -c -CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR -CFLAGSCC=$(ARCH_FLAGS) -CFLAGSCXX= -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS) - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=-KPIC -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=-KPIC -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -CFLAGSOPT=-O2 -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC=-w -CFLAGSWALLCC=-fullwarn -CFLAGSWERRCC= - -# exception flags -CFLAGSEXCEPTIONS=-LANG:exceptions=ON -CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF -#CFLAGS_NO_EXCEPTIONS= - -STATIC= -Wl,-Bstatic -DYNAMIC= -Wl,-Bdynamic - -# -# To use the map files, you need to have a gcc_specs file which contains: -# *linker: -# /path/to/bin/ld.sh -# where ld.sh is a wrapper script that does some conversion of the -# map files on the fly. -# -LINK= CC -LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved -LINKVERSIONMAPFLAG= -Wl,-exports_file - -LINKFLAGSAPPGUI= $(THREADLIB) -LINKFLAGSAPPCUI= $(THREADLIB) -LINKFLAGSSHLGUI= $(THREADLIB) -LINKFLAGSSHLCUI= $(THREADLIB) - -LINKFLAGSAPPGUI+= -Wl,-multigot -LINKFLAGSAPPCUI+= -Wl,-multigot -LINKFLAGSSHLGUI+= -shared -LINKFLAGSSHLCUI+= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG= -g -LINKFLAGSOPT= - -LINKFLAGSSHLGUI += -Wl,-Bsymbolic -LINKFLAGSSHLCUI += -Wl,-Bsymbolic - -APPLINKSTATIC=-Bstatic -APPLINKSHARED=-Bsymbolic - -SONAME_SWITCH = -Wl,-soname -Wl, - -# Sequence of libraries DOES matter! -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= -STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc -STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm -STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc -STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc -THREADLIB= -lpthread - -#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro -LIBSTLPORT=$(DYNAMIC) -LIBSTLPORTST= -#LIBSTLPORTST= -lstlport_mipspro - -LIBMGR= ar -LIBFLAGS= -r - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC= irc -RCFLAGS= -fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -DLLPOSTFIX= im -DLLPRE= lib -DLLPOST= .so - - -LDUMP=c++filt - - diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index a79d3e47c6cf..b6c8f798a5f9 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort .ENDIF # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk index 6d27121366e5..09d5d424b690 100644 --- a/solenv/inc/unxmacxi.mk +++ b/solenv/inc/unxmacxi.mk @@ -55,7 +55,6 @@ CFLAGSENABLESYMBOLS=-g .IF "$(SNOW_LEOPARD_10_4)"!="" JAVACOMPILER+=-target 1.5 -DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib .EXPORT: DYLD_INSERT_LIBRARIES .ENDIF # "$(SNOW_LEOPARD_10_4)"!="" diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index afcea59a9971..c4c777376561 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context STDLIBGUIMT+=-ldl STDSHLGUIMT+=-ldl -X11LINK_DYNAMIC = -lX11 +X11LINK_DYNAMIC = -lXext -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index a28b097e13b4..67bafa3a1c14 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context STDLIBGUIMT+=-ldl STDSHLGUIMT+=-ldl -X11LINK_DYNAMIC = -lX11 +X11LINK_DYNAMIC = -lXext -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index 6de6b3c99763..048b59205e08 100644 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -38,8 +38,8 @@ #define VER_FINAL 0
#define VER_DAY 1
-#define VER_MONTH 9
-#define VER_YEAR 2009
+#define VER_MONTH 1
+#define VER_YEAR 2010
#ifndef VER_FIRSTYEAR
#define VER_FIRSTYEAR VER_YEAR
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index 6eb9a183d6bd..852af90168b0 100644 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -38,8 +38,8 @@ #define VER_FINAL 0
#define VER_DAY 1
-#define VER_MONTH 9
-#define VER_YEAR 2009
+#define VER_MONTH 1
+#define VER_YEAR 2010
#ifndef VER_FIRSTYEAR
#define VER_FIRSTYEAR VER_YEAR
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk index a4963b2eb071..4c8f03942793 100644..100755 --- a/soltools/adjustvisibility/makefile.mk +++ b/soltools/adjustvisibility/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -53,6 +53,9 @@ DEPOBJFILES = $(APP1OBJ) APP1STDLIBS = -lelf APP1RPATH = NONE +#APP1STDLIBS+=-lstlport +APP1STDLIBS+=-lCstd + .ENDIF "$(OS)"=="SOLARIS" # --- Targets ------------------------------------------------------ diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 95cd3da8d857..691996d56cca 100755 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -64,7 +64,7 @@ bool IncludesCollection::exists(string filePath) { } else { return true; }; - return false; + //return false; }; extern "C" { diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index ca6f57ef1c7b..af4bae825601 100644..100755 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -37,6 +37,7 @@ LIBTARGET=NO # noadjust here to have dependencies over there noadjust=TRUE nodep=true +ENABLE_EXCEPTIONS=TRUE # "mkdepend" is written in K&R style C. Modern compilers will generate # lots of warning. There is no point in cleaning this up, so we just @@ -49,7 +50,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE LIBSALCPPRT= UWINAPILIB= -CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS +CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS OBJFILES= \ $(OBJ)$/cppsetup.obj \ @@ -65,6 +66,21 @@ APP1TARGET=makedepend APP1OBJS=$(OBJFILES) APP1RPATH=NONE +.IF "$(COM)"=="MSC" +.IF "$(dbgutil)"=="" +APP1STDLIBS+=msvcprt.lib +.ELSE +APP1STDLIBS+=msvcprtd.lib +CDEFS+=-D_DEBUG +.ENDIF # "$(DBG_UTIL)"=="" +.ENDIF # "$(COM)"=="MSC" + +.IF "$(OS)"=="SOLARIS" +#APP1STDLIBS+=-lstlport +APP1STDLIBS+=-lCstd +.ENDIF + + .INCLUDE : target.mk diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 0a3ed598db0e..3c4e50eb0cda 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,4 +1,4 @@ -so soltools : stlport SUN:so_prereq NULL +so soltools : SUN:so_prereq NULL so soltools usr1 - all so_usr1 NULL so soltools\inc get - all so_inc NULL so soltools\ldump nmake - all so_ldump so_mkdep NULL diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index ad80f13bf8b9..a119dd844472 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -34,3 +34,19 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility + +# avoid STLPort +NO_DEFAULT_STL=TRUE +SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) + +.IF "$(OS)"=="SOLARIS" +# hack due to #i53089# +.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)" +HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x")) +.ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" +HELP_COMPATH:=$(COMPATH) +.ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" +#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4 +#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4 +SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd +.ENDIF diff --git a/splitbuild/base.lst b/splitbuild/base.lst new file mode 100644 index 000000000000..cda4527f3496 --- /dev/null +++ b/splitbuild/base.lst @@ -0,0 +1 @@ +reportdesign dbaccess diff --git a/splitbuild/binfilter.lst b/splitbuild/binfilter.lst new file mode 100644 index 000000000000..1baa90b768cf --- /dev/null +++ b/splitbuild/binfilter.lst @@ -0,0 +1 @@ +binfilter diff --git a/splitbuild/bm b/splitbuild/bm new file mode 100755 index 000000000000..16872f1413d5 --- /dev/null +++ b/splitbuild/bm @@ -0,0 +1,4 @@ +build --genconf --clear +build --genconf --add `cat $1` +build --all $2 $3 $4 + diff --git a/splitbuild/build.lst b/splitbuild/build.lst new file mode 100644 index 000000000000..e19d9cebed73 --- /dev/null +++ b/splitbuild/build.lst @@ -0,0 +1 @@ +crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst new file mode 100644 index 000000000000..2c13a4c6d503 --- /dev/null +++ b/splitbuild/calc.lst @@ -0,0 +1 @@ +scaddins sccomp sc diff --git a/splitbuild/common.lst b/splitbuild/common.lst new file mode 100644 index 000000000000..7b7214f0d227 --- /dev/null +++ b/splitbuild/common.lst @@ -0,0 +1 @@ +basebmp basegfx bean comphelper configmgr connectivity embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards diff --git a/splitbuild/content.lst b/splitbuild/content.lst new file mode 100644 index 000000000000..dd8d40c75da7 --- /dev/null +++ b/splitbuild/content.lst @@ -0,0 +1 @@ +dictionaries extras helpcontent2 diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst new file mode 100644 index 000000000000..6f83eca0069d --- /dev/null +++ b/splitbuild/draw.lst @@ -0,0 +1 @@ +animations sd slideshow diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst new file mode 100644 index 000000000000..86fe24b8830d --- /dev/null +++ b/splitbuild/extensions.lst @@ -0,0 +1 @@ +migrationanalysis reportbuilder sdext swext diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst new file mode 100644 index 000000000000..334ad19a5b10 --- /dev/null +++ b/splitbuild/extern.lst @@ -0,0 +1 @@ +afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst new file mode 100755 index 000000000000..9659e019d7cb --- /dev/null +++ b/splitbuild/filter.lst @@ -0,0 +1 @@ +filter hwpfilter oox writerfilter writerperfect xmerge
\ No newline at end of file diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst new file mode 100644 index 000000000000..89ed01c617d6 --- /dev/null +++ b/splitbuild/framework.lst @@ -0,0 +1 @@ +automation avmedia basic basctl cui desktop drawinglayer embeddedobj extensions forms formula framework idl scripting sfx2 svx xmlsecurity diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst new file mode 100644 index 000000000000..55c2e7a20309 --- /dev/null +++ b/splitbuild/gui.lst @@ -0,0 +1 @@ +accessibility canvas cppcanvas dtrans fpicker goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst new file mode 100644 index 000000000000..24bc4e91e33c --- /dev/null +++ b/splitbuild/prj/build.lst @@ -0,0 +1,2 @@ +spl splitbuild :: reportdesign dbaccess packimages postprocess scp2 testtools instsetoo_native scaddins sccomp sc basebmp basegfx bean comphelper configmgr connectivity crashrep embedserv eventattacher fileaccess i18npool i18nutil javainstaller2 linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards animations sd slideshow migrationanalysis reportbuilder sdext swext afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu JFREEREPORT:jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib automation avmedia basic drawinglayer embeddedobj filter formula fpicker framework idl oox sfx2 svx uui accessibility canvas cppcanvas dtrans goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls vcl binfilter dictionaries extras helpcontent2 soltools basctl chart2 cui desktop extensions forms scripting starmath xmlsecurity autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp hwpfilter sw writerfilter writerperfect NULL + diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst new file mode 100644 index 000000000000..b87dd52c7da2 --- /dev/null +++ b/splitbuild/prj/d.lst @@ -0,0 +1 @@ +#dummy d.lst file diff --git a/splitbuild/start.lst b/splitbuild/start.lst new file mode 100644 index 000000000000..3838044a8c4a --- /dev/null +++ b/splitbuild/start.lst @@ -0,0 +1 @@ +soltools diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst new file mode 100644 index 000000000000..31ee787564de --- /dev/null +++ b/splitbuild/uno.lst @@ -0,0 +1 @@ +autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst new file mode 100644 index 000000000000..619d7c52d9c7 --- /dev/null +++ b/splitbuild/writer.lst @@ -0,0 +1 @@ +hwpfilter sw writerfilter writerperfect diff --git a/stlport/makefile.mk b/stlport/makefile.mk index ab4dfa244e72..bff4f60fd719 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -169,14 +169,6 @@ OUT2INC= \ stlport$/SC5$/*.SUNWCCh .ENDIF -.IF "$(OS)"=="IRIX" -TARFILE_NAME=STLport-4.5 -PATCH_FILES=STLport-4.5.patch -BUILD_ACTION=gmake -BUILD_FLAGS=-f gcc-3.0.mak -BUILD_FLAGS+= -j$(MAXPROCESS) -.ENDIF - OUTDIR2INC= \ stlport |