diff options
107 files changed, 3307 insertions, 1860 deletions
diff --git a/Module_ooo.mk b/Module_ooo.mk index fdfb183d2115..57be13948a3d 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -28,15 +28,20 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ + comphelper \ + editeng \ framework \ sfx2 \ + sot \ svl \ svtools \ + svx \ sw \ toolkit \ tools \ vcl \ xmloff \ + vbahelper \ )) # vim: set noet ts=4 sw=4: diff --git a/Repository.mk b/Repository.mk index 6b4acd635721..42a6b1474fd0 100755 --- a/Repository.mk +++ b/Repository.mk @@ -94,6 +94,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icuuc \ icule \ graphite_dll \ + cppunit \ )) @@ -121,6 +122,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ passwordcontainer \ productregistration \ vbaswobj \ + msforms \ )) diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 6ccc096a550e..b7fcb29f56ef 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -29,7 +29,7 @@ # not follow any of the established nameschemes ifeq ($(OS),LINUX) -gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) @@ -47,7 +47,7 @@ endif ifeq ($(OS),MACOSX) -gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) @@ -64,6 +64,7 @@ endif ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES)) @@ -95,7 +96,8 @@ gb_Library_ILIBFILENAMES:=\ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT)) -gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp4%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) @@ -107,6 +109,7 @@ endif else gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES)) @@ -153,7 +156,7 @@ ifneq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES)) endif -gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp4%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) @@ -163,7 +166,7 @@ endif endif ifeq ($(OS),SOLARIS) -gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) diff --git a/configure b/configure index 98cb77f6d783..98068283bdf7 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 TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH 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_SHARED_LIBSTDCPP 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 JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT 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 ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS 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 MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC 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 GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI 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 OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep 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 TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH 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 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_SHARED_LIBSTDCPP 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 JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT 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 ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS 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 MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC 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 GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI 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 OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8129,52 +8129,6 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th fi -echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 -echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6 -if test -n "$enable_vba" && test "$enable_vba" = "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - ENABLE_VBA=NO -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ENABLE_VBA=YES -fi - - -if test "$ENABLE_VBA" = "YES"; then - echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 -echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6 - if test -n "$with_vba_package_format"; then - if test "$with_vba_package_format" = "extn"; then - VBA_EXTENSION=YES - echo "$as_me:$LINENO: result: uno extension" >&5 -echo "${ECHO_T}uno extension" >&6 - { echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 -echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} - else if test "$with_vba_package_format" = "builtin"; then - VBA_EXTENSION=NO - echo "$as_me:$LINENO: result: build into installset" >&5 -echo "${ECHO_T}build into installset" >&6 - else - { { echo "$as_me:$LINENO: error: unknown packaging method" >&5 -echo "$as_me: error: unknown packaging method" >&2;} - { (exit 1); exit 1; }; } - fi - fi - - else - VBA_EXTENSION=NO - echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 -echo "${ECHO_T}defaulting to build into installset" >&6 - fi -else - VBA_EXTENSION=NO -fi - - - - if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then if test "${ac_cv_header_cups_cups_h+set}" = set; then echo "$as_me:$LINENO: checking for cups/cups.h" >&5 @@ -9516,6 +9470,7 @@ echo "${ECHO_T}no" >&6 + fi if test "$_os" = "SunOS"; then @@ -25688,25 +25643,25 @@ echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} fi fi -echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 -echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6 -if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then +echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp from coreutils with preserve= support" >&5 +echo $ECHO_N "checking whether $GNUCP is GNU cp from coreutils with preserve= support... $ECHO_C" >&6 +if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then - { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 -echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + GNUCP='' +fi + +if test -z "$GNUCP"; then + if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then + { { echo "$as_me:$LINENO: error: no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it" >&5 +echo "$as_me: error: no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} { (exit 1); exit 1; }; } - else - GNUCP='' - echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 -echo "${ECHO_T}no gnucp found - using the system's cp command" >&6 - fi + else + echo "$as_me:$LINENO: result: no GNU cp from coreutils found - using the system's cp command" >&5 +echo "${ECHO_T}no GNU cp from coreutils found - using the system's cp command" >&6 fi fi @@ -30997,8 +30952,6 @@ s,@CXXCPP@,$CXXCPP,;t t s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t -s,@ENABLE_VBA@,$ENABLE_VBA,;t t -s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t s,@PAM@,$PAM,;t t s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t s,@PAM_LINK@,$PAM_LINK,;t t diff --git a/configure.in b/configure.in index 8e2d9c4e6abc..92add6148851 100644 --- a/configure.in +++ b/configure.in @@ -1946,49 +1946,6 @@ fi AC_SUBST(LFS_CFLAGS) dnl =================================================================== -dnl Check if we are to enable vba macro interoperability feature -dnl =================================================================== -AC_MSG_CHECKING([whether to disable vba feature]) -if test -n "$enable_vba" && test "$enable_vba" = "no"; then - AC_MSG_RESULT([yes]) - ENABLE_VBA=NO -else - AC_MSG_RESULT([no]) - ENABLE_VBA=YES -fi -AC_SUBST(ENABLE_VBA) - -if test "$ENABLE_VBA" = "YES"; then - AC_MSG_CHECKING([how to package the vba compatibility api]) - if test -n "$with_vba_package_format"; then - if test "$with_vba_package_format" = "extn"; then - VBA_EXTENSION=YES - AC_MSG_RESULT([uno extension]) - AC_MSG_WARN([--with-vba-package-format=extn can cause problems]) - else if test "$with_vba_package_format" = "builtin"; then - VBA_EXTENSION=NO - AC_MSG_RESULT([build into installset]) - else - AC_MSG_ERROR([unknown packaging method]) - fi - fi - - else - VBA_EXTENSION=NO - AC_MSG_RESULT([defaulting to build into installset]) - fi -else - VBA_EXTENSION=NO -fi -AC_SUBST(VBA_EXTENSION) - -dnl =================================================================== -dnl Check the whether vba need to be delivered as an uno package or part -dnl of the install -dnl =================================================================== - - -dnl =================================================================== dnl Check if cups/cups.h is available dnl =================================================================== if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then @@ -5479,19 +5436,19 @@ else fi fi -AC_MSG_CHECKING([whether $GNUCP is GNU cp]) -if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then +AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support]) +if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else - if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([no]) + GNUCP='' +fi + +if test -z "$GNUCP"; then + if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then + AC_MSG_ERROR([no, GNU cp from coreutils is needed. install or specify with --with-gnu-cp=/path/to/it]) else - if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then - AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it]) - else - GNUCP='' - AC_MSG_RESULT([no gnucp found - using the system's cp command]) - fi + AC_MSG_RESULT([no GNU cp from coreutils found - using the system's cp command]) fi fi @@ -1,4 +1,5 @@ http://hg.services.openoffice.org/binaries +48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt @@ -40,12 +41,10 @@ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip abc405d0bdd3ee22782d7aa20e440f08-zlib-1.1.4.tar.gz ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz -ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz -d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz d1a3205871c3c52e8a50c9f18510ae12-libformula.zip d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip @@ -75,3 +74,4 @@ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index e1634ab78f76..7afdcd81e1ec 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -124,8 +124,7 @@ Module gid_Module_Langpack_Brand_Template gid_Brand_Dir_Readme, gid_Brand_Dir_Share, gid_Brand_Dir_Share_Readme); - Files = (gid_Brand_File_Res_Iso, - gid_Brand_File_Res_Ooo, + Files = (gid_Brand_File_Res_About, gid_Brand_File_Res_Oirm, gid_Brand_File_Help_C05_Sdatabase_Zip, gid_Brand_File_Help_C05_Scalc_Zip, @@ -1497,3 +1496,6 @@ File gid_Brand_File_Bin_Python Styles = (PACKED); End #endif + +BRAND_RES_FILE( gid_Brand_File_Res_About, about ) + diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 228f70ee1391..0e3eaba90e84 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -55,7 +55,6 @@ File gid_File_Lib_Basprov #endif End -#ifdef ENABLE_VBA File gid_File_Lib_Vbaevent TXT_FILE_BODY; Styles = (PACKED); @@ -66,7 +65,6 @@ File gid_File_Lib_Vbaevent Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll)); #endif End -#endif // ENABLE_VBA STD_LIB_FILE( gid_File_Lib_Bib , bib) @@ -160,9 +158,9 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno ) File gid_File_Lib_Comphelper2 TXT_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT3(libcomphelp4,COMID,UNXSUFFIX)); + Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX)); #else - Name = STRING(CONCAT3(comphelp4,COMID,.dll)); + Name = STRING(CONCAT3(comphelp,COMID,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -236,8 +234,6 @@ STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt) STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm) -STD_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) - STD_LIB_FILE( gid_File_Lib_Dbase2, dbase ) STD_LIB_FILE( gid_File_Lib_Dbfile , file) @@ -336,9 +332,6 @@ File gid_File_Lib_Stringresource #endif End -#if defined ENABLE_VBA -#ifndef VBA_EXTENSION - File gid_File_Lib_Vbaobj TXT_FILE_BODY; Styles = (PACKED); @@ -366,13 +359,12 @@ File gid_File_Lib_Vbamsforms Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX - Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX)); + Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX)); #else - Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll)); + Name = STRING(CONCAT3(msforms,.uno,.dll)); #endif End -#endif // VBA_EXTENSION File gid_File_Lib_Vbahelper TXT_FILE_BODY; Styles = (PACKED); @@ -383,7 +375,6 @@ File gid_File_Lib_Vbahelper Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll)); #endif End -#endif // ENABLE_VBA #ifdef WNT diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 972c371ce489..eab2ebdf1734 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -135,35 +135,6 @@ End #endif #endif -File gid_File_Bin_Gengal - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - #ifdef UNX - Name = "gengal.bin"; - #else - Name = "gengal.exe"; - #endif -End - -#ifdef UNX - -File gid_File_Script_Gengal - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - Name = "gengal"; -End - -#endif - -File gid_File_Profile_Gengal - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - Name = PROFILENAME(gengal); -End - #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ) File gid_File_Bin_Pluginapp @@ -926,9 +897,16 @@ File gid_File_Lm_Scots_Gaelic Styles = (PACKED); End -File gid_File_Lm_Serbian_Ascii +File gid_File_Lm_Serbian TXT_FILE_BODY; - Name = "serbian_ascii.lm"; + Name = "serbian.lm"; + Dir = gid_Dir_Share_Fingerprint; + Styles = (PACKED); +End + +File gid_File_Lm_Serbian_Latin + TXT_FILE_BODY; + Name = "serbian-latin.lm"; Dir = gid_Dir_Share_Fingerprint; Styles = (PACKED); End @@ -1183,23 +1161,12 @@ File gid_File_Rdb_Offapi Name = "offapi.rdb"; End -#if defined ENABLE_VBA -#ifndef VBA_EXTENSION File gid_File_Rdb_TypesVba TXT_FILE_BODY; Dir = gid_Dir_Program; Styles = (PACKED, OVERWRITE); Name = "oovbaapi.rdb"; End -#else -File gid_File_ExtnVba - TXT_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED, OVERWRITE); - Name = "vbaapi.oxt"; -End -#endif -#endif File gid_File_Registry_Lang Dir = gid_Dir_Share_Registry_Res; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 5f2e2795eaad..77e3456443ab 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -219,13 +219,6 @@ SCPDEFS+=-DSYSTEM_NEON SCPDEFS+=-DOPENSSL .ENDIF -.IF "$(ENABLE_VBA)" == "YES" - .IF "$(VBA_EXTENSION)" == "YES" - SCPDEFS+=-DVBA_EXTENSION - .ENDIF -SCPDEFS+=-DENABLE_VBA -.ENDIF - .IF "$(DISABLE_ATL)"!="" SCPDEFS+=-DDISABLE_ATL .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index e1bc26118011..3810b3126334 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -168,7 +168,6 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Sdbt, gid_File_Lib_Dbmm, gid_File_Lib_Dba, - gid_File_Lib_Dbacfg, gid_File_Lib_Dbase2, gid_File_Lib_Dbaxml, gid_File_Lib_Dbt, @@ -594,7 +593,8 @@ Module gid_Module_Root_Files_6 gid_File_Lm_Sanskrit, gid_File_Lm_Scots, gid_File_Lm_Scots_Gaelic, - gid_File_Lm_Serbian_Ascii, + gid_File_Lm_Serbian, + gid_File_Lm_Serbian_Latin, gid_File_Lm_Slovak_Ascii, gid_File_Lm_Slovenian, gid_File_Lm_Spanish, diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index 4d78d3efb606..6111ab8130f9 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -59,4 +59,3 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server #endif End -BRAND_RES_FILE( gid_Brand_File_Res_Ooo, ooo ) diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 81bfb6a8dd2d..3c6dfefc1286 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -342,11 +342,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types ProfileID = gid_Profile_Fundamentalbasis_Ini; Section = "Bootstrap"; Key = "URE_MORE_TYPES"; -#if defined ENABLE_VBA && !defined VBA_EXTENSION Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}"; -#else - Value = "$ORIGIN/offapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}"; -#endif End ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services diff --git a/set_soenv.in b/set_soenv.in index 5061745103b1..d10cdfab8da3 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1612,8 +1612,6 @@ ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" ); ToFile( "ENABLE_NSS_MODULE", "@ENABLE_NSS_MODULE@", "e" ); ToFile( "MOZILLABUILD", "@MOZILLABUILD@", "e" ); ToFile( "BUILD_VER_STRING", "@BUILD_VER_STRING@", "e" ); -ToFile( "ENABLE_VBA", "@ENABLE_VBA@", "e" ); -ToFile( "VBA_EXTENSION", "@VBA_EXTENSION@", "e" ); if ($platform =~ m/linux/ && $platform =~ m/powerpc/) { ToFile( "JITC_PROCESSOR_TYPE","6", "e" ); } @@ -2045,8 +2043,8 @@ if ( $platform =~ m/cygwin/ ) { if ($platform =~ m/solaris|darwin|freebsd/) { ToFile( "GNUPATCH", "@GNUPATCH@", "e"); - ToFile( "GNUCOPY", "@GNUCP@", "e"); } +ToFile( "GNUCOPY", "@GNUCP@", "e"); # OS/2 define .pl as executable for 4os2 # use - as switch char for dmake (os2/switchar.c) if ($platform =~ m/os2/) diff --git a/soldep/bootstrp/command.cxx b/soldep/bootstrp/command.cxx index 10964fd69d2f..39a10093c12b 100644 --- a/soldep/bootstrp/command.cxx +++ b/soldep/bootstrp/command.cxx @@ -85,7 +85,7 @@ #endif /*****************************************************************************/ -CommandLine::CommandLine(BOOL bWrite) +CommandLine::CommandLine(sal_Bool bWrite) /*****************************************************************************/ : bTmpWrite(bWrite) { @@ -110,7 +110,7 @@ CommandLine::CommandLine(BOOL bWrite) } /*****************************************************************************/ -CommandLine::CommandLine(const char *CommandString, BOOL bWrite) +CommandLine::CommandLine(const char *CommandString, sal_Bool bWrite) /*****************************************************************************/ : bTmpWrite(bWrite) { @@ -136,7 +136,7 @@ CommandLine::CommandLine(const char *CommandString, BOOL bWrite) } /*****************************************************************************/ -CommandLine::CommandLine(const CommandLine& CCommandLine, BOOL bWrite) +CommandLine::CommandLine(const CommandLine& CCommandLine, sal_Bool bWrite) /*****************************************************************************/ : bTmpWrite(bWrite) { @@ -398,9 +398,9 @@ void CCommand::ImplInit() char *pChar; int nVoid = sizeof( size_t * ); nArgc = aCommandLine.GetTokenCount(' '); - ULONG nLen = aCommandLine.Len(); + sal_uIntPtr nLen = aCommandLine.Len(); - ppArgv = (char **) new char[ (ULONG)(nLen + nVoid * (nArgc +2) + nArgc ) ]; + ppArgv = (char **) new char[ (sal_uIntPtr)(nLen + nVoid * (nArgc +2) + nArgc ) ]; pChar = (char *) ppArgv + ( (1+nArgc) * nVoid ); pPtr = (size_t *) ppArgv; for ( xub_StrLen i=0; i<nArgc; i++ ) @@ -414,7 +414,7 @@ void CCommand::ImplInit() #ifdef UNX if ( i == 1 ) { - USHORT nWo = aCommandLine.Search("csh -c "); + sal_uInt16 nWo = aCommandLine.Search("csh -c "); if (nWo != STRING_NOTFOUND) aCommandLine.Erase(0, nWo + 7); else @@ -445,19 +445,19 @@ CCommand::operator int() if (( pid = fork()) < 0 ) { - DBG_ASSERT( FALSE, "fork error" ); + DBG_ASSERT( sal_False, "fork error" ); } else if ( pid == 0 ) { if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 ) { - DBG_ASSERT( FALSE, "execv failed" ); + DBG_ASSERT( sal_False, "execv failed" ); } } //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] ); if ( (nRet = waitpid( pid, NULL, 0 ) < 0) ) { - DBG_ASSERT( FALSE, "wait error" ); + DBG_ASSERT( sal_False, "wait error" ); } #endif @@ -510,7 +510,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) ByteString sEnvironment = GetEnv( sEnv.GetBuffer()); xub_StrLen nCount = sEnvironment.GetTokenCount( cPathSeperator ); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; for ( xub_StrLen i=0; i<nCount && !bFound; i++ ) { @@ -527,7 +527,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) aDirEntry.ToAbs(); if ( aDirEntry.Exists()) { sReturn = aEntry; - bFound = TRUE; + bFound = sal_True; } } if ( !bFound ) @@ -550,7 +550,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) aDirEntry.ToAbs(); if ( aDirEntry.Exists()) { sReturn = aEntry; - bFound = TRUE; + bFound = sal_True; } } } @@ -589,7 +589,7 @@ CCommandd::operator int() LPTSTR lpCommandLine = (char *) GetCommandLine_().GetBuffer(); LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL; LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL; - BOOL bInheritHandles = TRUE; + sal_Bool bInheritHandles = sal_True; // wie wuenschen wir denn gestartet zu werden ?? DWORD dwCreationFlags; diff --git a/soldep/bootstrp/dep.cxx b/soldep/bootstrp/dep.cxx index fb4edcc998bc..1178e1d09475 100644 --- a/soldep/bootstrp/dep.cxx +++ b/soldep/bootstrp/dep.cxx @@ -35,8 +35,8 @@ SByteExtStringList::~SByteExtStringList() { if (bDeleteStrings) while( Count()) { - delete GetObject((ULONG)0); - Remove((ULONG)0); + delete GetObject((sal_uIntPtr)0); + Remove((sal_uIntPtr)0); } } @@ -55,8 +55,8 @@ void VersionDepInfo::Clear() /*****************************************************************************/ { while( Count()) { - delete GetObject((ULONG)0); - Remove((ULONG)0); + delete GetObject((sal_uIntPtr)0); + Remove((sal_uIntPtr)0); } } diff --git a/soldep/bootstrp/hashtbl.cxx b/soldep/bootstrp/hashtbl.cxx index b6f9b0b7826a..e9455e75f454 100644 --- a/soldep/bootstrp/hashtbl.cxx +++ b/soldep/bootstrp/hashtbl.cxx @@ -43,16 +43,16 @@ class HashItem public: HashItem() { m_Tag = TAG_EMPTY; m_pObject = NULL; } - BOOL IsDeleted() const + sal_Bool IsDeleted() const { return m_Tag == TAG_DELETED; } - BOOL IsEmpty() const + sal_Bool IsEmpty() const { return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; } - BOOL IsFree() const + sal_Bool IsFree() const { return m_Tag == TAG_EMPTY; } - BOOL IsUsed() const + sal_Bool IsUsed() const { return m_Tag == TAG_USED; } void Delete() @@ -78,7 +78,7 @@ public: /*static*/ double HashTable::m_defMaxLoadFactor = 0.8; /*static*/ double HashTable::m_defDefGrowFactor = 2.0; -HashTable::HashTable(ULONG lSize, BOOL bOwner, double dMaxLoadFactor, double dGrowFactor) +HashTable::HashTable(sal_uIntPtr lSize, sal_Bool bOwner, double dMaxLoadFactor, double dGrowFactor) { m_lSize = lSize; m_bOwner = bOwner; @@ -107,7 +107,7 @@ HashTable::~HashTable() /* if (m_bOwner) { - for (ULONG i=0; i<GetSize(); i++) + for (sal_uIntPtr i=0; i<GetSize(); i++) { void *pObject = GetObjectAt(i); @@ -121,7 +121,7 @@ HashTable::~HashTable() delete [] m_pData; } -void* HashTable::GetObjectAt(ULONG lPos) const +void* HashTable::GetObjectAt(sal_uIntPtr lPos) const // Gibt Objekt zurck, wenn es eines gibt, sonst NULL; { DBG_ASSERT(lPos<m_lSize, "HashTable::GetObjectAt()"); @@ -136,16 +136,16 @@ void HashTable::OnDeleteObject(void*) DBG_ERROR("HashTable::OnDeleteObject(void*) nicht berladen"); } -ULONG HashTable::Hash(ByteString const& Key) const +sal_uIntPtr HashTable::Hash(ByteString const& Key) const { /* - ULONG lHash = 0; - ULONG i,n; + sal_uIntPtr lHash = 0; + sal_uIntPtr i,n; for (i=0,n=Key.Len(); i<n; i++) { lHash *= 256L; - lHash += (ULONG)(USHORT)Key.GetStr()[i]; + lHash += (sal_uIntPtr)(sal_uInt16)Key.GetStr()[i]; lHash %= m_lSize; } return lHash; @@ -153,13 +153,13 @@ ULONG HashTable::Hash(ByteString const& Key) const // Hashfunktion von P.J. Weinberger // aus dem "Drachenbuch" von Aho/Sethi/Ullman - ULONG i,n; - ULONG h = 0; - ULONG g = 0; + sal_uIntPtr i,n; + sal_uIntPtr h = 0; + sal_uIntPtr g = 0; for (i=0,n=Key.Len(); i<n; i++) { - h = (h<<4) + (ULONG)(USHORT)Key.GetBuffer()[i]; + h = (h<<4) + (sal_uIntPtr)(sal_uInt16)Key.GetBuffer()[i]; g = h & 0xf0000000; if (g != 0) @@ -172,15 +172,15 @@ ULONG HashTable::Hash(ByteString const& Key) const return h % m_lSize; } -ULONG HashTable::DHash(ByteString const& Key, ULONG lOldHash) const +sal_uIntPtr HashTable::DHash(ByteString const& Key, sal_uIntPtr lOldHash) const { - ULONG lHash = lOldHash; - ULONG i,n; + sal_uIntPtr lHash = lOldHash; + sal_uIntPtr i,n; for (i=0,n=Key.Len(); i<n; i++) { lHash *= 256L; - lHash += (ULONG)(USHORT)Key.GetBuffer()[i]; + lHash += (sal_uIntPtr)(sal_uInt16)Key.GetBuffer()[i]; lHash %= m_lSize; } return lHash; @@ -196,19 +196,19 @@ ULONG HashTable::DHash(ByteString const& Key, ULONG lOldHash) const */ } -ULONG HashTable::Probe(ULONG lPos) const +sal_uIntPtr HashTable::Probe(sal_uIntPtr lPos) const // gibt den Folgewert von lPos zurck { lPos++; if (lPos==m_lSize) lPos=0; return lPos; } -BOOL HashTable::IsFull() const +sal_Bool HashTable::IsFull() const { return m_lElem>=m_lSize; } -BOOL HashTable::Insert(ByteString const& Key, void* pObject) +sal_Bool HashTable::Insert(ByteString const& Key, void* pObject) // pre: Key ist nicht im Dictionary enthalten, sonst return FALSE // Dictionary ist nicht voll, sonst return FALSE // post: pObject ist unter Key im Dictionary; m_nElem wurde erhht @@ -218,13 +218,13 @@ BOOL HashTable::Insert(ByteString const& Key, void* pObject) if (IsFull()) { DBG_ERROR("HashTable::Insert() is full"); - return FALSE; + return sal_False; } if (FindPos(Key) != NULL ) - return FALSE; + return sal_False; - ULONG lPos = Hash(Key); + sal_uIntPtr lPos = Hash(Key); HashItem *pItem = &m_pData[lPos]; // first hashing @@ -238,7 +238,7 @@ BOOL HashTable::Insert(ByteString const& Key, void* pObject) m_aStatistic.m_lSingleHash++; #endif - return TRUE; + return sal_True; } // double hashing @@ -255,7 +255,7 @@ BOOL HashTable::Insert(ByteString const& Key, void* pObject) m_aStatistic.m_lDoubleHash++; #endif - return TRUE; + return sal_True; } // linear probing @@ -273,7 +273,7 @@ BOOL HashTable::Insert(ByteString const& Key, void* pObject) pItem->SetObject(Key, pObject); m_lElem++; - return TRUE; + return sal_True; } HashItem* HashTable::FindPos(ByteString const& Key) const @@ -285,7 +285,7 @@ HashItem* HashTable::FindPos(ByteString const& Key) const { // first hashing // - ULONG lPos = Hash(Key); + sal_uIntPtr lPos = Hash(Key); HashItem *pItem = &m_pData[lPos]; if (pItem->IsUsed() @@ -311,9 +311,9 @@ HashItem* HashTable::FindPos(ByteString const& Key) const // if (pItem->IsDeleted() || pItem->IsUsed()) { - ULONG n = 0; - BOOL bFound = FALSE; - BOOL bEnd = FALSE; + sal_uIntPtr n = 0; + sal_Bool bFound = sal_False; + sal_Bool bEnd = sal_False; do { @@ -397,10 +397,10 @@ void HashTable::SmartGrow() if (dLoadFactor <= m_dMaxLoadFactor) return; // nothing to grow - ULONG lOldSize = m_lSize; // alte Daten sichern + sal_uIntPtr lOldSize = m_lSize; // alte Daten sichern HashItem* pOldData = m_pData; - m_lSize = ULONG (m_dGrowFactor * m_lSize); // neue Gre + m_lSize = sal_uIntPtr (m_dGrowFactor * m_lSize); // neue Gre m_pData = new HashItem[m_lSize]; // neue Daten holen // kein Speicher: @@ -417,7 +417,7 @@ void HashTable::SmartGrow() // Umkopieren der Daten // - for (ULONG i=0; i<lOldSize; i++) + for (sal_uIntPtr i=0; i<lOldSize; i++) { HashItem *pItem = &pOldData[i]; @@ -440,13 +440,13 @@ HashTableIterator::HashTableIterator(HashTable const& aTable) void* HashTableIterator::GetFirst() { m_lAt = 0; - return FindValidObject(TRUE /* forward */); + return FindValidObject(sal_True /* forward */); } void* HashTableIterator::GetLast() { m_lAt = m_aTable.GetSize() -1; - return FindValidObject(FALSE /* backward */); + return FindValidObject(sal_False /* backward */); } void* HashTableIterator::GetNext() @@ -455,7 +455,7 @@ void* HashTableIterator::GetNext() return NULL; m_lAt++; - return FindValidObject(TRUE /* forward */); + return FindValidObject(sal_True /* forward */); } void* HashTableIterator::GetPrev() @@ -464,16 +464,16 @@ void* HashTableIterator::GetPrev() return NULL; m_lAt--; - return FindValidObject(FALSE /* backward */); + return FindValidObject(sal_False /* backward */); } -void* HashTableIterator::FindValidObject(BOOL bForward) +void* HashTableIterator::FindValidObject(sal_Bool bForward) // Sucht nach einem vorhandenen Objekt ab der aktuellen // Position. // // pre: ab inkl. m_lAt soll die Suche beginnen // post: if not found then -// if bForward == TRUE then +// if bForward == sal_True then // m_lAt == m_aTable.GetSize() -1 // else // m_lAt == 0 diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx index acd8478cf11a..489472b9f87a 100644 --- a/soldep/bootstrp/minormk.cxx +++ b/soldep/bootstrp/minormk.cxx @@ -108,16 +108,16 @@ MinorMk::MinorMk( GenericInformationList *pList, const ByteString rVersion ) /*****************************************************************************/ MinorMk::MinorMk( const ByteString &rMinor, const ByteString &rEnvironment ) /*****************************************************************************/ - : bExists( FALSE ) + : bExists( sal_False ) { ByteString sDelimiter( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US ); ByteString sSolver( GetEnv( "SOLARVERSION" )); - BOOL bNewEnv = TRUE; + sal_Bool bNewEnv = sal_True; if ( !sSolver.Len()) { sSolver = GetEnv( "SOLARVER" ); - bNewEnv = FALSE; + bNewEnv = sal_False; } ByteString sUPD( GetEnv( "UPD" )); @@ -152,7 +152,7 @@ void MinorMk::ReadMinorMk( const String &rFileName ) /*****************************************************************************/ { if ( DirEntry( rFileName ).Exists()) { - bExists = TRUE; + bExists = sal_True; SvFileStream aStream( rFileName, STREAM_STD_READ ); while ( !aStream.IsOpen()) aStream.Open( rFileName, STREAM_STD_READ ); diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index 746fa091e4b6..793f50e860aa 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -115,7 +115,7 @@ ByteString SimpleConfig::GetNextLine() { ByteString aSecStr; sal_Bool bStreamOk; -// USHORT iret = 0; +// sal_uInt16 iret = 0; nLine++; bStreamOk = aFileStream.ReadLine ( aTmpStr ); @@ -127,10 +127,10 @@ ByteString SimpleConfig::GetNextLine() int nLength = aTmpStr.Len(); if ( bStreamOk && (nLength == 0) ) return "\t"; -// USHORT nPos = 0; - BOOL bFound = FALSE; +// sal_uInt16 nPos = 0; + sal_Bool bFound = sal_False; ByteString aEraseString; - for ( USHORT i = 0; i<= nLength; i++) + for ( sal_uInt16 i = 0; i<= nLength; i++) { if ( aTmpStr.GetChar( i ) == 0x20 && !bFound ) aTmpStr.SetChar( i, 0x09 ); @@ -139,7 +139,7 @@ ByteString SimpleConfig::GetNextLine() } /*****************************************************************************/ -ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) +ByteString SimpleConfig::GetCleanedNextLine( sal_Bool bReadComments ) /*****************************************************************************/ { sal_Bool bStreamOk; @@ -348,7 +348,7 @@ CommandData& CommandData::operator<< ( SvStream& rStream ) rStream >> nCommand; rStream >> nDepth; - BOOL bDepList; + sal_Bool bDepList; rStream >> bDepList; if (pDepList) pDepList->CleanUp(); @@ -364,7 +364,7 @@ CommandData& CommandData::operator<< ( SvStream& rStream ) DELETEZ (pDepList); } - BOOL bCommandList; + sal_Bool bCommandList; rStream >> bCommandList; if (pCommandList) pCommandList->CleanUp(); @@ -436,7 +436,7 @@ DepInfo& DepInfo::operator<< ( SvStream& rStream ) pProject = new ByteString(); rStream >> *pProject; - BOOL bModeList; + sal_Bool bModeList; rStream >> bModeList; if (pModeList) pModeList->CleanUp(); @@ -490,10 +490,10 @@ SDepInfoList::~SDepInfoList() } /*****************************************************************************/ -ULONG SDepInfoList::IsString( ByteString* pStr ) +sal_uIntPtr SDepInfoList::IsString( ByteString* pStr ) /*****************************************************************************/ { - ULONG nRet = NOT_THERE; + sal_uIntPtr nRet = NOT_THERE; if ( (nRet = GetPrevString( pStr )) != 0 ) { ByteString* pString = GetObject( nRet )->GetProject(); @@ -514,16 +514,16 @@ ULONG SDepInfoList::IsString( ByteString* pStr ) } /*****************************************************************************/ -ULONG SDepInfoList::GetPrevString( ByteString* pStr ) +sal_uIntPtr SDepInfoList::GetPrevString( ByteString* pStr ) /*****************************************************************************/ { - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCount_l = Count(); - ULONG nUpper = nCount_l; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; + sal_uIntPtr nRet = 0; + sal_Bool bFound = sal_False; + sal_uIntPtr nCount_l = Count(); + sal_uIntPtr nUpper = nCount_l; + sal_uIntPtr nLower = 0; + sal_uIntPtr nCurrent = nUpper / 2; + sal_uIntPtr nRem = 0; ByteString* pString; do @@ -584,7 +584,7 @@ void SDepInfoList::PutModeString( DepInfo* pInfoList, ByteString* pStr ) } /*****************************************************************************/ -ULONG SDepInfoList::PutString( ByteString* pStr) +sal_uIntPtr SDepInfoList::PutString( ByteString* pStr) /*****************************************************************************/ { return PutString( pStr, NULL); @@ -597,7 +597,7 @@ ULONG SDepInfoList::PutString( ByteString* pStr) * **************************************************************************/ -ULONG SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr) +sal_uIntPtr SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr) { if (pAllModeList) { @@ -605,7 +605,7 @@ ULONG SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr) pAllModeList = NULL; } - ULONG nPos = GetPrevString ( pStr ); + sal_uIntPtr nPos = GetPrevString ( pStr ); if ( Count() ) { { @@ -621,9 +621,9 @@ ULONG SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr) PutModeString(pInfo, pModeStr); else pInfo->SetAllModes(); - Insert( pInfo, (ULONG)0 ); + Insert( pInfo, (sal_uIntPtr)0 ); } - return (ULONG)0; + return (sal_uIntPtr)0; } } ByteString* pString = GetObject( nPos )->GetProject(); @@ -663,7 +663,7 @@ ULONG SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr) else pInfo->SetAllModes(); Insert( pInfo); - return (ULONG)0; + return (sal_uIntPtr)0; } } @@ -677,7 +677,7 @@ ULONG SDepInfoList::PutString( ByteString* pStr, ByteString* pModeStr) ByteString* SDepInfoList::RemoveString( const ByteString& rName ) /*****************************************************************************/ { - ULONG i; + sal_uIntPtr i; ByteString* pReturn; if (pAllModeList) { @@ -732,9 +732,9 @@ SByteStringList* SDepInfoList::GetAllDepModes() SDepInfoList& SDepInfoList::operator<< ( SvStream& rStream ) /*****************************************************************************/ { - ULONG nCount_l; + sal_uIntPtr nCount_l; rStream >> nCount_l; - for ( USHORT i = 0; i < nCount_l; i++ ) { + for ( sal_uInt16 i = 0; i < nCount_l; i++ ) { DepInfo* pDepInfo = new DepInfo(); *pDepInfo << rStream; Insert (pDepInfo, LIST_APPEND); @@ -746,7 +746,7 @@ SDepInfoList& SDepInfoList::operator<< ( SvStream& rStream ) SDepInfoList& SDepInfoList::operator>> ( SvStream& rStream ) /*****************************************************************************/ { - ULONG nCount_l = Count(); + sal_uIntPtr nCount_l = Count(); rStream << nCount_l; DepInfo* pDepInfo = First(); while (pDepInfo) { @@ -758,7 +758,7 @@ SDepInfoList& SDepInfoList::operator>> ( SvStream& rStream ) } /*****************************************************************************/ -CommandData* Prj::GetDirectoryList ( USHORT nWhatOS, USHORT nCommand ) +CommandData* Prj::GetDirectoryList ( sal_uInt16 nWhatOS, sal_uInt16 nCommand ) /*****************************************************************************/ { return (CommandData *)NULL; @@ -770,8 +770,8 @@ CommandData* Prj::GetDirectoryData( ByteString aLogFileName ) { PrjList* pPrjList = GetCommandDataList (); CommandData *pData = NULL; - ULONG nCount_l = pPrjList->Count(); - for ( ULONG i=0; i<nCount_l; i++ ) + sal_uIntPtr nCount_l = pPrjList->Count(); + for ( sal_uIntPtr i=0; i<nCount_l; i++ ) { pData = pPrjList->GetObject(i); if ( pData->GetLogFile() == aLogFileName ) @@ -789,14 +789,14 @@ Prj::Prj() : pPrjInitialDepList(0), pPrjDepList(0), pPrjDepInfoList(0), - bSorted( FALSE ), - bHardDependencies( FALSE ), - bFixedDependencies( FALSE ), - bVisited( FALSE ), - bIsAvailable( TRUE ), + bSorted( sal_False ), + bHardDependencies( sal_False ), + bFixedDependencies( sal_False ), + bVisited( sal_False ), + bIsAvailable( sal_True ), pTempCommandDataList (0), - bTempCommandDataListPermanent (FALSE), - bError (FALSE) + bTempCommandDataListPermanent (sal_False), + bError (sal_False) /*****************************************************************************/ { } @@ -807,14 +807,14 @@ Prj::Prj( ByteString aName ) : pPrjInitialDepList(0), pPrjDepList(0), pPrjDepInfoList(0), - bSorted( FALSE ), - bHardDependencies( FALSE ), - bFixedDependencies( FALSE ), - bVisited( FALSE ), - bIsAvailable( TRUE ), + bSorted( sal_False ), + bHardDependencies( sal_False ), + bFixedDependencies( sal_False ), + bVisited( sal_False ), + bIsAvailable( sal_True ), pTempCommandDataList (0), - bTempCommandDataListPermanent (FALSE), - bError (FALSE) + bTempCommandDataListPermanent (sal_False), + bError (sal_False) /*****************************************************************************/ { } @@ -892,7 +892,7 @@ void Prj::AddDependencies( ByteString aStr, ByteString aModeStr ) } /*****************************************************************************/ -SByteStringList* Prj::GetDependencies( BOOL bExpanded ) +SByteStringList* Prj::GetDependencies( sal_Bool bExpanded ) /*****************************************************************************/ { if ( bExpanded ) @@ -934,7 +934,7 @@ void Prj::SetMode(SByteStringList* pModList) } else { - BOOL bStringFound = FALSE; + sal_Bool bStringFound = sal_False; SByteStringList * pDepList = pInfo->GetModeList(); ByteString *pModString = pDepList->First(); while ( pModString ) @@ -948,7 +948,7 @@ void Prj::SetMode(SByteStringList* pModList) pPrjInitialDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject()))); //pPrjDepList->PutString( pInfo->GetProject()); //pPrjInitialDepList->PutString( pInfo->GetProject()); - bStringFound = TRUE; + bStringFound = sal_True; break; } pDefModString = pModList->Next(); @@ -965,8 +965,8 @@ void Prj::SetMode(SByteStringList* pModList) } /*****************************************************************************/ -BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, +sal_Bool Prj::InsertDirectory ( ByteString aDirName, sal_uInt16 aWhat, + sal_uInt16 aWhatOS, ByteString aLogFileName, const ByteString &rClientRestriction ) /*****************************************************************************/ { @@ -981,7 +981,7 @@ BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat, PrjList* pPrjList = GetCommandDataList (); pPrjList->Insert( pData ); - return FALSE; + return sal_False; } /*****************************************************************************/ @@ -992,12 +992,12 @@ CommandData* Prj::RemoveDirectory ( ByteString aLogFileName ) /*****************************************************************************/ { PrjList* pPrjList = GetCommandDataList (); - ULONG nCount_l = pPrjList->Count(); + sal_uIntPtr nCount_l = pPrjList->Count(); CommandData* pData; CommandData* pDataFound = NULL; SByteStringList* pDataDeps; - for ( USHORT i = 0; i < nCount_l; i++ ) + for ( sal_uInt16 i = 0; i < nCount_l; i++ ) { pData = pPrjList->GetObject( i ); if ( pData->GetLogFile() == aLogFileName ) @@ -1008,8 +1008,8 @@ CommandData* Prj::RemoveDirectory ( ByteString aLogFileName ) if ( pDataDeps ) { ByteString* pString; - ULONG nDataDepsCount = pDataDeps->Count(); - for ( ULONG j = nDataDepsCount; j > 0; j-- ) + sal_uIntPtr nDataDepsCount = pDataDeps->Count(); + for ( sal_uIntPtr j = nDataDepsCount; j > 0; j-- ) { pString = pDataDeps->GetObject( j - 1 ); if ( pString->GetToken( 0, '.') == aLogFileName ) @@ -1028,7 +1028,7 @@ CommandData* Prj::RemoveDirectory ( ByteString aLogFileName ) void Prj::ExtractDependencies() /*****************************************************************************/ { - ULONG nPos = 0; + sal_uIntPtr nPos = 0; CommandData* pData = GetObject(nPos); while (pData) { @@ -1129,7 +1129,7 @@ Prj& Prj::operator>> ( SvStream& rStream ) else rStream << sal_False; - ULONG nCount_l = Count(); + sal_uIntPtr nCount_l = Count(); rStream << nCount_l; CommandData* pData = First(); @@ -1154,7 +1154,7 @@ Prj& Prj::operator<< ( SvStream& rStream ) rStream >> bIsAvailable; rStream >> bError; - BOOL bDepList; + sal_Bool bDepList; rStream >> bDepList; DELETEZ (pPrjDepInfoList); if (bDepList) @@ -1163,10 +1163,10 @@ Prj& Prj::operator<< ( SvStream& rStream ) *pPrjDepInfoList << rStream; } - ULONG nCount_l; + sal_uIntPtr nCount_l; rStream >> nCount_l; - for ( USHORT i = 0; i < nCount_l; i++ ) { + for ( sal_uInt16 i = 0; i < nCount_l; i++ ) { CommandData* pData = new CommandData(); *pData << rStream; Insert (pData, LIST_APPEND); @@ -1190,7 +1190,7 @@ Star::Star() } /*****************************************************************************/ -Star::Star(String aFileName, USHORT nMode ) +Star::Star(String aFileName, sal_uInt16 nMode ) /*****************************************************************************/ : nStarMode( nMode ), sFileName( aFileName ), @@ -1217,12 +1217,12 @@ Star::Star(GenericInformationList *pStandLst, ByteString &rVersion ) : pDepMode (NULL), pAllDepMode (NULL) { - UpdateFileList (pStandLst, rVersion, TRUE ); + UpdateFileList (pStandLst, rVersion, sal_True ); } /*****************************************************************************/ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bRead ) + sal_Bool bRead ) /*****************************************************************************/ { sSourceRoot=String::CreateFromAscii(""); // clear old SourceRoot @@ -1233,7 +1233,7 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi #else sPath += "/settings/SOLARLIST"; #endif - GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE ); + GenericInformation *pInfo = pStandLst->GetInfo( sPath, sal_True ); if( pInfo && pInfo->GetValue().Len()) { ByteString sFile( pInfo->GetValue()); @@ -1248,17 +1248,17 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi sPath = rVersion; sPath += "/drives"; - GenericInformation *pInfo_l = pStandLst->GetInfo( sPath, TRUE ); + GenericInformation *pInfo_l = pStandLst->GetInfo( sPath, sal_True ); if ( pInfo_l && pInfo_l->GetSubList()) { GenericInformationList *pDrives = pInfo_l->GetSubList(); - for ( ULONG i = 0; i < pDrives->Count(); i++ ) { + for ( sal_uIntPtr i = 0; i < pDrives->Count(); i++ ) { GenericInformation *pDrive = pDrives->GetObject( i ); if ( pDrive ) { DirEntry aEntry; - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; if ( sSourceRoot.Len()) { aEntry = DirEntry( sSourceRoot ); - bOk = TRUE; + bOk = sal_True; } else { #ifdef UNX @@ -1267,10 +1267,10 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi if ( pUnixVolume ) { String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US ); aEntry = DirEntry( sRoot ); - bOk = TRUE; + bOk = sal_True; } #else - bOk = TRUE; + bOk = sal_True; String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US ); sRoot += String::CreateFromAscii( "\\" ); aEntry = DirEntry( sRoot ); @@ -1278,12 +1278,12 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi } if ( bOk ) { sPath = "projects"; - GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE ); + GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, sal_True ); if ( pProjectsKey ) { if ( !sSourceRoot.Len()) { sPath = rVersion; sPath += "/settings/PATH"; - GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE ); + GenericInformation *pPath = pStandLst->GetInfo( sPath, sal_True ); if( pPath ) { ByteString sAddPath( pPath->GetValue()); #ifdef UNX @@ -1297,10 +1297,10 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi } sPath = rVersion; sPath += "/settings/SHORTPATH"; - GenericInformation *pShortPath = pStandLst->GetInfo( sPath, TRUE ); - BOOL bShortPath = FALSE; + GenericInformation *pShortPath = pStandLst->GetInfo( sPath, sal_True ); + sal_Bool bShortPath = sal_False; if (pShortPath && (pShortPath->GetValue() == "_TRUE")) - bShortPath = TRUE; + bShortPath = sal_True; sSourceRoot = aEntry.GetFull(); GenericInformationList *pProjects = pProjectsKey->GetSubList(); if ( pProjects ) { @@ -1341,7 +1341,7 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi ClearCurrentDeps(); ClearLoadedFilesList(); RemoveAllPrj(); - bRead = TRUE; // read new list because old list is deleted + bRead = sal_True; // read new list because old list is deleted } if (bRead) @@ -1353,7 +1353,7 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi /*****************************************************************************/ void Star::FullReload( GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bRead ) + sal_Bool bRead ) /*****************************************************************************/ { ClearAvailableDeps(); @@ -1364,29 +1364,29 @@ void Star::FullReload( GenericInformationList *pStandLst, ByteString &rVersion, } /*****************************************************************************/ -BOOL Star::CheckFileLoadList(SolarFileList *pSolarFiles) +sal_Bool Star::CheckFileLoadList(SolarFileList *pSolarFiles) /*****************************************************************************/ { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if (aLoadedFilesList.Count() == 0) return bRet; StarFile * pLoadFile = aLoadedFilesList.First(); while (pLoadFile) { - BOOL bIsAvailable = FALSE; + sal_Bool bIsAvailable = sal_False; String * pFile = pSolarFiles->First(); while (pFile) { if (*pFile == pLoadFile->GetName()) { - bIsAvailable = TRUE; + bIsAvailable = sal_True; break; } pFile = pSolarFiles->Next(); } if (!bIsAvailable) { - bRet = FALSE; + bRet = sal_False; break; } pLoadFile = aLoadedFilesList.Next(); @@ -1410,9 +1410,9 @@ void Star::GenerateFileLoadList( SolarFileList *pSolarFiles ) { SolarFileList* pNewSolarFiles = NULL; while( pSolarFiles->Count()) { - StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 )); + StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( sal_uIntPtr ) 0 )); aMutex.acquire(); - ULONG nPos = SearchFileEntry(&aLoadedFilesList, pFile); + sal_uIntPtr nPos = SearchFileEntry(&aLoadedFilesList, pFile); if ( nPos == LIST_ENTRY_NOTFOUND ) { if (!pNewSolarFiles) @@ -1421,7 +1421,7 @@ void Star::GenerateFileLoadList( SolarFileList *pSolarFiles ) pNewSolarFiles->Insert(new String(pFile->GetName()), LIST_APPEND ); } aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); + delete pSolarFiles->Remove(( sal_uIntPtr ) 0 ); delete pFile; } delete pSolarFiles; @@ -1435,7 +1435,7 @@ SolarFileList* Star::NeedsFilesForUpdate() { aMutex.acquire(); SolarFileList* pPrjList = NULL; - for ( ULONG i = 0; i < aLoadedFilesList.Count(); i++ ) + for ( sal_uIntPtr i = 0; i < aLoadedFilesList.Count(); i++ ) if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) { if (!pPrjList) pPrjList = new SolarFileList(); @@ -1448,18 +1448,18 @@ SolarFileList* Star::NeedsFilesForUpdate() } /*****************************************************************************/ -BOOL Star::NeedsUpdate() +sal_Bool Star::NeedsUpdate() /*****************************************************************************/ { aMutex.acquire(); - for ( ULONG i = 0; i < aLoadedFilesList.Count(); i++ ) + for ( sal_uIntPtr i = 0; i < aLoadedFilesList.Count(); i++ ) if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) { aMutex.release(); - return TRUE; + return sal_True; } aMutex.release(); - return FALSE; + return sal_False; } /*****************************************************************************/ @@ -1476,28 +1476,28 @@ void Star::Read( String &rFileName ) sSourceRoot = aEntry.GetFull(); while( aFileList.Count()) { - String ssFileName = *aFileList.GetObject(( ULONG ) 0 ); + String ssFileName = *aFileList.GetObject(( sal_uIntPtr ) 0 ); StarFile* pFile = ReadBuildlist (ssFileName); aMutex.acquire(); ReplaceFileEntry (&aLoadedFilesList, pFile); //aLoadedFilesList.Insert( pFile, LIST_APPEND ); aMutex.release(); - aFileList.Remove(( ULONG ) 0 ); + aFileList.Remove(( sal_uIntPtr ) 0 ); } // resolve all dependencies recursive Expand_Impl(); } /*****************************************************************************/ -ULONG Star::SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile ) +sal_uIntPtr Star::SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile ) /*****************************************************************************/ { StarFile *pSearchFile; - ULONG nCount_l; + sal_uIntPtr nCount_l; nCount_l = pStarFiles->Count(); - for ( ULONG i=0; i<nCount_l; i++) + for ( sal_uIntPtr i=0; i<nCount_l; i++) { pSearchFile = pStarFiles->GetObject(i); if ( pSearchFile->GetName() == pFile->GetName() ) @@ -1512,7 +1512,7 @@ ULONG Star::SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile ) void Star::ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile ) /*****************************************************************************/ { - ULONG nPos = SearchFileEntry(pStarFiles, pFile); + sal_uIntPtr nPos = SearchFileEntry(pStarFiles, pFile); if ( nPos != LIST_ENTRY_NOTFOUND ) { StarFile* pTmpStarFile = pStarFiles->GetObject(nPos); @@ -1531,7 +1531,7 @@ void Star::Read( SolarFileList *pSolarFiles ) while( pSolarFiles->Count()) { ByteString aString; - String ssFileName = *pSolarFiles->GetObject(( ULONG ) 0 ); + String ssFileName = *pSolarFiles->GetObject(( sal_uIntPtr ) 0 ); StarFile *pFile = ReadBuildlist ( ssFileName); if ( pFile->Exists()) { @@ -1543,7 +1543,7 @@ void Star::Read( SolarFileList *pSolarFiles ) ByteString aPrjName = ByteString( aEntryPrj.GetName(), gsl_getSystemTextEncoding()); Prj* pPrj = GetPrj(aPrjName); if (pPrj) - pPrj->IsAvailable (FALSE); + pPrj->IsAvailable (sal_False); } } @@ -1552,7 +1552,7 @@ void Star::Read( SolarFileList *pSolarFiles ) ReplaceFileEntry (&aLoadedFilesList, pFile); //aLoadedFilesList.Insert( pFile, LIST_APPEND ); aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); + delete pSolarFiles->Remove(( sal_uIntPtr ) 0 ); } delete pSolarFiles; @@ -1607,7 +1607,7 @@ void Star::InsertSolarList( String sProject ) // inserts a new solarlist part of another project String sFileName_l( CreateFileName( sProject, sSourceRoot )); - for ( ULONG i = 0; i < aFileList.Count(); i++ ) { + for ( sal_uIntPtr i = 0; i < aFileList.Count(); i++ ) { if (( *aFileList.GetObject( i )) == sFileName_l ) return; } @@ -1626,14 +1626,14 @@ void Star::ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ) if ( pDepPrj->bVisited ) return; - pDepPrj->bVisited = TRUE; + pDepPrj->bVisited = sal_True; SByteStringList* pPrjLst = pPrj->GetDependencies(); SByteStringList* pDepLst = NULL; ByteString* pDepend; ByteString* pPutStr; Prj *pNextPrj = NULL; - ULONG i, nRetPos; + sal_uIntPtr i, nRetPos; if ( pPrjLst ) { pDepLst = pDepPrj->GetDependencies(); @@ -1657,9 +1657,9 @@ void Star::ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ) void Star::Expand_Impl() /*****************************************************************************/ { - for ( ULONG i = 0; i < Count(); i++ ) { - for ( ULONG j = 0; j < Count(); j++ ) - GetObject( j )->bVisited = FALSE; + for ( sal_uIntPtr i = 0; i < Count(); i++ ) { + for ( sal_uIntPtr j = 0; j < Count(); j++ ) + GetObject( j )->bVisited = sal_False; Prj* pPrj = GetObject( i ); pPrj->SetMode(pDepMode); // DepList fr Mode initialisieren @@ -1668,7 +1668,7 @@ void Star::Expand_Impl() } /*****************************************************************************/ -StarFile* Star::ReadBuildlist (const String& rFilename, BOOL bReadComments, BOOL bExtendAlias) +StarFile* Star::ReadBuildlist (const String& rFilename, sal_Bool bReadComments, sal_Bool bExtendAlias) /*****************************************************************************/ { ByteString sFileName_l(rFilename, RTL_TEXTENCODING_ASCII_US); @@ -1698,10 +1698,10 @@ void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const By ByteString aWhat, aWhatOS, sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara; ByteString aDirName; - BOOL bPrjDep = FALSE; - BOOL bHardDep = FALSE; - BOOL bFixedDep = FALSE; - BOOL bNewProject = FALSE; + sal_Bool bPrjDep = sal_False; + sal_Bool bHardDep = sal_False; + sal_Bool bFixedDep = sal_False; + sal_Bool bNewProject = sal_False; int nCommandType=0, nOSType=0; Prj* pPrj = *ppPrj; CommandData* pCmdData; @@ -1741,30 +1741,30 @@ void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const By case 2: if ( sToken.CompareTo(":") == COMPARE_EQUAL ) { - bPrjDep = TRUE; - bHardDep = FALSE; - bFixedDep = FALSE; + bPrjDep = sal_True; + bHardDep = sal_False; + bFixedDep = sal_False; i = 9; } else if ( sToken.CompareTo("::") == COMPARE_EQUAL ) { - bPrjDep = TRUE; - bHardDep = TRUE; - bFixedDep = FALSE; + bPrjDep = sal_True; + bHardDep = sal_True; + bFixedDep = sal_False; i = 9; } else if ( sToken.CompareTo(":::") == COMPARE_EQUAL ) { - bPrjDep = TRUE; - bHardDep = TRUE; - bFixedDep = TRUE; + bPrjDep = sal_True; + bHardDep = sal_True; + bFixedDep = sal_True; i = 9; } else { - bPrjDep = FALSE; - bHardDep = FALSE; - bFixedDep = FALSE; + bPrjDep = sal_False; + bHardDep = sal_False; + bFixedDep = sal_False; aWhat = sToken; nCommandType = GetJobType(aWhat); @@ -1837,24 +1837,24 @@ void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const By { // Liste zu Ende i = -1; - bPrjDep= FALSE; + bPrjDep= sal_False; } else { ByteString sMode; - BOOL bHasModes = FALSE; + sal_Bool bHasModes = sal_False; if (aItem.Search(":") != STRING_NOTFOUND) { sMode = aItem.GetToken ( 0, ':'); aItem = aItem.GetToken ( 1, ':'); - bHasModes = TRUE; + bHasModes = sal_True; } if (!pPrj) { // neues Project anlegen pPrj = new Prj ( aProjectName ); pPrj->SetPreFix( aPrefix ); - bNewProject = TRUE; + bNewProject = sal_True; } if (bHasModes) pPrj->AddDependencies( aItem, sMode ); @@ -1879,7 +1879,7 @@ void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const By // neues Project anlegen pPrj = new Prj ( aProjectName ); pPrj->SetPreFix( aPrefix ); - bNewProject = TRUE; + bNewProject = sal_True; } if (bNewProject) @@ -1909,7 +1909,7 @@ void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const By // new project to set the error flag pPrj = new Prj ( rProjectName ); pPrj->SetPreFix( aPrefix ); - bNewProject = TRUE; + bNewProject = sal_True; } if (pPrj) { @@ -1924,7 +1924,7 @@ void Star::InsertTokenLine ( const ByteString& rTokenLine, Prj** ppPrj, const By } /*****************************************************************************/ -BOOL Star::HasProject ( ByteString aProjectName ) +sal_Bool Star::HasProject ( ByteString aProjectName ) /*****************************************************************************/ { Prj *pPrj; @@ -1936,9 +1936,9 @@ BOOL Star::HasProject ( ByteString aProjectName ) { pPrj = GetObject(i); if ( pPrj->GetProjectName().ToLowerAscii() == aProjectName.ToLowerAscii() ) - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /*****************************************************************************/ @@ -1958,16 +1958,16 @@ Prj* Star::GetPrj ( ByteString aProjectName ) } /*****************************************************************************/ -BOOL Star::RemovePrj ( Prj* pPrj ) +sal_Bool Star::RemovePrj ( Prj* pPrj ) /*****************************************************************************/ { - ULONG nPos = GetPos(pPrj); + sal_uIntPtr nPos = GetPos(pPrj); if (nPos != LIST_ENTRY_NOTFOUND) { delete pPrj; Remove(nPos); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } /*****************************************************************************/ @@ -1990,7 +1990,7 @@ ByteString Star::GetPrjName( DirEntry &aPath ) ByteString aRetPrj, aDirName; ByteString aFullPathName = ByteString( aPath.GetFull(), gsl_getSystemTextEncoding()); - USHORT nToken = aFullPathName.GetTokenCount(PATH_DELIMETER); + sal_uInt16 nToken = aFullPathName.GetTokenCount(PATH_DELIMETER); for ( int i=0; i< nToken; i++ ) { aDirName = aFullPathName.GetToken( i, PATH_DELIMETER ); @@ -2144,13 +2144,13 @@ void Star::SetCurrentDeps (SByteStringList* pDepList) // FullByteStringListWrapper aProducts = mpXmlBuildList->getProducts(); // ByteString aDepType = ByteString(DEP_MD_ALWAYS_STR); // if (mpXmlBuildList->hasModuleDepType(aProducts, aDepType)) -// pPrj->HasHardDependencies( TRUE ); +// pPrj->HasHardDependencies( sal_True ); // // aDepType = ByteString(DEP_MD_FORCE_STR); // if (mpXmlBuildList->hasModuleDepType(aProducts, aDepType)) // { -// pPrj->HasHardDependencies( TRUE ); -// pPrj->HasFixedDependencies( TRUE ); +// pPrj->HasHardDependencies( sal_True ); +// pPrj->HasFixedDependencies( sal_True ); // } // // // modul dependencies @@ -2293,7 +2293,7 @@ int Star::GetJobType ( ByteString& JobType ) { else if ( JobType == "get" ) nCommandType = COMMAND_GET; else { - ULONG nOffset = JobType.Copy( 3 ).ToInt32(); + sal_uIntPtr nOffset = JobType.Copy( 3 ).ToInt32(); nCommandType = COMMAND_USER_START + nOffset - 1; } return nCommandType; @@ -2306,7 +2306,7 @@ void Star::PutPrjIntoStream (SByteStringList* pPrjNameList, SvStream* pStream) aMutex.acquire(); *pStream << sal_False; // not full Star / only some Projects - ULONG nCount_l = pPrjNameList->Count(); + sal_uIntPtr nCount_l = pPrjNameList->Count(); *pStream << nCount_l; ByteString* pStr = pPrjNameList->First(); while (pStr) { @@ -2332,7 +2332,7 @@ Star& Star::operator>> ( SvStream& rStream ) else rStream << sal_False; - ULONG nCount_l = Count(); + sal_uIntPtr nCount_l = Count(); rStream << nCount_l; Prj* pPrj = First(); while (pPrj) { @@ -2349,12 +2349,12 @@ Star& Star::operator<< ( SvStream& rStream ) /*****************************************************************************/ { aMutex.acquire(); - BOOL bFullList; + sal_Bool bFullList; rStream >> bFullList; if (bFullList) { rStream >> nStarMode; - BOOL bDepMode; + sal_Bool bDepMode; rStream >> bDepMode; if (pDepMode) pDepMode->CleanUp(); @@ -2368,9 +2368,9 @@ Star& Star::operator<< ( SvStream& rStream ) DELETEZ (pDepMode); } - ULONG nCount_l; + sal_uIntPtr nCount_l; rStream >> nCount_l; - for ( USHORT i = 0; i < nCount_l; i++ ) { + for ( sal_uInt16 i = 0; i < nCount_l; i++ ) { Prj* pPrj = new Prj(); *pPrj << rStream; pPrj->SetMode(pDepMode); @@ -2394,7 +2394,7 @@ Star& Star::operator<< ( SvStream& rStream ) // /*****************************************************************************/ -StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode ) +StarWriter::StarWriter( String aFileName, sal_Bool bReadComments, sal_uInt16 nMode ) /*****************************************************************************/ : Star () { @@ -2403,7 +2403,7 @@ StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode ) } /*****************************************************************************/ -StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments ) +StarWriter::StarWriter( SolarFileList *pSolarFiles, sal_Bool bReadComments ) /*****************************************************************************/ : Star () { @@ -2412,7 +2412,7 @@ StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments ) /*****************************************************************************/ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, - ByteString &rMinor, BOOL bReadComments ) + ByteString &rMinor, sal_Bool bReadComments ) /*****************************************************************************/ : Star () { @@ -2423,7 +2423,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, #else sPath += "/settings/SOLARLIST"; #endif - GenericInformation *pInfo_l = pStandLst->GetInfo( sPath, TRUE ); + GenericInformation *pInfo_l = pStandLst->GetInfo( sPath, sal_True ); if( pInfo_l && pInfo_l->GetValue().Len()) { ByteString sFile( pInfo_l->GetValue()); @@ -2437,17 +2437,17 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, sPath = rVersion; sPath += "/drives"; - GenericInformation *pInfo_k = pStandLst->GetInfo( sPath, TRUE ); + GenericInformation *pInfo_k = pStandLst->GetInfo( sPath, sal_True ); if ( pInfo_k && pInfo_k->GetSubList()) { GenericInformationList *pDrives = pInfo_k->GetSubList(); - for ( ULONG i = 0; i < pDrives->Count(); i++ ) { + for ( sal_uIntPtr i = 0; i < pDrives->Count(); i++ ) { GenericInformation *pDrive = pDrives->GetObject( i ); if ( pDrive ) { DirEntry aEntry; - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; if ( sSourceRoot.Len()) { aEntry = DirEntry( sSourceRoot ); - bOk = TRUE; + bOk = sal_True; } else { #ifdef UNX @@ -2456,10 +2456,10 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, if ( pUnixVolume ) { String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US ); aEntry = DirEntry( sRoot ); - bOk = TRUE; + bOk = sal_True; } #else - bOk = TRUE; + bOk = sal_True; String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US ); sRoot += String::CreateFromAscii( "\\" ); aEntry = DirEntry( sRoot ); @@ -2467,12 +2467,12 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, } if ( bOk ) { sPath = "projects"; - GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE ); + GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, sal_True ); if ( pProjectsKey ) { if ( !sSourceRoot.Len()) { sPath = rVersion; sPath += "/settings/PATH"; - GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE ); + GenericInformation *pPath = pStandLst->GetInfo( sPath, sal_True ); if( pPath ) { ByteString sAddPath( pPath->GetValue()); #ifdef UNX @@ -2492,10 +2492,10 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, } sPath = rVersion; sPath += "/settings/SHORTPATH"; - GenericInformation *pShortPath = pStandLst->GetInfo( sPath, TRUE ); - BOOL bShortPath = FALSE; + GenericInformation *pShortPath = pStandLst->GetInfo( sPath, sal_True ); + sal_Bool bShortPath = sal_False; if (pShortPath && (pShortPath->GetValue() == "_TRUE")) - bShortPath = TRUE; + bShortPath = sal_True; sSourceRoot = aEntry.GetFull(); GenericInformationList *pProjects = pProjectsKey->GetSubList(); if ( pProjects ) { @@ -2548,7 +2548,7 @@ void StarWriter::CleanUp() } /*****************************************************************************/ -USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode ) +sal_uInt16 StarWriter::Read( String aFileName, sal_Bool bReadComments, sal_uInt16 nMode ) /*****************************************************************************/ { sFileName = aFileName; @@ -2564,12 +2564,12 @@ USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode ) sSourceRoot = aEntry.GetFull(); while( aFileList.Count()) { - String ssFileName = *aFileList.GetObject(( ULONG ) 0 ); - StarFile* pFile = ReadBuildlist (ssFileName, bReadComments, FALSE); + String ssFileName = *aFileList.GetObject(( sal_uIntPtr ) 0 ); + StarFile* pFile = ReadBuildlist (ssFileName, bReadComments, sal_False); aMutex.acquire(); aLoadedFilesList.Insert( pFile, LIST_APPEND ); aMutex.release(); - delete aFileList.Remove(( ULONG ) 0 ); + delete aFileList.Remove(( sal_uIntPtr ) 0 ); } // resolve all dependencies recursive Expand_Impl(); @@ -2580,7 +2580,7 @@ USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode ) } /*****************************************************************************/ -USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments ) +sal_uInt16 StarWriter::Read( SolarFileList *pSolarFiles, sal_Bool bReadComments ) /*****************************************************************************/ { nStarMode = STAR_MODE_MULTIPLE_PARSE; @@ -2588,12 +2588,12 @@ USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments ) // this ctor is used by StarBuilder to get the information for the whole workspace while( pSolarFiles->Count()) { ByteString aString; - String ssFileName = *pSolarFiles->GetObject(( ULONG ) 0 ); - StarFile* pFile = ReadBuildlist(ssFileName, bReadComments, FALSE); + String ssFileName = *pSolarFiles->GetObject(( sal_uIntPtr ) 0 ); + StarFile* pFile = ReadBuildlist(ssFileName, bReadComments, sal_False); aMutex.acquire(); aLoadedFilesList.Insert( pFile, LIST_APPEND ); aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); + delete pSolarFiles->Remove(( sal_uIntPtr ) 0 ); } delete pSolarFiles; @@ -2602,7 +2602,7 @@ USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments ) } /*****************************************************************************/ -USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) +sal_uInt16 StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) /*****************************************************************************/ { ByteString aDataString; @@ -2616,7 +2616,7 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) if ( pPrj->Count() > 0 ) { pCmdData = pPrj->First(); - if ( (pPrjDepList = pPrj->GetDependencies( FALSE )) ) + if ( (pPrjDepList = pPrj->GetDependencies( sal_False )) ) { aDataString = pPrj->GetPreFix(); aDataString += aTab; @@ -2629,7 +2629,7 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) else aDataString+= ByteString(":"); aDataString += aTab; - for ( USHORT i = 0; i< pPrjDepList->Count(); i++ ) { + for ( sal_uInt16 i = 0; i< pPrjDepList->Count(); i++ ) { aDataString += *pPrjDepList->GetObject( i ); aDataString += aSpace; } @@ -2649,7 +2649,7 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) aDataString+= pCmdData->GetPath(); aDataString += aTab; - USHORT nPathLen = pCmdData->GetPath().Len(); + sal_uInt16 nPathLen = pCmdData->GetPath().Len(); if ( nPathLen < 40 ) for ( int i = 0; i < 9 - pCmdData->GetPath().Len() / 4 ; i++ ) aDataString += aTab; @@ -2676,7 +2676,7 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) pCmdDepList = pCmdData->GetDependencies(); if ( pCmdDepList ) - for ( USHORT i = 0; i< pCmdDepList->Count(); i++ ) { + for ( sal_uInt16 i = 0; i< pCmdDepList->Count(); i++ ) { aDataString += *pCmdDepList->GetObject( i ); aDataString += aSpace; } @@ -2693,12 +2693,12 @@ USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) } /*****************************************************************************/ -USHORT StarWriter::Write( String aFileName ) +sal_uInt16 StarWriter::Write( String aFileName ) /*****************************************************************************/ { sFileName = aFileName; - FileStat::SetReadOnlyFlag( DirEntry( aFileName ), FALSE ); + FileStat::SetReadOnlyFlag( DirEntry( aFileName ), sal_False ); SvFileStream aFileStream; @@ -2726,7 +2726,7 @@ USHORT StarWriter::Write( String aFileName ) } /*****************************************************************************/ -USHORT StarWriter::WriteMultiple( String rSourceRoot ) +sal_uInt16 StarWriter::WriteMultiple( String rSourceRoot ) /*****************************************************************************/ { sSourceRoot = rSourceRoot; @@ -2746,7 +2746,7 @@ USHORT StarWriter::WriteMultiple( String rSourceRoot ) aEntry += DirEntry( sPrjDir ); aEntry += DirEntry( sSolarFile ); - FileStat::SetReadOnlyFlag( aEntry, FALSE ); + FileStat::SetReadOnlyFlag( aEntry, sal_False ); SvFileStream aFileStream; aFileStream.Open( aEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC); @@ -2779,34 +2779,34 @@ void StarWriter::InsertTokenLine ( const ByteString& rTokenLine ) } /*****************************************************************************/ -BOOL StarWriter::InsertProject ( Prj* /*pNewPrj*/ ) +sal_Bool StarWriter::InsertProject ( Prj* /*pNewPrj*/ ) /*****************************************************************************/ { - return FALSE; + return sal_False; } /*****************************************************************************/ Prj* StarWriter::RemoveProject ( ByteString aProjectName ) /*****************************************************************************/ { - ULONG nCount_l = Count(); + sal_uIntPtr nCount_l = Count(); Prj* pPrj; Prj* pPrjFound = NULL; SByteStringList* pPrjDeps; - for ( USHORT i = 0; i < nCount_l; i++ ) + for ( sal_uInt16 i = 0; i < nCount_l; i++ ) { pPrj = GetObject( i ); if ( pPrj->GetProjectName() == aProjectName ) pPrjFound = pPrj; else { - pPrjDeps = pPrj->GetDependencies( FALSE ); + pPrjDeps = pPrj->GetDependencies( sal_False ); if ( pPrjDeps ) { ByteString* pString; - ULONG nPrjDepsCount = pPrjDeps->Count(); - for ( ULONG j = nPrjDepsCount; j > 0; j-- ) + sal_uIntPtr nPrjDepsCount = pPrjDeps->Count(); + for ( sal_uIntPtr j = nPrjDepsCount; j > 0; j-- ) { pString = pPrjDeps->GetObject( j - 1 ); if ( pString->GetToken( 0, '.') == aProjectName ) @@ -2832,7 +2832,7 @@ StarFile::StarFile( const String &rFile ) { DirEntry aEntry( aFileName ); if ( aEntry.Exists()) { - bExists = TRUE; + bExists = sal_True; FileStat aStat( aEntry ); aDate = aStat.DateModified(); aTime = aStat.TimeModified(); @@ -2840,23 +2840,23 @@ StarFile::StarFile( const String &rFile ) aTimeCreated = aStat.TimeCreated(); } else - bExists = FALSE; + bExists = sal_False; } /*****************************************************************************/ -BOOL StarFile::NeedsUpdate() +sal_Bool StarFile::NeedsUpdate() /*****************************************************************************/ { DirEntry aEntry( aFileName ); if ( aEntry.Exists()) { if ( !bExists ) { - bExists = TRUE; - return TRUE; + bExists = sal_True; + return sal_True; } FileStat aStat( aEntry ); if (( aStat.DateModified() != aDate ) || ( aStat.TimeModified() != aTime ) || ( aStat.DateCreated() != aDateCreated ) || ( aStat.TimeCreated() != aTimeCreated )) - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } diff --git a/soldep/bootstrp/prodmap.cxx b/soldep/bootstrp/prodmap.cxx index 166d111b563b..0c5ce1e66f14 100644 --- a/soldep/bootstrp/prodmap.cxx +++ b/soldep/bootstrp/prodmap.cxx @@ -99,44 +99,44 @@ void ProductMapper::CreateProductList( GenericInformationList *pVerList ) ByteString sDependsOnKey( DEPENDS_ON_KEY ); ByteString sBasedOnKey( BASED_ON_KEY ); - for ( ULONG i = 0; i < pVersionList->Count(); i++ ) { + for ( sal_uIntPtr i = 0; i < pVersionList->Count(); i++ ) { GenericInformation *pVersion = pVersionList->GetObject( i ); - GenericInformation *pProducts = pVersion->GetSubInfo( sProductKey, TRUE ); + GenericInformation *pProducts = pVersion->GetSubInfo( sProductKey, sal_True ); if ( pProducts ) { ByteString sProducts = pProducts->GetValue(); ByteString sDependsOn; - GenericInformation *pDependsOn = pVersion->GetSubInfo( sDependsOnKey, TRUE ); + GenericInformation *pDependsOn = pVersion->GetSubInfo( sDependsOnKey, sal_True ); if ( pDependsOn ) sDependsOn = pDependsOn->GetValue(); ByteString sBasedOn; - GenericInformation *pBasedOn = pVersion->GetSubInfo( sBasedOnKey, TRUE ); + GenericInformation *pBasedOn = pVersion->GetSubInfo( sBasedOnKey, sal_True ); if ( pBasedOn ) sBasedOn = pBasedOn->GetValue(); - for ( USHORT x = 0; x < sProducts.GetTokenCount( ';' ); x++ ) { + for ( sal_uInt16 x = 0; x < sProducts.GetTokenCount( ';' ); x++ ) { ByteString sProduct( sProducts.GetToken( x, ';' )); if( sProduct.Len()) { if ( !pProductList ) pProductList = new GenericInformationList(); - pProductList->InsertInfo( sProduct, *pVersion, TRUE, TRUE ); + pProductList->InsertInfo( sProduct, *pVersion, sal_True, sal_True ); - for ( USHORT y = 0; y < sDependsOn.GetTokenCount( ';' ); y++ ) { + for ( sal_uInt16 y = 0; y < sDependsOn.GetTokenCount( ';' ); y++ ) { ByteString sDependsOnKey_l = sProduct; sDependsOnKey_l += "/DependsOn/"; sDependsOnKey_l += sDependsOn.GetToken( y, ';' ); - pProductList->InsertInfo( sDependsOnKey_l, "", TRUE, TRUE ); + pProductList->InsertInfo( sDependsOnKey_l, "", sal_True, sal_True ); } - for ( USHORT z = 0; z < sBasedOn.GetTokenCount( ';' ); z++ ) { + for ( sal_uInt16 z = 0; z < sBasedOn.GetTokenCount( ';' ); z++ ) { ByteString sBasedOnKey_l = sProduct; sBasedOnKey_l += "/BasedOn/"; sBasedOnKey_l += sBasedOn.GetToken( z, ';' ); - pProductList->InsertInfo( sBasedOnKey_l, "", TRUE, TRUE ); + pProductList->InsertInfo( sBasedOnKey_l, "", sal_True, sal_True ); } } } @@ -146,7 +146,7 @@ void ProductMapper::CreateProductList( GenericInformationList *pVerList ) } /*****************************************************************************/ -USHORT ProductMapper::GetProductInformation( +sal_uInt16 ProductMapper::GetProductInformation( const ByteString &rProduct, GenericInformation *& pProductInfo ) /*****************************************************************************/ { @@ -159,7 +159,7 @@ USHORT ProductMapper::GetProductInformation( return PRODUCT_MAPPER_NO_PRODUCT; ByteString sProductKey( rProduct ); - pProductInfo = pProductList->GetInfo( sProductKey, TRUE ); + pProductInfo = pProductList->GetInfo( sProductKey, sal_True ); if ( !pProductInfo ) return PRODUCT_MAPPER_NO_PRODUCT; @@ -168,26 +168,26 @@ USHORT ProductMapper::GetProductInformation( } /*****************************************************************************/ -USHORT ProductMapper::PrintDependentTargets( - const ByteString &rProduct, USHORT nLevel ) +sal_uInt16 ProductMapper::PrintDependentTargets( + const ByteString &rProduct, sal_uInt16 nLevel ) /*****************************************************************************/ { GenericInformation *pProductInfo; - USHORT nReturn = GetProductInformation( rProduct, pProductInfo ); + sal_uInt16 nReturn = GetProductInformation( rProduct, pProductInfo ); if ( nReturn == PRODUCT_MAPPER_OK ) { - for ( USHORT i = 0; i < nLevel; i++ ) + for ( sal_uInt16 i = 0; i < nLevel; i++ ) fprintf( stdout, " " ); fprintf( stdout, "%s (%s)\n", pProductInfo->GetBuffer(), pProductInfo->GetValue().GetBuffer()); aPrintedList.PutString( new ByteString( *pProductInfo )); - for ( ULONG j = 0; j < pProductList->Count(); j++ ) { + for ( sal_uIntPtr j = 0; j < pProductList->Count(); j++ ) { GenericInformation *pCandidate = pProductList->GetObject( j ); ByteString sKey( "DEPENDSON/" ); sKey += rProduct; - GenericInformation *pDependsOn = pCandidate->GetSubInfo( sKey, TRUE ); + GenericInformation *pDependsOn = pCandidate->GetSubInfo( sKey, sal_True ); if ( pDependsOn ) PrintDependentTargets( *pCandidate, nLevel + 1 ); } @@ -197,7 +197,7 @@ USHORT ProductMapper::PrintDependentTargets( if ( pBasedOn ) { GenericInformationList *pBases = pBasedOn->GetSubList(); if ( pBases ) { - for ( ULONG k = 0; k < pBases->Count(); k++ ) { + for ( sal_uIntPtr k = 0; k < pBases->Count(); k++ ) { aBaseList.PutString( new ByteString( *pBases->GetObject( k ))); } } @@ -209,24 +209,24 @@ USHORT ProductMapper::PrintDependentTargets( } /*****************************************************************************/ -USHORT ProductMapper::PrintAndDeleteBaseList() +sal_uInt16 ProductMapper::PrintAndDeleteBaseList() /*****************************************************************************/ { if ( aBaseList.Count()) { fprintf( stdout, "\nbased on\n" ); while ( aBaseList.Count()) { - ByteString sProduct( *aBaseList.GetObject(( ULONG ) 0 )); - if ( aPrintedList.IsString( aBaseList.GetObject(( ULONG ) 0 )) == NOT_THERE ) { - aPrintedList.PutString( aBaseList.GetObject(( ULONG ) 0 )); + ByteString sProduct( *aBaseList.GetObject(( sal_uIntPtr ) 0 )); + if ( aPrintedList.IsString( aBaseList.GetObject(( sal_uIntPtr ) 0 )) == NOT_THERE ) { + aPrintedList.PutString( aBaseList.GetObject(( sal_uIntPtr ) 0 )); PrintDependentTargets( sProduct ); } else - delete aBaseList.GetObject(( ULONG ) 0 ); + delete aBaseList.GetObject(( sal_uIntPtr ) 0 ); - aBaseList.Remove(( ULONG ) 0 ); + aBaseList.Remove(( sal_uIntPtr ) 0 ); } while ( aPrintedList.Count()) - delete aPrintedList.Remove(( ULONG ) 0 ); + delete aPrintedList.Remove(( sal_uIntPtr ) 0 ); fprintf( stdout, "\n" ); } @@ -234,16 +234,16 @@ USHORT ProductMapper::PrintAndDeleteBaseList() } /*****************************************************************************/ -USHORT ProductMapper::PrintDependencies( const ByteString &rProduct ) +sal_uInt16 ProductMapper::PrintDependencies( const ByteString &rProduct ) /*****************************************************************************/ { - USHORT nResult = PrintDependentTargets( rProduct ); + sal_uInt16 nResult = PrintDependentTargets( rProduct ); PrintAndDeleteBaseList(); return nResult; } /*****************************************************************************/ -USHORT ProductMapper::PrintProductList() +sal_uInt16 ProductMapper::PrintProductList() /*****************************************************************************/ { if ( !pVersionList ) @@ -253,7 +253,7 @@ USHORT ProductMapper::PrintProductList() return PRODUCT_MAPPER_NO_PRODUCT; if ( pProductList->Count()) { - for ( ULONG i = 0; i < pProductList->Count(); i++ ) + for ( sal_uIntPtr i = 0; i < pProductList->Count(); i++ ) fprintf( stdout, "%s (%s)\n", pProductList->GetObject( i )->GetBuffer(), pProductList->GetObject( i )->GetValue().GetBuffer()); @@ -279,7 +279,7 @@ SByteStringList *ProductMapper::GetMinorList( aEntry += DirEntry( sWildcard ); Dir aDir( aEntry, FSYS_KIND_DIR ); - for ( USHORT i = 0; i < aDir.Count(); i++ ) { + for ( sal_uInt16 i = 0; i < aDir.Count(); i++ ) { ByteString sInc( aDir[ i ].GetName(), RTL_TEXTENCODING_ASCII_US ); if ( sInc.GetTokenCount( '.' ) > 1 ) { if ( !pList ) @@ -302,7 +302,7 @@ String ProductMapper::GetVersionRoot( if ( pVersion ) { #ifdef UNX sKey = "drives/o:/unixvolume"; - GenericInformation *pUnixVolume = pVersion->GetSubInfo( sKey, TRUE ); + GenericInformation *pUnixVolume = pVersion->GetSubInfo( sKey, sal_True ); ByteString sPath; if ( pUnixVolume ) sPath = pUnixVolume->GetValue(); @@ -311,7 +311,7 @@ String ProductMapper::GetVersionRoot( ByteString sPath( "o:\\" ); #endif sKey = "settings/path"; - GenericInformation *pPath = pVersion->GetSubInfo( sKey, TRUE ); + GenericInformation *pPath = pVersion->GetSubInfo( sKey, sal_True ); if ( pPath ) { sPath += pPath->GetValue().GetToken( 0, '\\' ); sPath += "/"; @@ -331,7 +331,7 @@ String ProductMapper::GetVersionRoot( /*****************************************************************************/ BaseProductList *ProductMapper::GetBases( - GenericInformation *pProductInfo, USHORT nLevel, + GenericInformation *pProductInfo, sal_uInt16 nLevel, BaseProductList *pBases ) /*****************************************************************************/ { @@ -349,29 +349,29 @@ BaseProductList *ProductMapper::GetBases( if ( pBasedOn ) { GenericInformationList *pBasesInfo = pBasedOn->GetSubList(); if ( pBasesInfo ) { - for ( ULONG k = 0; k < pBasesInfo->Count(); k++ ) { + for ( sal_uIntPtr k = 0; k < pBasesInfo->Count(); k++ ) { GenericInformation *pBaseProduct; if ( GetProductInformation( *pBasesInfo->GetObject( k ), pBaseProduct ) == PRODUCT_MAPPER_OK ) GetBases( pBaseProduct, ++ nLevel, pBases ); } } } - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; ByteString sUpperCandidate( sCandidate ); sUpperCandidate.ToUpperAscii(); - for ( USHORT i = 0; i < pBases->Count() && !bFound; i++ ) { + for ( sal_uInt16 i = 0; i < pBases->Count() && !bFound; i++ ) { ByteString sTest( *pBases->GetObject( i )); if ( sTest.ToUpperAscii() == sUpperCandidate ) - bFound = TRUE; + bFound = sal_True; } if ( !bFound ) - pBases->Insert( new ByteString( sCandidate ), ( ULONG ) 0 ); + pBases->Insert( new ByteString( sCandidate ), ( sal_uIntPtr ) 0 ); } return pBases; } /*****************************************************************************/ -USHORT ProductMapper::PrintMinorList( +sal_uInt16 ProductMapper::PrintMinorList( const ByteString rProduct, const ByteString rEnvironment ) /*****************************************************************************/ { @@ -389,18 +389,18 @@ USHORT ProductMapper::PrintMinorList( BaseProductList *pBases = GetBases( pProductInfo ); if ( pBases->Count()) { if ( pBases->Count() > 1 ) - fprintf( stdout, "Product \"%s\" based on ", pBases->GetObject(( ULONG ) 0 )->GetBuffer()); + fprintf( stdout, "Product \"%s\" based on ", pBases->GetObject(( sal_uIntPtr ) 0 )->GetBuffer()); else - fprintf( stdout, "Product \"%s\" based on no other products", pBases->GetObject(( ULONG ) 0 )->GetBuffer()); + fprintf( stdout, "Product \"%s\" based on no other products", pBases->GetObject(( sal_uIntPtr ) 0 )->GetBuffer()); - for ( ULONG i = 1; i < pBases->Count(); i++ ) { + for ( sal_uIntPtr i = 1; i < pBases->Count(); i++ ) { fprintf( stdout, "\"%s\"", pBases->GetObject( i )->GetBuffer()); if ( i < pBases->Count() - 1 ) fprintf( stdout, ", " ); } fprintf( stdout, "\n\n" ); } - USHORT nResult = PRODUCT_MAPPER_OK; + sal_uInt16 nResult = PRODUCT_MAPPER_OK; if ( rEnvironment.Len()) nResult = PrintSingleMinorList( pProductInfo, pBases, rEnvironment ); @@ -408,12 +408,12 @@ USHORT ProductMapper::PrintMinorList( ByteString sEnvKey( pProductInfo->GetValue()); sEnvKey += "/Environments"; - GenericInformation *pEnvironmentInfo = pVersionList->GetInfo( sEnvKey, TRUE ); + GenericInformation *pEnvironmentInfo = pVersionList->GetInfo( sEnvKey, sal_True ); if ( pEnvironmentInfo ) { GenericInformationList *pEnvironmentList = pEnvironmentInfo->GetSubList(); if ( pEnvironmentList ) { - for ( ULONG i = 0; i < pEnvironmentList->Count(); i++ ) { - USHORT nTmp = PrintSingleMinorList( pProductInfo, pBases, *pEnvironmentList->GetObject( i )); + for ( sal_uIntPtr i = 0; i < pEnvironmentList->Count(); i++ ) { + sal_uInt16 nTmp = PrintSingleMinorList( pProductInfo, pBases, *pEnvironmentList->GetObject( i )); if ( nTmp != PRODUCT_MAPPER_OK ) nResult = nTmp; } @@ -421,7 +421,7 @@ USHORT ProductMapper::PrintMinorList( } } - for ( ULONG m = 0; m < pBases->Count(); m++ ) + for ( sal_uIntPtr m = 0; m < pBases->Count(); m++ ) delete pBases->GetObject( m ); delete pBases; @@ -429,7 +429,7 @@ USHORT ProductMapper::PrintMinorList( } /*****************************************************************************/ -USHORT ProductMapper::PrintSingleMinorList( +sal_uInt16 ProductMapper::PrintSingleMinorList( GenericInformation *pProductInfo, BaseProductList *pBases, const ByteString rEnvironment ) /*****************************************************************************/ @@ -445,12 +445,12 @@ USHORT ProductMapper::PrintSingleMinorList( pMinors->Insert( new ByteString( "" ), LIST_APPEND ); SByteStringList aOutputList; - BOOL bUnknownMinor = FALSE; - for ( ULONG i = 0; i < pMinors->Count(); i++ ) { + sal_Bool bUnknownMinor = sal_False; + for ( sal_uIntPtr i = 0; i < pMinors->Count(); i++ ) { ByteString sOutput; ByteString sProductVersion; - for ( ULONG j = 0; j < pBases->Count(); j++ ) { + for ( sal_uIntPtr j = 0; j < pBases->Count(); j++ ) { ByteString sCurProduct( *pBases->GetObject( j )); ByteString sVersion( sCurProduct.GetToken( sCurProduct.GetTokenCount( '(' ) - 1, '(' ).GetToken( 0, ')' )); if ( !j ) @@ -462,7 +462,7 @@ USHORT ProductMapper::PrintSingleMinorList( ByteString sMinor( pMinorMk->GetLastMinor().GetBuffer()); if ( !sMinor.Len()) { sMinor = "!"; - bUnknownMinor = TRUE; + bUnknownMinor = sal_True; } if ( j == 0 ) { sOutput += pMinorMk->GetBuildNr(); @@ -487,7 +487,7 @@ USHORT ProductMapper::PrintSingleMinorList( if ( aOutputList.Count()) fprintf( stdout, "Available builds on %s:\n", rEnvironment.GetBuffer()); - for ( ULONG o = 0; o < aOutputList.Count(); o++ ) { + for ( sal_uIntPtr o = 0; o < aOutputList.Count(); o++ ) { ByteString sOutput( *aOutputList.GetObject( o )); sOutput = sOutput.Copy( sOutput.GetToken( 0, ' ' ).Len() + 1 ); @@ -505,7 +505,7 @@ USHORT ProductMapper::PrintSingleMinorList( else if ( aOutputList.Count()) fprintf( stdout, "\n" ); - for ( ULONG l = 0; l < pMinors->Count(); l++ ) + for ( sal_uIntPtr l = 0; l < pMinors->Count(); l++ ) delete pMinors->GetObject( l ); delete pMinors; diff --git a/soldep/bootstrp/sstring.cxx b/soldep/bootstrp/sstring.cxx index a08594015759..a9c50839f6f6 100644 --- a/soldep/bootstrp/sstring.cxx +++ b/soldep/bootstrp/sstring.cxx @@ -41,9 +41,9 @@ SByteStringList::~SByteStringList() { } -ULONG SByteStringList::IsString( ByteString* pStr ) +sal_uIntPtr SByteStringList::IsString( ByteString* pStr ) { - ULONG nRet = NOT_THERE; + sal_uIntPtr nRet = NOT_THERE; if ( (nRet = GetPrevString( pStr )) != 0 ) { ByteString* pString = GetObject( nRet ); @@ -62,15 +62,15 @@ ULONG SByteStringList::IsString( ByteString* pStr ) } } -ULONG SByteStringList::GetPrevString( ByteString* pStr ) +sal_uIntPtr SByteStringList::GetPrevString( ByteString* pStr ) { - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCountMember = Count(); - ULONG nUpper = nCountMember; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; + sal_uIntPtr nRet = 0; + sal_Bool bFound = sal_False; + sal_uIntPtr nCountMember = Count(); + sal_uIntPtr nUpper = nCountMember; + sal_uIntPtr nLower = 0; + sal_uIntPtr nCurrent = nUpper / 2; + sal_uIntPtr nRem = 0; ByteString* pString; do @@ -106,17 +106,17 @@ ULONG SByteStringList::GetPrevString( ByteString* pStr ) * **************************************************************************/ -ULONG SByteStringList::PutString( ByteString* pStr ) +sal_uIntPtr SByteStringList::PutString( ByteString* pStr ) { - ULONG nPos = GetPrevString ( pStr ); + sal_uIntPtr nPos = GetPrevString ( pStr ); if ( Count() ) { { ByteString* pString = GetObject( 0 ); if ( pString->CompareTo( *pStr ) == COMPARE_GREATER ) { - Insert( pStr, (ULONG)0 ); - return (ULONG)0; + Insert( pStr, (sal_uIntPtr)0 ); + return (sal_uIntPtr)0; } } ByteString* pString = GetObject( nPos ); @@ -129,7 +129,7 @@ ULONG SByteStringList::PutString( ByteString* pStr ) else { Insert( pStr ); - return (ULONG)0; + return (sal_uIntPtr)0; } return NOT_THERE; @@ -137,7 +137,7 @@ ULONG SByteStringList::PutString( ByteString* pStr ) ByteString* SByteStringList::RemoveString( const ByteString& rName ) { - ULONG i; + sal_uIntPtr i; ByteString* pReturn; for( i = 0 ; i < Count(); i++ ) @@ -167,7 +167,7 @@ SByteStringList& SByteStringList::operator<< ( SvStream& rStream ) { sal_uInt32 nListCount; rStream >> nListCount; - for ( USHORT i = 0; i < nListCount; i++ ) { + for ( sal_uInt16 i = 0; i < nListCount; i++ ) { ByteString* pByteString = new ByteString(); rStream >> *pByteString; Insert (pByteString, LIST_APPEND); @@ -201,9 +201,9 @@ SUniStringList::~SUniStringList() { } -ULONG SUniStringList::IsString( UniString* pStr ) +sal_uIntPtr SUniStringList::IsString( UniString* pStr ) { - ULONG nRet = NOT_THERE; + sal_uIntPtr nRet = NOT_THERE; if ( (nRet = GetPrevString( pStr )) != 0 ) { UniString* pString = GetObject( nRet ); @@ -222,15 +222,15 @@ ULONG SUniStringList::IsString( UniString* pStr ) } } -ULONG SUniStringList::GetPrevString( UniString* pStr ) +sal_uIntPtr SUniStringList::GetPrevString( UniString* pStr ) { - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCountMember = Count(); - ULONG nUpper = nCountMember; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; + sal_uIntPtr nRet = 0; + sal_Bool bFound = sal_False; + sal_uIntPtr nCountMember = Count(); + sal_uIntPtr nUpper = nCountMember; + sal_uIntPtr nLower = 0; + sal_uIntPtr nCurrent = nUpper / 2; + sal_uIntPtr nRem = 0; UniString* pString; do @@ -266,17 +266,17 @@ ULONG SUniStringList::GetPrevString( UniString* pStr ) * **************************************************************************/ -ULONG SUniStringList::PutString( UniString* pStr ) +sal_uIntPtr SUniStringList::PutString( UniString* pStr ) { - ULONG nPos = GetPrevString ( pStr ); + sal_uIntPtr nPos = GetPrevString ( pStr ); if ( Count() ) { { UniString* pString = GetObject( 0 ); if ( pString->CompareTo( *pStr ) == COMPARE_GREATER ) { - Insert( pStr, (ULONG)0); - return (ULONG)0; + Insert( pStr, (sal_uIntPtr)0); + return (sal_uIntPtr)0; } } UniString* pString = GetObject( nPos ); @@ -289,7 +289,7 @@ ULONG SUniStringList::PutString( UniString* pStr ) else { Insert( pStr ); - return (ULONG)0; + return (sal_uIntPtr)0; } return NOT_THERE; @@ -297,7 +297,7 @@ ULONG SUniStringList::PutString( UniString* pStr ) UniString* SUniStringList::RemoveString( const UniString& rName ) { - ULONG i; + sal_uIntPtr i; UniString* pReturn; for( i = 0 ; i < Count(); i++ ) diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx index 4e7d4b80ec3e..74bf674203eb 100644 --- a/soldep/inc/dep.hxx +++ b/soldep/inc/dep.hxx @@ -33,9 +33,9 @@ class SByteExtStringList : public SByteStringList { private: - BOOL bDeleteStrings; + sal_Bool bDeleteStrings; public: - SByteExtStringList(BOOL bDelete = TRUE) : bDeleteStrings (bDelete) {} + SByteExtStringList(sal_Bool bDelete = sal_True) : bDeleteStrings (bDelete) {} ~SByteExtStringList(); }; diff --git a/soldep/inc/minormk.hxx b/soldep/inc/minormk.hxx index 0f14497dbaa7..1f4205cd8981 100644 --- a/soldep/inc/minormk.hxx +++ b/soldep/inc/minormk.hxx @@ -41,7 +41,7 @@ private: ByteString sBUILD; ByteString sLAST_MINOR; - BOOL bExists; + sal_Bool bExists; void ReadMinorMk( const String &rFileName ); @@ -72,6 +72,6 @@ public: ByteString GetLastMinor() { return sLAST_MINOR; } - BOOL Exists() + sal_Bool Exists() { return bExists; } }; diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx index ac39b97b5bc3..c0f6ade654cd 100644 --- a/soldep/inc/prodmap.hxx +++ b/soldep/inc/prodmap.hxx @@ -52,13 +52,13 @@ private: SByteStringList aBaseList; SByteStringList aPrintedList; - USHORT PrintDependentTargets( const ByteString &rProduct, USHORT nLevel = 0 ); - USHORT PrintAndDeleteBaseList(); + sal_uInt16 PrintDependentTargets( const ByteString &rProduct, sal_uInt16 nLevel = 0 ); + sal_uInt16 PrintAndDeleteBaseList(); SByteStringList *GetMinorList( const ByteString &rVersion, const ByteString &rEnvironment ); - BaseProductList *GetBases( GenericInformation *pProductInfo, USHORT nLevel = 0, BaseProductList *pBases = NULL ); + BaseProductList *GetBases( GenericInformation *pProductInfo, sal_uInt16 nLevel = 0, BaseProductList *pBases = NULL ); - USHORT PrintSingleMinorList( GenericInformation *pProductInfo, BaseProductList *pBases, const ByteString rEnvironment ); + sal_uInt16 PrintSingleMinorList( GenericInformation *pProductInfo, BaseProductList *pBases, const ByteString rEnvironment ); public: ProductMapper(); @@ -68,11 +68,11 @@ public: void CreateProductList( GenericInformationList *pVerList ); - USHORT GetProductInformation( const ByteString &rProduct, GenericInformation *& pProductInfo ); - USHORT PrintDependencies( const ByteString &rProduct ); - USHORT PrintProductList(); + sal_uInt16 GetProductInformation( const ByteString &rProduct, GenericInformation *& pProductInfo ); + sal_uInt16 PrintDependencies( const ByteString &rProduct ); + sal_uInt16 PrintProductList(); - USHORT PrintMinorList( const ByteString rProduct, const ByteString rEnvironment ); + sal_uInt16 PrintMinorList( const ByteString rProduct, const ByteString rEnvironment ); static String GetVersionRoot( GenericInformationList *pList, const ByteString &rVersion ); diff --git a/soldep/inc/soldep/appdef.hxx b/soldep/inc/soldep/appdef.hxx index cc8d5d0f2f8b..d02e4bbe9008 100644 --- a/soldep/inc/soldep/appdef.hxx +++ b/soldep/inc/soldep/appdef.hxx @@ -115,7 +115,7 @@ /** States for BuildServer projects and directories */ #ifndef BuildStatus -#define BuildStatus USHORT +#define BuildStatus sal_uInt16 #endif #define BS_DROPED 0 /// project is waiting for dispatching #define BS_BUILD 1 /// project/directory is building diff --git a/soldep/inc/soldep/command.hxx b/soldep/inc/soldep/command.hxx index 638beb6cce1f..50781e1679a9 100644 --- a/soldep/inc/soldep/command.hxx +++ b/soldep/inc/soldep/command.hxx @@ -74,12 +74,12 @@ private: char *CommandBuffer; char *ComShell; char **ppArgv; - BOOL bTmpWrite; + sal_Bool bTmpWrite; public: - CommandLine(BOOL bTmpWrite = FALSE); - CommandLine(const char *, BOOL bTmpWrite = FALSE); - CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE); + CommandLine(sal_Bool bTmpWrite = sal_False); + CommandLine(const char *, sal_Bool bTmpWrite = sal_False); + CommandLine(const CommandLine&, sal_Bool bTmpWrite = sal_False); virtual ~CommandLine(); int nArgc; @@ -102,12 +102,12 @@ private: ByteString aCommand; char *pArgv; char **ppArgv; - ULONG nArgc; + sal_uIntPtr nArgc; int nError; protected: void ImplInit(); - void Initpp( ULONG nCount, ByteString &rStr ); + void Initpp( sal_uIntPtr nCount, ByteString &rStr ); public: /** Creates the process specified without spawning it @@ -146,7 +146,7 @@ public: #define COMMAND_EXECUTE_WAIT 0x0000010 #define COMMAND_EXECUTE_REMOTE 0x1000000 -typedef ULONG CommandBits; +typedef sal_uIntPtr CommandBits; /** Allowes to spawn programms hidden, waiting etc. @see CCommand diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx index 1982e252acf8..a7dd57d4a6e3 100644 --- a/soldep/inc/soldep/connctr.hxx +++ b/soldep/inc/soldep/connctr.hxx @@ -42,13 +42,13 @@ static Rectangle aEmptyRect( Point( 0, 0), Point( 0, 0)); class Connector { ObjectWin *mpStartWin, *mpEndWin; - ULONG mnStartId, mnEndId; + sal_uIntPtr mnStartId, mnEndId; Point mStart, mEnd, mCenter; DepWin* mpParent; - BOOL bVisible; - BOOL mbHideIndependend; - static BOOL msbHideMode; + sal_Bool bVisible; + sal_Bool mbHideIndependend; + static sal_Bool msbHideMode; public: @@ -56,26 +56,26 @@ public: Connector( DepWin* pParent, WinBits nWinStyle ); ~Connector(); - void Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis = FALSE ); + void Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, sal_Bool bVis = sal_False ); Point GetMiddle(); void Paint( const Rectangle& rRect ); - void UpdatePosition( ObjectWin* pWin, BOOL bPaint = TRUE ); - USHORT Save( SvFileStream& rOutFile ); - USHORT Load( SvFileStream& rInFile ); - ULONG GetStartId(){ return mnStartId; }; - ULONG GetEndId(){ return mnEndId; }; + void UpdatePosition( ObjectWin* pWin, sal_Bool bPaint = sal_True ); + sal_uInt16 Save( SvFileStream& rOutFile ); + sal_uInt16 Load( SvFileStream& rInFile ); + sal_uIntPtr GetStartId(){ return mnStartId; }; + sal_uIntPtr GetEndId(){ return mnEndId; }; ObjectWin* GetStartWin(){ return mpStartWin; }; ObjectWin* GetEndWin(){ return mpEndWin; }; ObjectWin* GetOtherWin( ObjectWin* pWin ); - ULONG GetOtherId( ULONG nId ); - ULONG GetLen(); - BOOL IsStart( ObjectWin* pWin ); - void SetHideIndependend( BOOL bHide) { mbHideIndependend = bHide; }; + sal_uIntPtr GetOtherId( sal_uIntPtr nId ); + sal_uIntPtr GetLen(); + sal_Bool IsStart( ObjectWin* pWin ); + void SetHideIndependend( sal_Bool bHide) { mbHideIndependend = bHide; }; - BOOL IsVisible() { return bVisible; } - void SetVisibility( BOOL visible ) { bVisible = visible; } + sal_Bool IsVisible() { return bVisible; } + void SetVisibility( sal_Bool visible ) { bVisible = visible; } void UpdateVisibility(); - void SetHideMode(BOOL bHide) { msbHideMode = bHide; }; + void SetHideMode(sal_Bool bHide) { msbHideMode = bHide; }; void DrawOutput( OutputDevice* pDevice, const Point& rOffset ); }; diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx index a9de33c57043..c160c68baffd 100644 --- a/soldep/inc/soldep/depper.hxx +++ b/soldep/inc/soldep/depper.hxx @@ -99,9 +99,9 @@ class FixedText; struct depper_head { - ULONG nID; - ULONG nObjectCount; - ULONG nCnctrCount; + sal_uIntPtr nID; + sal_uIntPtr nObjectCount; + sal_uIntPtr nCnctrCount; }; @@ -115,14 +115,14 @@ enum DistType class Depper : public SolDevDll, public Window { - BOOL mbIsPrjView; - ULONG mnMinDynXOffs; + sal_Bool mbIsPrjView; + sal_uIntPtr mnMinDynXOffs; Point maDefPos; Size maDefSize; long nZoomed; - ULONG mnViewMask; + sal_uIntPtr mnViewMask; ProgressBar* pSubBar; ProgressBar* pMainBar; @@ -137,10 +137,10 @@ protected: SolIdMapper* mpPrjIdMapper; StarWriter* mpStarWriter; StarWriter* mpPrjStarWriter; //for inside prj-view - ULONG mnSolWinCount; - ULONG mnSolLastId; - ULONG mnPrjWinCount; - ULONG mnPrjLastId; + sal_uIntPtr mnSolWinCount; + sal_uIntPtr mnSolLastId; + sal_uIntPtr mnPrjWinCount; + sal_uIntPtr mnPrjLastId; ObjectList* mpObjectList; //Extended ObjWinList class ObjectList* mpObjectPrjList; //for module internal dependencies DepWin* mpBaseWin; @@ -149,50 +149,50 @@ protected: GraphWin* mpGraphPrjWin; //for inside prj-view Window* mpProcessWin; Window* mpParentProcessWin; - ObjectWin* ObjIdToPtr( ObjectList* pObjLst, ULONG nId ); + ObjectWin* ObjIdToPtr( ObjectList* pObjLst, sal_uIntPtr nId ); SoldepToolBox maToolBox; FloatingWindow maTaskBarFrame; // For ToolBox - ULONG AddObjectToList(DepWin* pParentWin, ObjectList* pObjLst, ULONG &LastID, ULONG &WinCount, ByteString& rBodyText, BOOL bInteract=TRUE ); - ULONG AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &LastID, ULONG &WinCount, ByteString& rBodyText, Point& rPos, Size& rSize ); - ObjectWin* RemoveObjectFromList( ObjectList* pObjLst, ULONG &WinCount, USHORT nId, BOOL bDelete ); - USHORT AddConnectorToObjects( ObjectList* pObjLst, ULONG nStartId, ULONG nEndId ); - USHORT RemoveConnectorFromObjects( ObjectList* pObjLst, ULONG nStartId, ULONG nEndId ); - USHORT AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ); - USHORT RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ); + sal_uIntPtr AddObjectToList(DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, sal_Bool bInteract=sal_True ); + sal_uIntPtr AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, Point& rPos, Size& rSize ); + ObjectWin* RemoveObjectFromList( ObjectList* pObjLst, sal_uIntPtr &WinCount, sal_uInt16 nId, sal_Bool bDelete ); + sal_uInt16 AddConnectorToObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId ); + sal_uInt16 RemoveConnectorFromObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId ); + sal_uInt16 AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ); + sal_uInt16 RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ); public: Depper( Window* pBaseWindow ); ~Depper(); - BOOL TogglePrjViewStatus(); - void SetPrjViewStatus(BOOL state) { mbIsPrjView = state; } - BOOL IsPrjView() { return mbIsPrjView; } + sal_Bool TogglePrjViewStatus(); + void SetPrjViewStatus(sal_Bool state) { mbIsPrjView = state; } + sal_Bool IsPrjView() { return mbIsPrjView; } GraphWin* GetGraphWin() { return (!mbIsPrjView) ? mpGraphWin : mpGraphPrjWin; } //scrollbar window DepWin* GetDepWin() { return (!mbIsPrjView) ? mpBaseWin : mpBasePrjWin; } //content of scrollbar window ProgressBar* GetMainProgressBar() { return pMainBar; } - void SetMainProgressBar( USHORT i); - void UpdateMainProgressBar(USHORT i, USHORT nScaleVal, USHORT &nStep, BOOL bCountingDown = FALSE); - void UpdateSubProgrssBar(ULONG i); + void SetMainProgressBar( sal_uInt16 i); + void UpdateMainProgressBar(sal_uInt16 i, sal_uInt16 nScaleVal, sal_uInt16 &nStep, sal_Bool bCountingDown = sal_False); + void UpdateSubProgrssBar(sal_uIntPtr i); void SetTitle( const String &rTitle ) { mpProcessWin->SetText( rTitle ); } virtual void RemoveAllObjects( ObjectList* ObjLst ); - USHORT Save( const ByteString& rFileName ); -// USHORT Load( const ByteString& rFileName ); - virtual USHORT WriteSource(); - virtual USHORT ReadSource( BOOL bUpdater ); - virtual USHORT OpenSource(); + sal_uInt16 Save( const ByteString& rFileName ); +// sal_uInt16 Load( const ByteString& rFileName ); + virtual sal_uInt16 WriteSource(); + virtual sal_uInt16 ReadSource( sal_Bool bUpdater ); + virtual sal_uInt16 OpenSource(); void SetDefPos( Point& rPos ) { maDefPos = rPos; }; Point& GetDefPos() { return maDefPos; }; void SetDefSize( Size& rSize ) { maDefSize = rSize; }; Size& GetDefSize() { return maDefSize; }; - virtual USHORT AutoArrangeDlgStart(); - virtual USHORT AutoArrangeDlgStop(); - virtual USHORT Zoom( MapMode& rMapMode ); - virtual BOOL ViewContent( ByteString& ) { return FALSE; }; - virtual USHORT CloseWindow() { return 0; }; + virtual sal_uInt16 AutoArrangeDlgStart(); + virtual sal_uInt16 AutoArrangeDlgStop(); + virtual sal_uInt16 Zoom( MapMode& rMapMode ); + virtual sal_Bool ViewContent( ByteString& ) { return sal_False; }; + virtual sal_uInt16 CloseWindow() { return 0; }; virtual void ShowHelp(){}; ObjectList* GetObjectList() { return (!mbIsPrjView) ? mpObjectList : mpObjectPrjList; } - ULONG HandleNewPrjDialog( ByteString &rBodyText ); - ULONG HandleNewDirectoryDialog( ByteString &rBodyText ); + sal_uIntPtr HandleNewPrjDialog( ByteString &rBodyText ); + sal_uIntPtr HandleNewDirectoryDialog( ByteString &rBodyText ); void HideObjectsAndConnections( ObjectList* pObjLst ); void ShowObjectsAndConnections( ObjectList* pObjLst ); //virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -201,8 +201,8 @@ public: DECL_LINK( PopupSelected, PopupMenu* ); //#endif - //void SetViewMask( ULONG nMask ); - ULONG GetViewMask() { return mnViewMask; } + //void SetViewMask( sal_uIntPtr nMask ); + sal_uIntPtr GetViewMask() { return mnViewMask; } }; #endif diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx index 4464e91aa59a..8e8d123ff73b 100644 --- a/soldep/inc/soldep/depwin.hxx +++ b/soldep/inc/soldep/depwin.hxx @@ -43,7 +43,7 @@ private: ConnectorList ConList; ObjectWin* mpNewConWin; - BOOL mbStartNewCon; + sal_Bool mbStartNewCon; Point maNewConStart; Point maNewConEnd; ObjectWin* mpSelectedProject; @@ -64,7 +64,7 @@ public: virtual void Command( const CommandEvent& rEvent); // void Resize(); void MouseMove( const MouseEvent& rMEvt ); - BOOL IsStartNewCon() { return mbStartNewCon; }; + sal_Bool IsStartNewCon() { return mbStartNewCon; }; void SetPopupHdl( void* pHdl ); void SetSelectedProject( ObjectWin* object ) { mpSelectedProject = object; }; ObjectWin* GetSelectedProject() { return mpSelectedProject; }; diff --git a/soldep/inc/soldep/hashobj.hxx b/soldep/inc/soldep/hashobj.hxx index 73d4daf699e7..d92737f9ecda 100644 --- a/soldep/inc/soldep/hashobj.hxx +++ b/soldep/inc/soldep/hashobj.hxx @@ -35,10 +35,10 @@ class ObjectWin; class MyHashObject { ObjectWin* mpWin; - ULONG mnId; + sal_uIntPtr mnId; public: - MyHashObject( ULONG nId, ObjectWin* pWin ); - ULONG GetId() { return mnId; }; + MyHashObject( sal_uIntPtr nId, ObjectWin* pWin ); + sal_uIntPtr GetId() { return mnId; }; }; #endif diff --git a/soldep/inc/soldep/hashtbl.hxx b/soldep/inc/soldep/hashtbl.hxx index 0308a6a33e0e..e955696588b9 100644 --- a/soldep/inc/soldep/hashtbl.hxx +++ b/soldep/inc/soldep/hashtbl.hxx @@ -41,16 +41,16 @@ class HashItem; class HashTable { - ULONG m_lSize; - ULONG m_lElem; + sal_uIntPtr m_lSize; + sal_uIntPtr m_lElem; HashItem *m_pData; double m_dMaxLoadFactor; double m_dGrowFactor; - BOOL m_bOwner; + sal_Bool m_bOwner; - ULONG Hash(ByteString const& Key) const; - ULONG DHash(ByteString const& Key, ULONG lHash) const; - ULONG Probe(ULONG lPos) const; + sal_uIntPtr Hash(ByteString const& Key) const; + sal_uIntPtr DHash(ByteString const& Key, sal_uIntPtr lHash) const; + sal_uIntPtr Probe(sal_uIntPtr lPos) const; HashItem* FindPos(ByteString const& Key) const; void SmartGrow(); @@ -61,9 +61,9 @@ class HashTable private: struct { - ULONG m_lSingleHash; - ULONG m_lDoubleHash; - ULONG m_lProbe; + sal_uIntPtr m_lSingleHash; + sal_uIntPtr m_lDoubleHash; + sal_uIntPtr m_lProbe; } m_aStatistic; #endif @@ -73,7 +73,7 @@ protected: virtual void OnDeleteObject(void* pObject); - void* GetObjectAt(ULONG lPos) const; + void* GetObjectAt(sal_uIntPtr lPos) const; // Default-Werte public: @@ -83,19 +83,19 @@ public: public: HashTable ( - ULONG lSize, - BOOL bOwner, + sal_uIntPtr lSize, + sal_Bool bOwner, double dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */, double dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */ ); virtual ~HashTable(); - BOOL IsFull() const; - ULONG GetSize() const { return m_lSize; } + sal_Bool IsFull() const; + sal_uIntPtr GetSize() const { return m_lSize; } void* Find (ByteString const& Key) const; - BOOL Insert (ByteString const& Key, void* pObject); + sal_Bool Insert (ByteString const& Key, void* pObject); void* Delete (ByteString const& Key); }; @@ -105,10 +105,10 @@ public: // class HashTableIterator { - ULONG m_lAt; + sal_uIntPtr m_lAt; HashTable const& m_aTable; - void* FindValidObject(BOOL bForward); + void* FindValidObject(sal_Bool bForward); protected: void* GetFirst(); // Interation _ohne_ Sortierung @@ -128,7 +128,7 @@ public: public: \ ClassName \ ( \ - ULONG lSize, \ + sal_uIntPtr lSize, \ double dMaxLoadFactor = HashTable::m_defMaxLoadFactor, \ double dGrowFactor = HashTable::m_defDefGrowFactor \ ) \ @@ -138,7 +138,7 @@ public: { return (ObjType) HashTable::Find(ByteString(Key)); } \ \ using HashTable::Insert; \ - BOOL Insert (KeyType const& Key, ObjType Object) \ + sal_Bool Insert (KeyType const& Key, ObjType Object) \ { return HashTable::Insert(ByteString(Key), (void*) Object); } \ \ ObjType Delete (KeyType const&Key) \ @@ -147,11 +147,11 @@ public: // HashTable OHNE Owner-Verhalten #define DECLARE_HASHTABLE(ClassName,KeyType,ObjType) \ - DECLARE_HASHTABLE_INTERN(ClassName,FALSE,KeyType,ObjType) + DECLARE_HASHTABLE_INTERN(ClassName,sal_False,KeyType,ObjType) // HashTable MIT Owner-Verhalten #define DECLARE_HASHTABLE_OWNER(ClassName,KeyType,ObjType) \ - DECLARE_HASHTABLE_INTERN(ClassName##2,TRUE,KeyType,ObjType) \ + DECLARE_HASHTABLE_INTERN(ClassName##2,sal_True,KeyType,ObjType) \ class ClassName : public ClassName##2 \ { \ protected: \ @@ -159,7 +159,7 @@ public: public: \ ClassName \ ( \ - ULONG lSize, \ + sal_uIntPtr lSize, \ double dMaxLoadFactor = HashTable::m_defMaxLoadFactor, \ double dGrowFactor = HashTable::m_defDefGrowFactor \ ) \ @@ -173,7 +173,7 @@ public: \ ClassName::~ClassName() \ { \ - for (ULONG i=0; i<GetSize(); i++) \ + for (sal_uIntPtr i=0; i<GetSize(); i++) \ { \ void *pObject = GetObjectAt(i); \ if (pObject != NULL) \ diff --git a/soldep/inc/soldep/listmacr.hxx b/soldep/inc/soldep/listmacr.hxx index 8c678ff32275..a27f51cfdd4c 100644 --- a/soldep/inc/soldep/listmacr.hxx +++ b/soldep/inc/soldep/listmacr.hxx @@ -36,9 +36,9 @@ public: \ void ClearAndDelete() \ { \ while ( Count()) { \ - PointerType pTmp = GetObject(( ULONG ) 0 ); \ + PointerType pTmp = GetObject(( sal_uIntPtr ) 0 ); \ delete pTmp; \ - Remove(( ULONG ) 0 ); \ + Remove(( sal_uIntPtr ) 0 ); \ } \ } \ ~ListType() \ diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx index b3170a76ce11..20156cd74a3a 100644 --- a/soldep/inc/soldep/objwin.hxx +++ b/soldep/inc/soldep/objwin.hxx @@ -59,73 +59,73 @@ class ObjectWin : public Window Point maCalcPos; ByteString msBodyText; ByteString msTipText; - ULONG mnObjectId; + sal_uIntPtr mnObjectId; PopupMenu* mpPopup; - USHORT mnPopupStaticItems; + sal_uInt16 mnPopupStaticItems; Wallpaper maObjWallpaper; ConnectorList mConnections; - ULONG mnMarkMode; - ULONG mnViewMask; - BOOL mbVisible; - BOOL mbMenuExecute; - static BOOL msbHideMode; - static ULONG msnGlobalViewMask; //will be set by SolDep + sal_uIntPtr mnMarkMode; + sal_uIntPtr mnViewMask; + sal_Bool mbVisible; + sal_Bool mbMenuExecute; + static sal_Bool msbHideMode; + static sal_uIntPtr msnGlobalViewMask; //will be set by SolDep public: - BOOL mbVisited; + sal_Bool mbVisited; // double x, y; - USHORT mnRootDist; - USHORT mnHeadDist; - BOOL mbFixed; + sal_uInt16 mnRootDist; + sal_uInt16 mnHeadDist; + sal_Bool mbFixed; //Depper* mpDepperDontuseme; Timer aTipTimer; ObjectWin( Window* pParent, WinBits nWinStyle ); ~ObjectWin(); - void SetHideMode(BOOL bHide); - BOOL ToggleHideMode(); - BOOL IsHideMode() { return msbHideMode; }; - BOOL IsNullObject() { return (msBodyText == "null"); }; - void SetGlobalViewMask(ULONG gvm) { msnGlobalViewMask = gvm; }; + void SetHideMode(sal_Bool bHide); + sal_Bool ToggleHideMode(); + sal_Bool IsHideMode() { return msbHideMode; }; + sal_Bool IsNullObject() { return (msBodyText == "null"); }; + void SetGlobalViewMask(sal_uIntPtr gvm) { msnGlobalViewMask = gvm; }; void SetBodyText( const ByteString& rNewText ); ByteString& GetBodyText(); - ULONG GetIdByName( const ByteString& rText ); + sal_uIntPtr GetIdByName( const ByteString& rText ); void SetTipText( const ByteString& rNewText ); ByteString& GetTipText(); - Point GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos = TRUE ); + Point GetFixPoint( const Point& rRefPoint, sal_Bool bUseRealPos = sal_True ); void SetCalcPosPixel( const Point& rNewPos ){ maCalcPos = rNewPos; }; Point GetCalcPosPixel() const { return maCalcPos; } void AddConnector( Connector* pNewCon ); void RemoveConnector( Connector* pOldCon ); - Connector* GetConnector( ULONG nIndex ); - Connector* GetConnector( ULONG nStartId, ULONG nEndId ); - virtual void SetMarkMode( ULONG nMarkMode = 0 ); - virtual void UnsetMarkMode( ULONG nMarkMode ); - ULONG GetMarkMode(){ return mnMarkMode; }; + Connector* GetConnector( sal_uIntPtr nIndex ); + Connector* GetConnector( sal_uIntPtr nStartId, sal_uIntPtr nEndId ); + virtual void SetMarkMode( sal_uIntPtr nMarkMode = 0 ); + virtual void UnsetMarkMode( sal_uIntPtr nMarkMode ); + sal_uIntPtr GetMarkMode(){ return mnMarkMode; }; Wallpaper GetActualWallpaper() { return maObjWallpaper;}; void SetActualWallpaper(const Wallpaper& aWp) { maObjWallpaper = aWp;}; - void MarkNeeded( BOOL bReset = FALSE ); - void MarkDepending( BOOL bReset = FALSE ); + void MarkNeeded( sal_Bool bReset = sal_False ); + void MarkDepending( sal_Bool bReset = sal_False ); void Paint( const Rectangle& rRecct ); void MouseButtonDown( const MouseEvent& rMEvt ); void MouseButtonUp( const MouseEvent& rMEvt ); void MouseMove( const MouseEvent& rMEvt ); // void DoubleClick(); - USHORT Save( SvFileStream& rOutFile ); - USHORT Load( SvFileStream& rInFile ); - void SetId( ULONG nId ); - ULONG GetId(); + sal_uInt16 Save( SvFileStream& rOutFile ); + sal_uInt16 Load( SvFileStream& rInFile ); + void SetId( sal_uIntPtr nId ); + sal_uIntPtr GetId(); void UpdateConnectors(); void SetAllConnectorsUnvisible(); virtual void Command( const CommandEvent& rEvent); - void SetViewMask( ULONG nMask ); - ULONG GetViewMask() { return mnViewMask; } + void SetViewMask( sal_uIntPtr nMask ); + sal_uIntPtr GetViewMask() { return mnViewMask; } using Window::IsVisible; - BOOL IsVisible() { return mbVisible; } + sal_Bool IsVisible() { return mbVisible; } DECL_LINK( PopupSelected, PopupMenu * ); DECL_LINK( PopupDeactivated, PopupMenu * ); @@ -134,9 +134,9 @@ public: //virtual void GetFocus(); virtual void LoseFocus(); - BOOL ConnectionExistsInAnyDirection( ObjectWin *pWin ); + sal_Bool ConnectionExistsInAnyDirection( ObjectWin *pWin ); void DrawOutput( OutputDevice* pDevice, const Point& rOffset ); - BOOL IsTop(); + sal_Bool IsTop(); }; DECL_DEST_LIST( TmpObjWinList, ObjWinList, ObjectWin* ) @@ -147,7 +147,7 @@ class ObjectList : public ObjWinList private: ObjectWin* pSelectedObjectWin; protected: - BOOL mbHideMode; + sal_Bool mbHideMode; public: ObjectList(); ~ObjectList() {}; diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx index 7a75c5a1c310..766a89d72237 100644 --- a/soldep/inc/soldep/prj.hxx +++ b/soldep/inc/soldep/prj.hxx @@ -83,10 +83,10 @@ class CommandData ByteString sClientRestriction; SByteStringList *pDepList; SByteStringList *pCommandList; - USHORT nOSType; - USHORT nCommand; + sal_uInt16 nOSType; + sal_uInt16 nCommand; - ULONG nDepth; // Tiefe der Abhaenigkeit + sal_uIntPtr nDepth; // Tiefe der Abhaenigkeit public: CommandData(); @@ -113,19 +113,19 @@ public: void SetPath( ByteString aName ){aPath = aName;} ByteString GetPrePath(){return aPrePath;} void SetPrePath( ByteString aName ){aPrePath = aName;} - USHORT GetOSType(){return nOSType;} + sal_uInt16 GetOSType(){return nOSType;} ByteString GetOSTypeString(); - void SetOSType( USHORT nType ){nOSType = nType;} - USHORT GetCommandType(){return nCommand;} + void SetOSType( sal_uInt16 nType ){nOSType = nType;} + sal_uInt16 GetCommandType(){return nCommand;} ByteString GetCommandTypeString(); - void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} + void SetCommandType( sal_uInt16 nCommandType ){nCommand = nCommandType;} SByteStringList* GetDependencies(){return pDepList;} void SetDependencies( SByteStringList *pList ){pDepList = pList;} ByteString GetClientRestriction() { return sClientRestriction; } void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } void AddDepth(){nDepth++;} - ULONG GetDepth(){return nDepth;} + sal_uIntPtr GetDepth(){return nDepth;} void AddCommand(ByteString* pCommand); SByteStringList* GetCommandList() {return pCommandList;} @@ -155,7 +155,7 @@ public: SimpleConfig(DirEntry& rDirEntry); ~SimpleConfig(); ByteString GetNext(); - ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); + ByteString GetCleanedNextLine( sal_Bool bReadComments = sal_False ); }; #define ENV_GUI 0x00000000 @@ -197,14 +197,14 @@ class DepInfo private: ByteString* pProject; SByteStringList* pModeList; - BOOL bAllModes; + sal_Bool bAllModes; void RemoveProject (); void RemoveModeList (); public: - DepInfo() : pProject(0), pModeList(0), bAllModes(FALSE) {} - DepInfo(ByteString* pString) : pProject(0), pModeList(0), bAllModes(FALSE) {pProject = pString;} - DepInfo(ByteString* pString, SByteStringList* pList) : pProject(0), pModeList(0), bAllModes(FALSE) {pProject = pString; pModeList = pList;} + DepInfo() : pProject(0), pModeList(0), bAllModes(sal_False) {} + DepInfo(ByteString* pString) : pProject(0), pModeList(0), bAllModes(sal_False) {pProject = pString;} + DepInfo(ByteString* pString, SByteStringList* pList) : pProject(0), pModeList(0), bAllModes(sal_False) {pProject = pString; pModeList = pList;} ~DepInfo(); void SetProject (ByteString* pStr); @@ -212,8 +212,8 @@ class DepInfo void PutModeString (ByteString* pStr); SByteStringList* GetModeList() {return pModeList;} void SetModeList (SByteStringList* pList) {pModeList = pList;} - BOOL IsAllModes() {return bAllModes;} - void SetAllModes(BOOL bModes=TRUE) {bAllModes = bModes;} + sal_Bool IsAllModes() {return bAllModes;} + void SetAllModes(sal_Bool bModes=sal_True) {bAllModes = bModes;} DepInfo& operator<< ( SvStream& rStream ); DepInfo& operator>> ( SvStream& rStream ); @@ -237,19 +237,19 @@ class SDepInfoList : public DepInfoList ~SDepInfoList(); // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString*, ByteString*); - ULONG PutString( ByteString*); + sal_uIntPtr PutString( ByteString*, ByteString*); + sal_uIntPtr PutString( ByteString*); void PutModeString( DepInfo* pInfoList, ByteString* pStr ); ByteString* RemoveString( const ByteString& rName ); // Position des ByteString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( ByteString* ); + sal_uIntPtr IsString( ByteString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( ByteString* ); + sal_uIntPtr GetPrevString( ByteString* ); SByteStringList* GetAllDepModes(); SDepInfoList& operator<< ( SvStream& rStream ); @@ -276,16 +276,16 @@ private: SByteStringList* pPrjInitialDepList; SByteStringList* pPrjDepList; SDepInfoList* pPrjDepInfoList; - BOOL bSorted; - BOOL bHardDependencies; - BOOL bFixedDependencies; - BOOL bVisited; - BOOL bIsAvailable; + sal_Bool bSorted; + sal_Bool bHardDependencies; + sal_Bool bFixedDependencies; + sal_Bool bVisited; + sal_Bool bIsAvailable; SByteStringList* RemoveStringList(SByteStringList* pStringList ); SDepInfoList* RemoveDepInfoList(SDepInfoList* pInfoList ); PrjList* pTempCommandDataList; - BOOL bTempCommandDataListPermanent; - BOOL bError; + sal_Bool bTempCommandDataListPermanent; + sal_Bool bError; public: Prj(); Prj( ByteString aName ); @@ -296,27 +296,27 @@ public: {return aProjectName;} void SetProjectName(ByteString aName) {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, + sal_Bool InsertDirectory( ByteString aDirName , sal_uInt16 aWhat, + sal_uInt16 aWhatOS, ByteString aLogFileName, const ByteString &rClientRestriction ); CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); + CommandData* GetDirectoryList ( sal_uInt16 nWhatOs, sal_uInt16 nCommand ); CommandData* GetDirectoryData( ByteString aLogFileName ); inline CommandData* GetData( ByteString aLogFileName ) { return GetDirectoryData( aLogFileName ); }; - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); + SByteStringList* GetDependencies( sal_Bool bExpanded = sal_True ); SDepInfoList* GetModeAndDependencies() {return pPrjDepInfoList;} void AddDependencies( ByteString aStr ); void AddDependencies( ByteString aStr, ByteString aModeStr ); void SetMode(SByteStringList* pModeList); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } - void HasFixedDependencies( BOOL bFixed ) { bFixedDependencies = bFixed; } - BOOL HasFixedDependencies() { return bFixedDependencies; } + void HasHardDependencies( sal_Bool bHard ) { bHardDependencies = bHard; } + sal_Bool HasHardDependencies() { return bHardDependencies; } + void HasFixedDependencies( sal_Bool bFixed ) { bFixedDependencies = bFixed; } + sal_Bool HasFixedDependencies() { return bFixedDependencies; } - BOOL IsAvailable() { return bIsAvailable; } - void IsAvailable( BOOL bAvailable ) { bIsAvailable=bAvailable; } + sal_Bool IsAvailable() { return bIsAvailable; } + void IsAvailable( sal_Bool bAvailable ) { bIsAvailable=bAvailable; } void ExtractDependencies(); @@ -324,12 +324,12 @@ public: void RemoveTempCommandDataList(); void GenerateTempCommandDataList(); void GenerateEmptyTempCommandDataList(); - BOOL HasTempCommandDataList() {return pTempCommandDataList != NULL;} - void SetTempCommandDataListPermanent (BOOL bVar = TRUE) {bTempCommandDataListPermanent = bVar;} - BOOL IsTempCommandDataListPermanent() {return bTempCommandDataListPermanent;} + sal_Bool HasTempCommandDataList() {return pTempCommandDataList != NULL;} + void SetTempCommandDataListPermanent (sal_Bool bVar = sal_True) {bTempCommandDataListPermanent = bVar;} + sal_Bool IsTempCommandDataListPermanent() {return bTempCommandDataListPermanent;} - void SetError (BOOL bVar = TRUE) {bError = bVar;} - BOOL HasError () {return bError;} + void SetError (sal_Bool bVar = sal_True) {bError = bVar;} + sal_Bool HasError () {return bError;} Prj& operator<< ( SvStream& rStream ); Prj& operator>> ( SvStream& rStream ); @@ -355,7 +355,7 @@ private: Date aDateCreated; Time aTimeCreated; - BOOL bExists; + sal_Bool bExists; public: StarFile( const String &rFile ); @@ -363,8 +363,8 @@ public: Date GetDate() { return aDate; } Time GetTime() { return aTime; } - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } + sal_Bool NeedsUpdate(); + sal_Bool Exists() { return bExists; } }; DECLARE_LIST( StarFileList, StarFile * ) @@ -382,7 +382,7 @@ private: protected: vos:: OMutex aMutex; - USHORT nStarMode; + sal_uInt16 nStarMode; SolarFileList aFileList; StarFileList aLoadedFilesList; String sSourceRoot; @@ -397,12 +397,12 @@ protected: void Expand_Impl(); void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); - ULONG SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile ); + sal_uIntPtr SearchFileEntry( StarFileList *pStarFiles, StarFile* pFile ); void InsertTokenLine (const ByteString& rToken, Prj** ppPrj, const ByteString& rProjectName, const sal_Bool bExtendAlias = sal_True); public: Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); + Star( String aFileName, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE ); Star( SolarFileList *pSolarFiles ); Star( GenericInformationList *pStandLst, ByteString &rVersion ); @@ -417,22 +417,22 @@ public: // void ReadXmlBuildList(const ByteString& sBuildLstPath); - BOOL HasProject( ByteString aProjectName ); + sal_Bool HasProject( ByteString aProjectName ); Prj* GetPrj( ByteString aProjectName ); ByteString GetPrjName( DirEntry &rPath ); - BOOL RemovePrj ( Prj* pPrj ); + sal_Bool RemovePrj ( Prj* pPrj ); void RemoveAllPrj (); - StarFile* ReadBuildlist (const String& rFilename, BOOL bReadComments = FALSE, BOOL bExtendAlias = TRUE); - BOOL NeedsUpdate(); + StarFile* ReadBuildlist (const String& rFilename, sal_Bool bReadComments = sal_False, sal_Bool bExtendAlias = sal_True); + sal_Bool NeedsUpdate(); SolarFileList* NeedsFilesForUpdate(); void ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile ); - void UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE ); - void FullReload( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE ); + void UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, sal_Bool bRead = sal_False ); + void FullReload( GenericInformationList *pStandLst, ByteString &rVersion, sal_Bool bRead = sal_False ); void GenerateFileLoadList( SolarFileList *pSolarFiles ); - BOOL CheckFileLoadList(SolarFileList *pSolarFiles); + sal_Bool CheckFileLoadList(SolarFileList *pSolarFiles); - USHORT GetMode() { return nStarMode; } + sal_uInt16 GetMode() { return nStarMode; } String GetFileName(){ return sFileName; }; String GetSourceRoot(){ return sSourceRoot; }; SByteStringList* GetAvailableDeps (); @@ -454,23 +454,23 @@ public: class StarWriter : public Star { private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); + sal_uInt16 WritePrj( Prj *pPrj, SvFileStream& rStream ); public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); + StarWriter( String aFileName, sal_Bool bReadComments = sal_False, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE ); + StarWriter( SolarFileList *pSolarFiles, sal_Bool bReadComments = sal_False ); StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor, - BOOL bReadComments = FALSE ); + sal_Bool bReadComments = sal_False ); void CleanUp(); - BOOL InsertProject ( Prj* pNewPrj ); + sal_Bool InsertProject ( Prj* pNewPrj ); Prj* RemoveProject ( ByteString aProjectName ); - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); + sal_uInt16 Read( String aFileName, sal_Bool bReadComments = sal_False, sal_uInt16 nMode = STAR_MODE_SINGLE_PARSE ); + sal_uInt16 Read( SolarFileList *pSolarFiles, sal_Bool bReadComments = sal_False ); + sal_uInt16 Write( String aFileName ); + sal_uInt16 WriteMultiple( String rSourceRoot ); void InsertTokenLine ( const ByteString& rTokenLine ); }; diff --git a/soldep/inc/soldep/sdtresid.hxx b/soldep/inc/soldep/sdtresid.hxx index 02a3a57e37ea..2fcf49d70c5e 100644 --- a/soldep/inc/soldep/sdtresid.hxx +++ b/soldep/inc/soldep/sdtresid.hxx @@ -45,7 +45,7 @@ public: class DtSodResId : public ResId { public: - DtSodResId(USHORT nId); + DtSodResId(sal_uInt16 nId); }; #endif diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx index 55fb4fc0e11c..dccaa204e7de 100644 --- a/soldep/inc/soldep/soldep.hxx +++ b/soldep/inc/soldep/soldep.hxx @@ -40,10 +40,10 @@ class ObjectWin; class SolDep : public Depper { - BOOL mbBServer; //call from build server - ULONG mnMinDynXOffs; - ULONG mnLevelOffset; - ULONG mnXOffset; + sal_Bool mbBServer; //call from build server + sal_uIntPtr mnMinDynXOffs; + sal_uIntPtr mnLevelOffset; + sal_uIntPtr mnXOffset; ObjWinList* mpTravellerList; String msSourceName; @@ -51,7 +51,7 @@ class SolDep : public Depper ByteString msVersionMinor; ByteString msProject; ObjectWin* mpFocusWin; - BOOL mbIsHide; + sal_Bool mbIsHide; GenericInformationList *mpStandLst; @@ -60,15 +60,15 @@ class SolDep : public Depper SolarFileList* GetPrjListFromDir(); - Point CalcPos( USHORT nSet, USHORT nIndex ); - ULONG CalcXOffset( ULONG nObjectsToFit ); + Point CalcPos( sal_uInt16 nSet, sal_uInt16 nIndex ); + sal_uIntPtr CalcXOffset( sal_uIntPtr nObjectsToFit ); double CalcDistSum( ObjWinList* pObjList, DistType eDistType = TOPDOWN ); - USHORT Impl_Traveller( ObjectWin* pWin, USHORT nDepth ); + sal_uInt16 Impl_Traveller( ObjectWin* pWin, sal_uInt16 nDepth ); double Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, - double dMinDist, ULONG nStart, ULONG nSize, DistType eDisType = TOPDOWN ); - USHORT Load( const ByteString& rFileName ); + double dMinDist, sal_uIntPtr nStart, sal_uIntPtr nSize, DistType eDisType = TOPDOWN ); + sal_uInt16 Load( const ByteString& rFileName ); void WriteToErrorFile(); - BOOL MarkObjects( ObjectWin* pObjectWin ); + sal_Bool MarkObjects( ObjectWin* pObjectWin ); void InitContextMenueMainWnd(); void InitContextMenuePrjViewWnd(DepWin* pWin); protected: @@ -80,36 +80,36 @@ protected: public: SolDep( Window* pBaseWindow ); ~SolDep(); - BOOL IsHideMode() { return mbIsHide;}; + sal_Bool IsHideMode() { return mbIsHide;}; void ToggleHideDependency(); - virtual ULONG GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList); - ULONG GetStartPrj(SolIdMapper* pIdMapper, ObjectList* pObjList); - virtual USHORT ReadSource( BOOL bUpdater = FALSE ); - virtual USHORT WriteSource(); - virtual USHORT OpenSource(); - BOOL GetVersion(); + virtual sal_uIntPtr GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList); + sal_uIntPtr GetStartPrj(SolIdMapper* pIdMapper, ObjectList* pObjList); + virtual sal_uInt16 ReadSource( sal_Bool bUpdater = sal_False ); + virtual sal_uInt16 WriteSource(); + virtual sal_uInt16 OpenSource(); + sal_Bool GetVersion(); void Init(); void Init( ByteString &rVersion, GenericInformationList *pVersionList = NULL ); - BOOL InitPrj( ByteString& rListName ); + sal_Bool InitPrj( ByteString& rListName ); // using Depper::AddObject; - virtual ULONG AddObject( ByteString& rBodyText, BOOL Interact=TRUE ); - ULONG AddPrjObject( ByteString& rBodyText, BOOL Interact=TRUE ); - virtual ObjectWin* RemoveObject( USHORT nId, BOOL bDelete = TRUE ); + virtual sal_uIntPtr AddObject( ByteString& rBodyText, sal_Bool Interact=sal_True ); + sal_uIntPtr AddPrjObject( ByteString& rBodyText, sal_Bool Interact=sal_True ); + virtual ObjectWin* RemoveObject( sal_uInt16 nId, sal_Bool bDelete = sal_True ); virtual void RemoveAllObjects( ObjectList* pObjLst ); - virtual USHORT AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ); - USHORT AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ); - virtual USHORT RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ); - USHORT RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ); - USHORT AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ); - USHORT OptimizePos( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ); - virtual BOOL ViewContent( ByteString& rObjectName ); - virtual USHORT CloseWindow(); + virtual sal_uInt16 AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ); + sal_uInt16 AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ); + virtual sal_uInt16 RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ); + sal_uInt16 RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ); + sal_uInt16 AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID ); + sal_uInt16 OptimizePos( SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID ); + virtual sal_Bool ViewContent( ByteString& rObjectName ); + virtual sal_uInt16 CloseWindow(); virtual void ShowHelp(); FloatingWindow* GetTaskBarFrame() { return &maTaskBarFrame; } SoldepToolBox* GetSoldepToolBox() { return &maToolBox; } - BOOL FindProject(); + sal_Bool FindProject(); void Resize(); }; diff --git a/soldep/inc/soldep/sstring.hxx b/soldep/inc/soldep/sstring.hxx index 933770887e37..08eb1da71a09 100644 --- a/soldep/inc/soldep/sstring.hxx +++ b/soldep/inc/soldep/sstring.hxx @@ -52,16 +52,16 @@ public: ~SByteStringList(); // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString* ); + sal_uIntPtr PutString( ByteString* ); ByteString* RemoveString( const ByteString& rName ); // Position des ByteString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( ByteString* ); + sal_uIntPtr IsString( ByteString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( ByteString* ); + sal_uIntPtr GetPrevString( ByteString* ); void CleanUp(); SByteStringList& operator<< ( SvStream& rStream ); @@ -79,16 +79,16 @@ public: ~SUniStringList(); // neuen UniString in Liste einfuegen - ULONG PutString( UniString* ); + sal_uIntPtr PutString( UniString* ); UniString* RemoveString( const UniString& rName ); // Position des UniString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( UniString* ); + sal_uIntPtr IsString( UniString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( UniString* ); + sal_uIntPtr GetPrevString( UniString* ); }; class Text diff --git a/soldep/inc/soldep/tbox.hxx b/soldep/inc/soldep/tbox.hxx index 69276895aad5..f8cb66b73fee 100644 --- a/soldep/inc/soldep/tbox.hxx +++ b/soldep/inc/soldep/tbox.hxx @@ -34,13 +34,13 @@ class SoldepToolBox : public ToolBox { protected: -// USHORT nBuildServerToolBoxId; - BOOL bDockable; - BOOL bCloseMode; - BOOL bOldFloatMode; - BOOL bBoxIsVisible; - BOOL bPin; - BOOL bPinable; +// sal_uInt16 nBuildServerToolBoxId; + sal_Bool bDockable; + sal_Bool bCloseMode; + sal_Bool bOldFloatMode; + sal_Bool bBoxIsVisible; + sal_Bool bPin; + sal_Bool bPinable; PopupMenu aMenu; @@ -56,7 +56,7 @@ protected: void InitContextMenu(); public: - SoldepToolBox( Window* pParent, const ResId& aId, BOOL bDAble = TRUE ); + SoldepToolBox( Window* pParent, const ResId& aId, sal_Bool bDAble = sal_True ); ~SoldepToolBox(); virtual void Command( const CommandEvent& rCEvt); @@ -69,8 +69,8 @@ public: virtual void ToggleFloatingMode(); // void SetFloatingWindow( FloatingWindow* pFW) { ToolBox::mpFloatWin = pFW; } virtual void StartDocking(); - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); - virtual BOOL Close(); + virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); + virtual sal_Bool Close(); virtual void CloseDockingMode(); //Called when toolbar droped @@ -89,12 +89,12 @@ public: Link GetMouseDownHdl() { return aMouseDownHdl; } void SetResizeHdl(const Link& rLink) { aResizeHdl = rLink; } - BOOL IsBoxVisible() { return bBoxIsVisible; } + sal_Bool IsBoxVisible() { return bBoxIsVisible; } - void EnablePin( BOOL bEnable = TRUE ) { bPinable = bEnable; Invalidate(); } - BOOL GetPin(); + void EnablePin( sal_Bool bEnable = sal_True ) { bPinable = bEnable; Invalidate(); } + sal_Bool GetPin(); void TogglePin(); - void SetPin(BOOL bP); + void SetPin(sal_Bool bP); PopupMenu *GetContextMenu(); DECL_LINK( MenuSelectHdl, Menu * ); }; diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx index 10650cb41fca..e8fba662cfb5 100644 --- a/soldep/source/connctr.cxx +++ b/soldep/source/connctr.cxx @@ -32,14 +32,14 @@ #include <soldep/depwin.hxx> #include "math.h" -BOOL Connector::msbHideMode = FALSE; +sal_Bool Connector::msbHideMode = sal_False; Connector::Connector( DepWin* pParent, WinBits nWinStyle ) : mpStartWin( 0L ), mpEndWin( 0L ), mnStartId( 0 ), mnEndId( 0 ), -bVisible( FALSE ), +bVisible( sal_False ), len( 70 ) { mpParent = pParent; @@ -59,7 +59,7 @@ Connector::~Connector() mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3))); } -void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis ) +void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, sal_Bool bVis ) { mpStartWin = pStartWin; mpEndWin = pEndWin; @@ -141,7 +141,7 @@ void Connector::Paint( const Rectangle& rRect ) UpdateVisibility(); } else //IsHideMode { - //bVisible = TRUE; + //bVisible = sal_True; if (!(mpStartWin->IsNullObject())) //null_project { mpStartWin->SetViewMask(1); @@ -172,12 +172,12 @@ void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) } } -void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint ) +void Connector::UpdatePosition( ObjectWin* pWin, sal_Bool bPaint ) { // more than one call ? // Point OldStart, OldEnd; - static ULONG nCallCount = 0; + static sal_uIntPtr nCallCount = 0; //MyApp *pApp = (MyApp*)GetpApp(); //SolDep *pSoldep = pApp->GetSolDep(); @@ -216,7 +216,7 @@ void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint ) } } -USHORT Connector::Save( SvFileStream& rOutFile ) +sal_uInt16 Connector::Save( SvFileStream& rOutFile ) { rOutFile << mpStartWin->GetId(); rOutFile << mpEndWin->GetId(); @@ -224,7 +224,7 @@ USHORT Connector::Save( SvFileStream& rOutFile ) return 0; } -USHORT Connector::Load( SvFileStream& rInFile ) +sal_uInt16 Connector::Load( SvFileStream& rInFile ) { rInFile >> mnStartId; rInFile >> mnEndId; @@ -244,7 +244,7 @@ ObjectWin* Connector::GetOtherWin( ObjectWin* pWin ) return NULL; } -ULONG Connector::GetOtherId( ULONG nId ) +sal_uIntPtr Connector::GetOtherId( sal_uIntPtr nId ) { // get correspondent object id if ( mnStartId == nId ) @@ -256,17 +256,17 @@ ULONG Connector::GetOtherId( ULONG nId ) return NULL; } -ULONG Connector::GetLen() +sal_uIntPtr Connector::GetLen() { double dx, dy; dx = mStart.X() - mEnd.X(); dy = mStart.Y() - mEnd.Y(); - return (ULONG) sqrt( dx * dx + dy * dy ); + return (sal_uIntPtr) sqrt( dx * dx + dy * dy ); } -BOOL Connector::IsStart( ObjectWin* pWin ) +sal_Bool Connector::IsStart( ObjectWin* pWin ) { return pWin == mpStartWin; } diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx index 11610ea1fcef..d34a93222a3f 100644 --- a/soldep/source/depper.cxx +++ b/soldep/source/depper.cxx @@ -52,7 +52,7 @@ ByteString sDelimiterLine("#==================================================== Depper::Depper( Window* pBaseWindow ): Window( pBaseWindow ), - mbIsPrjView(FALSE), + mbIsPrjView(sal_False), maDefPos( 50, 50 ), maDefSize( 60, 25 ), mnViewMask( 1 ), @@ -105,7 +105,7 @@ Depper::~Depper() delete mpGraphWin; } -BOOL Depper::TogglePrjViewStatus() +sal_Bool Depper::TogglePrjViewStatus() { GetDepWin()->Hide(); //Hide old content window GetGraphWin()->Hide(); @@ -118,7 +118,7 @@ BOOL Depper::TogglePrjViewStatus() void Depper::HideObjectsAndConnections( ObjectList* pObjLst ) { - for ( ULONG i = 0; i < pObjLst->Count(); i ++ ) { + for ( sal_uIntPtr i = 0; i < pObjLst->Count(); i ++ ) { ObjectWin *pWin = pObjLst->GetObject( i ); pWin->Hide(); } @@ -130,7 +130,7 @@ void Depper::HideObjectsAndConnections( ObjectList* pObjLst ) void Depper::ShowObjectsAndConnections( ObjectList* pObjLst ) { - for ( ULONG i = 0; i < pObjLst->Count(); i ++ ) { + for ( sal_uIntPtr i = 0; i < pObjLst->Count(); i ++ ) { ObjectWin *pWin = pObjLst->GetObject( i ); pWin->Show(); } @@ -143,23 +143,23 @@ void Depper::ShowObjectsAndConnections( ObjectList* pObjLst ) void Depper::RemoveAllObjects( ObjectList* pObjLst ) { - ULONG i; + sal_uIntPtr i; for ( i = pObjLst->Count(); i > 0; i-- ) delete pObjLst->GetObject( i - 1 ); pObjLst->Clear(); } -USHORT Depper::Save( const ByteString& rFileName ) +sal_uInt16 Depper::Save( const ByteString& rFileName ) { - DBG_ASSERT( FALSE , "you are dead!" ); + DBG_ASSERT( sal_False , "you are dead!" ); SvFileStream aOutFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_WRITE ); depper_head dh; - USHORT i; - ULONG nObjCount = mpObjectList->Count(); + sal_uInt16 i; + sal_uIntPtr nObjCount = mpObjectList->Count(); ConnectorList* pConList = GetDepWin()->GetConnectorList(); - ULONG nCnctrCount = pConList->Count(); + sal_uIntPtr nCnctrCount = pConList->Count(); dh.nID = DEPPER_ID; dh.nObjectCount = nObjCount; @@ -181,30 +181,30 @@ USHORT Depper::Save( const ByteString& rFileName ) } -USHORT Depper::WriteSource() +sal_uInt16 Depper::WriteSource() { - DBG_ASSERT( FALSE , "overload it!" ); + DBG_ASSERT( sal_False , "overload it!" ); return 0; }; -USHORT Depper::ReadSource( BOOL bUpdater ) +sal_uInt16 Depper::ReadSource( sal_Bool bUpdater ) { - DBG_ASSERT( FALSE , "overload it!" ); + DBG_ASSERT( sal_False , "overload it!" ); return 0; }; -USHORT Depper::OpenSource() +sal_uInt16 Depper::OpenSource() { - DBG_ASSERT( FALSE , "overload it!" ); + DBG_ASSERT( sal_False , "overload it!" ); return 0; }; -ObjectWin* Depper::ObjIdToPtr( ObjectList* pObjLst, ULONG nId ) +ObjectWin* Depper::ObjIdToPtr( ObjectList* pObjLst, sal_uIntPtr nId ) { - ULONG nObjCount = pObjLst->Count(); - ULONG i = 0; + sal_uIntPtr nObjCount = pObjLst->Count(); + sal_uIntPtr i = 0; ObjectWin* pWin; - ULONG nWinId = 0; + sal_uIntPtr nWinId = 0; do { @@ -219,7 +219,7 @@ ObjectWin* Depper::ObjIdToPtr( ObjectList* pObjLst, ULONG nId ) return NULL; } -void Depper::SetMainProgressBar( USHORT i) +void Depper::SetMainProgressBar( sal_uInt16 i) { if ( pMainBar ) { pMainBar->SetValue( 100 ); @@ -227,9 +227,9 @@ void Depper::SetMainProgressBar( USHORT i) } } -void Depper::UpdateMainProgressBar(USHORT i, USHORT nScaleVal, USHORT &nStep, BOOL bCountingDown ) +void Depper::UpdateMainProgressBar(sal_uInt16 i, sal_uInt16 nScaleVal, sal_uInt16 &nStep, sal_Bool bCountingDown ) { - ULONG val = 0; + sal_uIntPtr val = 0; if ( pMainBar ) { // val = i * 50 / nScaleVal + 1; val = bCountingDown ? 50 + ( nScaleVal - i ) * 50 / nScaleVal : i * 50 / nScaleVal; @@ -242,7 +242,7 @@ void Depper::UpdateMainProgressBar(USHORT i, USHORT nScaleVal, USHORT &nStep, BO } } -void Depper::UpdateSubProgrssBar(ULONG i) +void Depper::UpdateSubProgrssBar(sal_uIntPtr i) { if ( pSubBar ) { @@ -253,7 +253,7 @@ void Depper::UpdateSubProgrssBar(ULONG i) } -USHORT Depper::AutoArrangeDlgStart() +sal_uInt16 Depper::AutoArrangeDlgStart() { pSubBar = maArrangeDlg.GetSubBar(); pMainBar = maArrangeDlg.GetMainBar(); @@ -261,15 +261,15 @@ USHORT Depper::AutoArrangeDlgStart() pMainText = maArrangeDlg.GetMainText(); pMainText->SetText( String::CreateFromAscii( "Overall status" )); maArrangeDlg.Show(); - GetDepWin()->Enable( FALSE ); + GetDepWin()->Enable( sal_False ); GetDepWin()->Hide(); return 0; } -USHORT Depper::AutoArrangeDlgStop() +sal_uInt16 Depper::AutoArrangeDlgStop() { maArrangeDlg.Hide(); - GetDepWin()->Enable( TRUE ); + GetDepWin()->Enable( sal_True ); GetDepWin()->Show(); pSubBar = NULL; pMainBar = NULL; @@ -280,9 +280,9 @@ USHORT Depper::AutoArrangeDlgStop() -USHORT Depper::Zoom( MapMode& rMapMode ) +sal_uInt16 Depper::Zoom( MapMode& rMapMode ) { - ULONG i; + sal_uIntPtr i; ObjectWin* pWin; Point aPos; Size aSize; @@ -306,7 +306,7 @@ USHORT Depper::Zoom( MapMode& rMapMode ) return 0; } -ULONG Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &LastID, ULONG &WinCount, ByteString& rBodyText, BOOL bInteract ) +sal_uIntPtr Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, sal_Bool bInteract ) { Point aPos; Size aSize = GetDefSize(); @@ -316,7 +316,7 @@ ULONG Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &L return AddObjectToList( pParentWin, pObjLst, LastID, WinCount, rBodyText, aPos, aSize ); } -ULONG Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &LastID, ULONG &WinCount, ByteString& rBodyText, Point& rPos, Size& rSize ) +sal_uIntPtr Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, sal_uIntPtr &LastID, sal_uIntPtr &WinCount, ByteString& rBodyText, Point& rPos, Size& rSize ) { ObjectWin* pWin = new ObjectWin( pParentWin, WB_BORDER ); //pWin->mpDepperDontuseme = this; @@ -350,14 +350,14 @@ ULONG Depper::AddObjectToList( DepWin* pParentWin, ObjectList* pObjLst, ULONG &L { GetDepWin()->DrawOutput( pDevice ); ObjectList* pObjList = GetObjectList(); - for ( USHORT i = pObjList->Count(); i > 0; i-- ) + for ( sal_uInt16 i = pObjList->Count(); i > 0; i-- ) { ObjectWin* pWin = pObjList->GetObject( i - 1 ); pWin->DrawOutput( pDevice ); } }*/ -ObjectWin* Depper::RemoveObjectFromList( ObjectList* pObjLst, ULONG &WinCount, USHORT nId, BOOL bDelete ) +ObjectWin* Depper::RemoveObjectFromList( ObjectList* pObjLst, sal_uIntPtr &WinCount, sal_uInt16 nId, sal_Bool bDelete ) { ObjectWin* pWin = ObjIdToPtr( pObjLst, nId ); @@ -372,7 +372,7 @@ ObjectWin* Depper::RemoveObjectFromList( ObjectList* pObjLst, ULONG &WinCount, U else return NULL; } -USHORT Depper::AddConnectorToObjects( ObjectList* pObjLst, ULONG nStartId, ULONG nEndId ) +sal_uInt16 Depper::AddConnectorToObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId ) { ObjectWin* pStartWin = ObjIdToPtr( pObjLst, nStartId ); @@ -387,7 +387,7 @@ USHORT Depper::AddConnectorToObjects( ObjectList* pObjLst, ULONG nStartId, ULONG return AddConnectorToObjects( pStartWin, pEndWin ); } -USHORT Depper::RemoveConnectorFromObjects( ObjectList* pObjLst, ULONG nStartId, ULONG nEndId ) +sal_uInt16 Depper::RemoveConnectorFromObjects( ObjectList* pObjLst, sal_uIntPtr nStartId, sal_uIntPtr nEndId ) { // DBG_ASSERT( FALSE , "noch nicht" ); ObjectWin* pStartWin = ObjIdToPtr( pObjLst, nStartId ); @@ -403,7 +403,7 @@ USHORT Depper::RemoveConnectorFromObjects( ObjectList* pObjLst, ULONG nStartId, return RemoveConnectorFromObjects( pStartWin, pEndWin ); } -USHORT Depper::AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ) +sal_uInt16 Depper::AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ) { if ( pStartWin->ConnectionExistsInAnyDirection( pEndWin )) return 0; @@ -411,13 +411,13 @@ USHORT Depper::AddConnectorToObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ) Connector* pCon = new Connector( GetDepWin(), WB_NOBORDER ); // pCon->Initialize( pStartWin, pEndWin ); if (pStartWin->IsNullObject()) //null_project - pCon->Initialize( pStartWin, pEndWin, FALSE ); + pCon->Initialize( pStartWin, pEndWin, sal_False ); else - pCon->Initialize( pStartWin, pEndWin, TRUE ); + pCon->Initialize( pStartWin, pEndWin, sal_True ); return 0; } -USHORT Depper::RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ) +sal_uInt16 Depper::RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEndWin ) { Connector* pCon = pStartWin->GetConnector( pStartWin->GetId(), pEndWin->GetId() ); @@ -430,7 +430,7 @@ USHORT Depper::RemoveConnectorFromObjects( ObjectWin* pStartWin, ObjectWin* pEnd } } -ULONG Depper::HandleNewPrjDialog( ByteString &rBodyText ) +sal_uIntPtr Depper::HandleNewPrjDialog( ByteString &rBodyText ) { SolNewProjectDlg aNewProjectDlg( GetDepWin(), DtSodResId( RID_SD_DIALOG_NEWPROJECT )); if ( aNewProjectDlg.Execute() ) @@ -438,7 +438,7 @@ ULONG Depper::HandleNewPrjDialog( ByteString &rBodyText ) rBodyText = ByteString( aNewProjectDlg.maEName.GetText(), RTL_TEXTENCODING_UTF8); //hashtable auf stand halten MyHashObject* pHObject; - ULONG nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE ); + sal_uIntPtr nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, sal_False ); pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectList, nObjectId )); mpSolIdMapper->Insert( rBodyText, pHObject ); @@ -451,9 +451,9 @@ ULONG Depper::HandleNewPrjDialog( ByteString &rBodyText ) if ( sDeps != "" ) { - USHORT i; + sal_uInt16 i; ByteString sDepName; - USHORT nToken = sDeps.GetTokenCount(' '); + sal_uInt16 nToken = sDeps.GetTokenCount(' '); for ( i = 0 ; i < nToken ; i++) { sDepName = sDeps.GetToken( i, ' ' ); @@ -468,11 +468,11 @@ ULONG Depper::HandleNewPrjDialog( ByteString &rBodyText ) if ( sDeps != "" ) { - USHORT i; + sal_uInt16 i; ByteString sDepName; - ULONG nObjectId_l, nHashedId; + sal_uIntPtr nObjectId_l, nHashedId; MyHashObject* pHObject_l; - USHORT nToken = sDeps.GetTokenCount(' '); + sal_uInt16 nToken = sDeps.GetTokenCount(' '); for ( i = 0 ; i < nToken ; i++) { sDepName = sDeps.GetToken( i, ' ' ); @@ -501,7 +501,7 @@ ULONG Depper::HandleNewPrjDialog( ByteString &rBodyText ) return 0; } -ULONG Depper::HandleNewDirectoryDialog(ByteString &rBodyText) +sal_uIntPtr Depper::HandleNewDirectoryDialog(ByteString &rBodyText) { SolNewDirectoryDlg aNewDirectoryDlg( GetDepWin(), DtSodResId( RID_SD_DIALOG_NEWDIRECTORY )); //todo: set defaults @@ -510,7 +510,7 @@ ULONG Depper::HandleNewDirectoryDialog(ByteString &rBodyText) rBodyText = ByteString( aNewDirectoryDlg.maEFlag.GetText(), RTL_TEXTENCODING_UTF8 ); //hashtable auf stand halten MyHashObject* pHObject; - ULONG nObjectId = AddObjectToList( GetDepWin(), mpObjectPrjList, mnSolLastId, mnSolWinCount, rBodyText ); + sal_uIntPtr nObjectId = AddObjectToList( GetDepWin(), mpObjectPrjList, mnSolLastId, mnSolWinCount, rBodyText ); pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId )); mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper @@ -542,12 +542,12 @@ ULONG Depper::HandleNewDirectoryDialog(ByteString &rBodyText) if ( aNewDirectoryDlg.maEDeps.GetText() != String( "", RTL_TEXTENCODING_UTF8 )) { - USHORT i; + sal_uInt16 i; ByteString sDeps = ByteString( aNewDirectoryDlg.maEDeps.GetText(), RTL_TEXTENCODING_UTF8 ); ByteString sDepName; - ULONG nObjectId_l, nHashedId; + sal_uIntPtr nObjectId_l, nHashedId; MyHashObject* pHObject_l; - USHORT nToken = sDeps.GetTokenCount(' '); + sal_uInt16 nToken = sDeps.GetTokenCount(' '); for ( i = 0 ; i < nToken ; i++) { sDepName = sDeps.GetToken( i, ' ' ); @@ -589,14 +589,14 @@ ULONG Depper::HandleNewDirectoryDialog(ByteString &rBodyText) // Context-Menue IMPL_LINK( Depper, PopupSelected, PopupMenu*, mpPopup ) { - USHORT nItemId = mpPopup->GetCurItemId(); + sal_uInt16 nItemId = mpPopup->GetCurItemId(); switch( nItemId ) { case DEPPOPUP_NEW : { ByteString sNewItem = ByteString("new"); - //AddObject( mpObjectList, sNewItem , TRUE ); + //AddObject( mpObjectList, sNewItem , sal_True ); } break; case DEPPOPUP_AUTOARRANGE : @@ -612,7 +612,7 @@ IMPL_LINK( Depper, PopupSelected, PopupMenu*, mpPopup ) WriteSource(); break; case DEPPOPUP_READ_SOURCE : - ReadSource(TRUE); + ReadSource(sal_True); break; case DEPPOPUP_OPEN_SOURCE : OpenSource(); @@ -680,8 +680,8 @@ IMPL_LINK( Depper, PopupSelected, PopupMenu*, mpPopup ) maToolBox.Show(); break; default : - DBG_ASSERT( FALSE, "default" ); + DBG_ASSERT( sal_False, "default" ); break; } return 0; -}
\ No newline at end of file +} diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx index 5d7a1e36e4e7..f3bb1875724a 100644 --- a/soldep/source/depwin.cxx +++ b/soldep/source/depwin.cxx @@ -36,17 +36,17 @@ Bitmap* pWinCopy; DepWin::DepWin( Window* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle ), - mbStartNewCon( FALSE ), + mbStartNewCon( sal_False ), maNewConStart( 0, 0 ), maNewConEnd( 0, 0 ) // mpSelectedProject( NULL ) unbekannt // mpCapturer( NULL ) { if ( !pParent->IsChildNotify() ) - pParent->EnableChildNotify( TRUE ); + pParent->EnableChildNotify( sal_True ); // if ( !pParent->IsAllResizeEnabled()) -// pParent->EnableAllResize( TRUE ); - SetUpdateMode( TRUE ); +// pParent->EnableAllResize( sal_True ); + SetUpdateMode( sal_True ); SetPosSizePixel( Point(0,0), Size( 2000, 2000 )); //Size of the scrollable Window mpPopup = new PopupMenu(); } @@ -77,7 +77,7 @@ void DepWin::NewConnector( ObjectWin* pWin ) if ( !mbStartNewCon ) { mpNewConWin = pWin; - mbStartNewCon = TRUE; + mbStartNewCon = sal_True; maNewConStart = pWin->GetFixPoint(Point(0,0)); } else @@ -93,15 +93,15 @@ void DepWin::NewConnector( ObjectWin* pWin ) // mpDepperDontuseme->AddConnector( mpNewConWin, pWin ); } mpNewConWin = 0L; - mbStartNewCon = FALSE; + mbStartNewCon = sal_False; } } void DepWin::Paint( const Rectangle& rRect ) { - ULONG i = 0; - ULONG nListCount = ConList.Count(); + sal_uIntPtr i = 0; + sal_uIntPtr nListCount = ConList.Count(); for ( i=0 ; i < nListCount ; i++ ) { @@ -115,8 +115,8 @@ void DepWin::Paint( const Rectangle& rRect ) void DepWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) { - ULONG i = 0; - ULONG nListCount = ConList.Count(); + sal_uIntPtr i = 0; + sal_uIntPtr nListCount = ConList.Count(); for ( i=0 ; i < nListCount ; i++ ) { diff --git a/soldep/source/hashobj.cxx b/soldep/source/hashobj.cxx index 7f05dc33870a..944a3801fc59 100644 --- a/soldep/source/hashobj.cxx +++ b/soldep/source/hashobj.cxx @@ -30,7 +30,7 @@ class ObjectWin; -MyHashObject::MyHashObject( ULONG nId, ObjectWin* pWin ) +MyHashObject::MyHashObject( sal_uIntPtr nId, ObjectWin* pWin ) { mnId = nId; mpWin = pWin; diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx index 07eab4dd4cb7..f87101254a96 100644 --- a/soldep/source/objwin.cxx +++ b/soldep/source/objwin.cxx @@ -43,11 +43,11 @@ static Color aDefaultColor = 0L; static Wallpaper* pDefaultWallpaper = 0L; // Initialize static class member -BOOL ObjectWin::msbHideMode = FALSE; -ULONG ObjectWin::msnGlobalViewMask = 0; +sal_Bool ObjectWin::msbHideMode = sal_False; +sal_uIntPtr ObjectWin::msnGlobalViewMask = 0; -UINT32 aColorMap[] = { +sal_uInt32 aColorMap[] = { RGB_COLORDATA( 0xFF, 0xFF, 0x80 ), //MARKMODE_DEFAULT 0 COL_GREEN, //MARKMODE_DEPENDING 1 COL_RED, //MARKMODE_NEEDED 2 @@ -80,12 +80,12 @@ ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle ) mnObjectId( 0 ), mnMarkMode( 0 ), mnViewMask( 0 ), - mbVisible( FALSE ), - mbMenuExecute( FALSE ), - mbVisited( FALSE ), + mbVisible( sal_False ), + mbMenuExecute( sal_False ), + mbVisited( sal_False ), mnRootDist( 0 ), mnHeadDist( 0 ), - mbFixed( FALSE ) + mbFixed( sal_False ) { SetBackground( Wallpaper( aColorMap[0] )); @@ -129,13 +129,13 @@ ObjectWin::~ObjectWin() } } -void ObjectWin::SetHideMode(BOOL bHide) +void ObjectWin::SetHideMode(sal_Bool bHide) { msbHideMode = bHide; mConnections.GetObject(0)->SetHideMode(msbHideMode); } -BOOL ObjectWin::ToggleHideMode() +sal_Bool ObjectWin::ToggleHideMode() { msbHideMode = !msbHideMode; mConnections.GetObject(0)->SetHideMode(msbHideMode); @@ -143,20 +143,20 @@ BOOL ObjectWin::ToggleHideMode() } /*****************************************************************************/ -void ObjectWin::SetViewMask( ULONG nMask ) +void ObjectWin::SetViewMask( sal_uIntPtr nMask ) /*****************************************************************************/ { mnViewMask = nMask; // Compares if ( mnViewMask & msnGlobalViewMask) { - mbVisible = TRUE; + mbVisible = sal_True; Show(); } else { Hide(); - mbVisible = FALSE; + mbVisible = sal_False; } - for ( ULONG i = 0; i < mConnections.Count(); i++ ) + for ( sal_uIntPtr i = 0; i < mConnections.Count(); i++ ) mConnections.GetObject( i )->UpdateVisibility(); } @@ -189,7 +189,7 @@ ByteString& ObjectWin::GetTipText() } /*****************************************************************************/ -Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos ) +Point ObjectWin::GetFixPoint( const Point& rRefPoint, sal_Bool bUseRealPos ) /*****************************************************************************/ { Point aLocalPoint; @@ -201,8 +201,8 @@ Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos ) Size aLocalSize = GetSizePixel(); Point aRetPoint; - USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ; - USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ; + sal_uInt16 nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ; + sal_uInt16 nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ; // always false... //if ( nRefX < 0 ) nRefX = 0; @@ -279,14 +279,14 @@ void ObjectWin::AddConnector( Connector* pNewCon ) } /*****************************************************************************/ -BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin ) +sal_Bool ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin ) /*****************************************************************************/ { - for ( ULONG i = 0; i < mConnections.Count(); i++ ) + for ( sal_uIntPtr i = 0; i < mConnections.Count(); i++ ) if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin ) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } /*****************************************************************************/ @@ -297,10 +297,10 @@ void ObjectWin::RemoveConnector( Connector* pOldCon ) } /*****************************************************************************/ -Connector* ObjectWin::GetConnector( ULONG nIndex ) +Connector* ObjectWin::GetConnector( sal_uIntPtr nIndex ) /*****************************************************************************/ { - ULONG nConCount = mConnections.Count(); + sal_uIntPtr nConCount = mConnections.Count(); if ( nIndex < nConCount ) return mConnections.GetObject( nIndex ); @@ -308,15 +308,15 @@ Connector* ObjectWin::GetConnector( ULONG nIndex ) } /*****************************************************************************/ -Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId ) +Connector* ObjectWin::GetConnector( sal_uIntPtr nStartId, sal_uIntPtr nEndId ) /*****************************************************************************/ { if ( mnObjectId != nStartId ) return NULL; - USHORT i; + sal_uInt16 i; Connector* pCon; - ULONG nConCount = mConnections.Count(); + sal_uIntPtr nConCount = mConnections.Count(); for ( i = 0; i < nConCount; i++ ) { @@ -330,16 +330,16 @@ Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId ) void ObjectWin::SetAllConnectorsUnvisible() { Connector* pCon; - ULONG nConCount = mConnections.Count(); - for ( ULONG i = 0; i < nConCount; i++ ) + sal_uIntPtr nConCount = mConnections.Count(); + for ( sal_uIntPtr i = 0; i < nConCount; i++ ) { pCon = mConnections.GetObject( i ); - if (pCon) pCon->SetVisibility( FALSE ); + if (pCon) pCon->SetVisibility( sal_False ); } } /*****************************************************************************/ -void ObjectWin::SetMarkMode( ULONG nMarkMode ) +void ObjectWin::SetMarkMode( sal_uIntPtr nMarkMode ) /*****************************************************************************/ { //Wallpaper aWallpaper; @@ -367,12 +367,12 @@ void ObjectWin::SetMarkMode( ULONG nMarkMode ) } /*****************************************************************************/ -void ObjectWin::UnsetMarkMode( ULONG nMarkMode ) +void ObjectWin::UnsetMarkMode( sal_uIntPtr nMarkMode ) /*****************************************************************************/ { //Wallpaper aWallpaper; - ULONG nOldMode = mnMarkMode; + sal_uIntPtr nOldMode = mnMarkMode; mnMarkMode &= ( !nMarkMode ); if ( nOldMode != mnMarkMode ) { @@ -398,14 +398,14 @@ void ObjectWin::UnsetMarkMode( ULONG nMarkMode ) } /*****************************************************************************/ -void ObjectWin::MarkNeeded( BOOL bReset ) +void ObjectWin::MarkNeeded( sal_Bool bReset ) /*****************************************************************************/ { Connector* pCon; ObjectWin* pWin; - ULONG nConCount = mConnections.Count(); - ULONG i; + sal_uIntPtr nConCount = mConnections.Count(); + sal_uIntPtr i; for ( i = 0; i < nConCount; i++ ) { @@ -426,7 +426,7 @@ void ObjectWin::MarkNeeded( BOOL bReset ) } /*****************************************************************************/ -void ObjectWin::MarkDepending( BOOL bReset ) +void ObjectWin::MarkDepending( sal_Bool bReset ) /*****************************************************************************/ { //if ( !bReset ) @@ -435,8 +435,8 @@ void ObjectWin::MarkDepending( BOOL bReset ) Connector* pCon; ObjectWin* pWin; - ULONG nConCount = mConnections.Count(); - ULONG i; + sal_uIntPtr nConCount = mConnections.Count(); + sal_uIntPtr i; for ( i = 0; i < nConCount; i++ ) { @@ -559,7 +559,7 @@ void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt ) } else if ( rMEvt.IsRight() ) { - USHORT i; + sal_uInt16 i; while ( mnPopupStaticItems < mpPopup->GetItemCount() ) { @@ -574,7 +574,7 @@ void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt ) mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 )); } } - mbMenuExecute = TRUE; + mbMenuExecute = sal_True; mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel()); } } @@ -585,7 +585,7 @@ void ObjectWin::MouseMove( const MouseEvent& rMEvt ) { if ( IsMouseCaptured() ) { - USHORT i; + sal_uInt16 i; Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset ); @@ -613,28 +613,28 @@ void ObjectWin::MouseMove( const MouseEvent& rMEvt ) } /*****************************************************************************/ -USHORT ObjectWin::Save( SvFileStream& rOutFile ) +sal_uInt16 ObjectWin::Save( SvFileStream& rOutFile ) /*****************************************************************************/ { return 0; } /*****************************************************************************/ -USHORT ObjectWin::Load( SvFileStream& rInFile ) +sal_uInt16 ObjectWin::Load( SvFileStream& rInFile ) /*****************************************************************************/ { return 0; } /*****************************************************************************/ -void ObjectWin::SetId( ULONG nId ) +void ObjectWin::SetId( sal_uIntPtr nId ) /*****************************************************************************/ { mnObjectId = nId; } /*****************************************************************************/ -ULONG ObjectWin::GetId() +sal_uIntPtr ObjectWin::GetId() /*****************************************************************************/ { return mnObjectId; @@ -644,7 +644,7 @@ ULONG ObjectWin::GetId() void ObjectWin::UpdateConnectors() /*****************************************************************************/ { - USHORT i; + sal_uInt16 i; for ( i = 0; i < mConnections.Count(); i++ ) { @@ -654,17 +654,17 @@ void ObjectWin::UpdateConnectors() IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l ) { - USHORT nItemId = mpPopup_l->GetCurItemId(); + sal_uInt16 nItemId = mpPopup_l->GetCurItemId(); switch( nItemId ) { case OBJWIN_EDIT_TEXT : - DBG_ASSERT( FALSE,"edit"); + DBG_ASSERT( sal_False,"edit"); break; case OBJWIN_REMOVE_WIN : // DBG_ASSERT( FALSE,"remove"); // DBG_ASSERT( mpDepperDontuseme,"remove"); - //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId()); + //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( sal_uInt16 ) GetId()); break; case OBJWIN_ADD_CONNECTOR : // DBG_ASSERT( FALSE,"add con"); @@ -676,7 +676,7 @@ IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l ) // TBD: CallEventListener break; default : -// DBG_ASSERT( FALSE, String (nItemId) ); +// DBG_ASSERT( sal_False, String (nItemId) ); Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1); pCon = 0; // delete pCon; @@ -717,24 +717,24 @@ void ObjectWin::LoseFocus() if ( !mbMenuExecute && !msbHideMode ) { UnsetMarkMode( MARKMODE_SELECTED ); UnsetMarkMode( MARKMODE_ACTIVATED ); - MarkNeeded( TRUE ); - MarkDepending( TRUE ); + MarkNeeded( sal_True ); + MarkDepending( sal_True ); } else - mbMenuExecute = FALSE; + mbMenuExecute = sal_False; } /*****************************************************************************/ IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l ) /*****************************************************************************/ { - mbMenuExecute = FALSE; + mbMenuExecute = sal_False; if ( !HasFocus()) { UnsetMarkMode( MARKMODE_SELECTED ); UnsetMarkMode( MARKMODE_ACTIVATED ); - MarkNeeded( TRUE ); - MarkDepending( TRUE ); + MarkNeeded( sal_True ); + MarkDepending( sal_True ); } return 0; @@ -763,9 +763,9 @@ void ObjectList::ResetSelectedObject() { // return; - ULONG nCount_l = Count(); + sal_uIntPtr nCount_l = Count(); ObjectWin* pObjectWin = NULL; - for (ULONG i=0; i < nCount_l; i++ ) + for (sal_uIntPtr i=0; i < nCount_l; i++ ) { pObjectWin = GetObject( i ); pObjectWin->UnsetMarkMode( MARKMODE_SELECTED ); @@ -781,8 +781,8 @@ void ObjectList::ResetSelectedObject() ObjectWin* ObjectList::GetPtrByName( const ByteString& rText ) /*****************************************************************************/ { - ULONG i = 0; - ULONG nCount_l = Count(); + sal_uIntPtr i = 0; + sal_uIntPtr nCount_l = Count(); ObjectWin* pObjectWin = NULL; while ( i < nCount_l ) { @@ -797,7 +797,7 @@ ObjectWin* ObjectList::GetPtrByName( const ByteString& rText ) ObjectList* ObjectList::FindTopLevelModules() { ObjectList* pList = new ObjectList; - for ( USHORT i=0; i<Count(); i++ ) + for ( sal_uInt16 i=0; i<Count(); i++ ) { ObjectWin* pObjectWin = GetObject( i ); if ( pObjectWin->IsTop() ) @@ -807,15 +807,15 @@ ObjectList* ObjectList::FindTopLevelModules() return pList; } -BOOL ObjectWin::IsTop() +sal_Bool ObjectWin::IsTop() { - ULONG nConCount = mConnections.Count(); - for ( ULONG i = 0; i < nConCount; i++ ) + sal_uIntPtr nConCount = mConnections.Count(); + for ( sal_uIntPtr i = 0; i < nConCount; i++ ) { Connector* pCon = mConnections.GetObject( i ); if ( pCon && pCon->IsStart( this) ) - return FALSE; + return sal_False; } - return TRUE; -}
\ No newline at end of file + return sal_True; +} diff --git a/soldep/source/sdtresid.cxx b/soldep/source/sdtresid.cxx index 02977059f5c6..60d550982ba1 100644 --- a/soldep/source/sdtresid.cxx +++ b/soldep/source/sdtresid.cxx @@ -42,7 +42,7 @@ SolDevDll::~SolDevDll() delete pResMgr; } -DtSodResId::DtSodResId( USHORT nId ) : +DtSodResId::DtSodResId( sal_uInt16 nId ) : ResId(nId, *(*(SolDevDll**)GetAppData( SHL_SCH ))->GetResMgr()) { } diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index 3f4a6df3e9b7..2ab3afefd92c 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -42,8 +42,8 @@ #include <soldep/soldlg.hxx> #include "dtsodcmp.hrc" -IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* ); -//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* ); +IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, sal_uIntPtr* ); +//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, sal_uIntPtr* ); #define EVENT_RESIZE 0x00000001 #define MIN(a,b) (a)<(b)?(a):(b) #define MAX(a,b) (a)>(b)?(a):(b) @@ -60,9 +60,9 @@ IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* ); SolDep::SolDep( Window* pBaseWindow ) /*****************************************************************************/ : Depper( pBaseWindow ), - mbBServer(FALSE), + mbBServer(sal_False), mpTravellerList( NULL ), - mbIsHide( FALSE ) + mbIsHide( sal_False ) { mnSolWinCount = 0; mnSolLastId = 0; @@ -100,7 +100,7 @@ void SolDep::Init() ByteString aUpdater( getenv("UPDATER") ); if ( mpStandLst && (aUpdater == "YES") ) { if ( GetVersion() ) - ReadSource( TRUE ); + ReadSource( sal_True ); } else { ReadSource(); // if stand.lst isn't available @@ -112,7 +112,7 @@ void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList ) /*****************************************************************************/ { // Interface for bs - mbBServer=TRUE; + mbBServer=sal_True; if ( pVersionList ) mpStandLst = new GenericInformationList( *pVersionList ); else { @@ -122,7 +122,7 @@ void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList ) } if ( mpStandLst ) { msVersionMajor = ByteString( rVersion ); - ReadSource(TRUE); //call from build server set UPDATER to TRUE + ReadSource(sal_True); //call from build server set UPDATER to TRUE } } @@ -147,7 +147,7 @@ void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent ) //Resize(); if ( isAlive() ) { - ULONG id = _rVclWindowEvent.GetId(); + sal_uIntPtr id = _rVclWindowEvent.GetId(); switch ( id ) { case VCLEVENT_USER_MOUSEBUTTON_DOWN: @@ -170,8 +170,8 @@ void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent ) pWin->LoseFocus(); pWin->SetMarkMode( MARKMODE_SELECTED ); pWin->UnsetMarkMode( MARKMODE_ACTIVATED ); - pWin->MarkNeeded( TRUE ); - pWin->MarkDepending( TRUE ); + pWin->MarkNeeded( sal_True ); + pWin->MarkDepending( sal_True ); } } @@ -229,7 +229,7 @@ void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent ) IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) /*****************************************************************************/ { - USHORT nItemId = pBox->GetCurItemId(); + sal_uInt16 nItemId = pBox->GetCurItemId(); switch ( nItemId ) { case TID_SOLDEP_FIND: @@ -240,7 +240,7 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) VirtualDevice aVDev; aVDev.SetMapMode( MAP_100TH_MM ); GDIMetaFile aMtf; - aVDev.EnableOutput( FALSE ); + aVDev.EnableOutput( sal_False ); aMtf.Record( &aVDev ); aVDev.SetLineColor( Color( COL_BLACK ) ); @@ -252,7 +252,7 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) long nYMax = 0; long nYMin = aSize.Height(); - for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ ) { Point aPoint = mpObjectList->GetObject(i)->GetPosPixel(); Size aSize = mpObjectList->GetObject(i)->GetSizePixel(); @@ -266,7 +266,7 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) aOffset = aVDev.PixelToLogic( aOffset ); GetDepWin()->DrawOutput( &aVDev, aOffset ); - for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ ) if ( mpObjectList->GetObject(i)->IsVisible() ) mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset ); @@ -283,7 +283,7 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) case TID_SOLDEP_HIDE_INDEPENDEND: { ToggleHideDependency(); - for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ ) mpObjectList->GetObject(i)->SetViewMask(!mbIsHide); maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode()); @@ -298,7 +298,7 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) delete mpSolIdMapper; delete mpStarWriter; mpObjectList->ClearAndDelete(); - ReadSource(TRUE); + ReadSource(sal_True); } } break; @@ -325,16 +325,16 @@ void SolDep::ToggleHideDependency() }; /*****************************************************************************/ -BOOL SolDep::GetVersion() +sal_Bool SolDep::GetVersion() /*****************************************************************************/ { SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst ); if ( aVersionDlg.Execute() == RET_OK ) { msVersionMajor = aVersionDlg.GetVersionMajor(); msVersionMinor = aVersionDlg.GetVersionMinor(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } void SolDep::InitContextMenueMainWnd() @@ -361,13 +361,13 @@ void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin ) } /*****************************************************************************/ -ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete ) +ObjectWin *SolDep::RemoveObject( sal_uInt16 nId, sal_Bool bDelete ) /*****************************************************************************/ { Prj* pPrj; //hshtable auf stand halten - ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE ); + ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, sal_False ); if ( pWin ) { ByteString aBodyText( pWin->GetBodyText() ); @@ -379,7 +379,7 @@ ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete ) delete pPrj; } else - DBG_ASSERT( FALSE, "project not found - write" ); + DBG_ASSERT( sal_False, "project not found - write" ); mpSolIdMapper->Delete( aBodyText ); if ( bDelete ) @@ -391,10 +391,10 @@ ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete ) } /*****************************************************************************/ -ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract ) +sal_uIntPtr SolDep::AddObject( ByteString& rBodyText, sal_Bool bInteract ) /*****************************************************************************/ { - ULONG nObjectId; + sal_uIntPtr nObjectId; if ( bInteract ) { nObjectId = HandleNewPrjDialog( rBodyText ); @@ -403,7 +403,7 @@ ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract ) { //hashtable auf stand halten MyHashObject* pHObject; - nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE ); + nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, sal_False ); pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId )); mpSolIdMapper->Insert( rBodyText, pHObject ); } @@ -411,10 +411,10 @@ ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract ) } /*****************************************************************************/ -ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract ) +sal_uIntPtr SolDep::AddPrjObject( ByteString& rBodyText, sal_Bool bInteract ) /*****************************************************************************/ { - ULONG nObjectId; + sal_uIntPtr nObjectId; if ( bInteract ) { nObjectId = HandleNewDirectoryDialog( rBodyText ); @@ -431,7 +431,7 @@ ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract ) } /*****************************************************************************/ -USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) +sal_uInt16 SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) /*****************************************************************************/ { // DBG_ASSERT( FALSE , "not yet" ); @@ -446,13 +446,13 @@ USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) } else { - DBG_ASSERT( FALSE , "non existing Project" ); + DBG_ASSERT( sal_False , "non existing Project" ); return 1; } } /*****************************************************************************/ -USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) +sal_uInt16 SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) /*****************************************************************************/ { SByteStringList* pPrjDeps = NULL; @@ -460,12 +460,12 @@ USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) ByteString sStartName = pStartWin->GetBodyText(); Prj* pPrj = mpStarWriter->GetPrj( sEndName ); - pPrjDeps = pPrj->GetDependencies( FALSE ); + pPrjDeps = pPrj->GetDependencies( sal_False ); if ( pPrjDeps ) { ByteString* pString; - ULONG nPrjDepsCount = pPrjDeps->Count(); - for ( ULONG j = nPrjDepsCount; j > 0; j-- ) + sal_uIntPtr nPrjDepsCount = pPrjDeps->Count(); + for ( sal_uIntPtr j = nPrjDepsCount; j > 0; j-- ) { pString = pPrjDeps->GetObject( j - 1 ); if ( pString->GetToken( 0, '.') == sStartName ) @@ -496,7 +496,7 @@ void SolDep::RemoveAllObjects( ObjectList* pObjLst ) } /*****************************************************************************/ -ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList) +sal_uIntPtr SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList) /*****************************************************************************/ { // DBG_ASSERT( FALSE , "soldep" ); @@ -504,7 +504,7 @@ ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList) if ( !pHObject ) { ByteString sNullPrj = "null";//null_project - ULONG nObjectId = AddObject( sNullPrj, FALSE ); + sal_uIntPtr nObjectId = AddObject( sNullPrj, sal_False ); ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 ); return nObjectId; } @@ -513,7 +513,7 @@ ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList) } /*****************************************************************************/ -ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* ) +sal_uIntPtr SolDep::GetStartPrj(SolIdMapper* , ObjectList* ) /*****************************************************************************/ { // DBG_ASSERT( FALSE , "prjdep" ); @@ -521,7 +521,7 @@ ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* ) if ( !pHObject ) { ByteString bsNull("null"); - ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir + sal_uIntPtr nObjectId = AddPrjObject( bsNull, sal_False); //null_dir return nObjectId; } else @@ -529,7 +529,7 @@ ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* ) } /*****************************************************************************/ -USHORT SolDep::OpenSource() +sal_uInt16 SolDep::OpenSource() /*****************************************************************************/ { if ( mpStandLst ) { @@ -540,13 +540,13 @@ USHORT SolDep::OpenSource() } /*****************************************************************************/ -USHORT SolDep::ReadSource(BOOL bUpdater) +sal_uInt16 SolDep::ReadSource(sal_Bool bUpdater) /*****************************************************************************/ { - mpBaseWin->EnablePaint( FALSE ); + mpBaseWin->EnablePaint( sal_False ); mpBaseWin->Hide(); - ULONG nObjectId, nHashedId; - ULONG i; + sal_uIntPtr nObjectId, nHashedId; + sal_uIntPtr i; MyHashObject* pHObject; ByteString* pStr; ObjectWin *pStartWin, *pEndWin; @@ -554,12 +554,12 @@ USHORT SolDep::ReadSource(BOOL bUpdater) mpSolIdMapper = new SolIdMapper( 63997 ); if (mpStandLst && bUpdater) { - mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE ); + mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, sal_True ); } else { SolarFileList* pSolarFileList; pSolarFileList = GetPrjListFromDir(); - mpStarWriter = new StarWriter( pSolarFileList, TRUE ); + mpStarWriter = new StarWriter( pSolarFileList, sal_True ); } ByteString sTitle( SOLDEPL_NAME ); if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) { @@ -573,22 +573,22 @@ USHORT SolDep::ReadSource(BOOL bUpdater) } SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) ); - ULONG nCount = mpStarWriter->Count(); + sal_uIntPtr nCount = mpStarWriter->Count(); for ( i=0; i<nCount; i++ ) { Prj *pPrj = mpStarWriter->GetObject(i); ByteString sPrjName = pPrj->GetProjectName(); - nObjectId = AddObject( sPrjName, FALSE ); + nObjectId = AddObject( sPrjName, sal_False ); ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 ); } for ( i=0; i<nCount; i++ ) { Prj *pPrj = mpStarWriter->GetObject(i); - SByteStringList *pLst = pPrj->GetDependencies( FALSE ); + SByteStringList *pLst = pPrj->GetDependencies( sal_False ); if ( pLst ) { - ULONG nDepCount = pLst->Count(); - for ( ULONG m=0; m<nDepCount; m++) + sal_uIntPtr nDepCount = pLst->Count(); + for ( sal_uIntPtr m=0; m<nDepCount; m++) { pStr = pLst->GetObject(m); pHObject = mpSolIdMapper->Find( *pStr ); @@ -597,7 +597,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater) // create new prj Prj *pNewPrj = new Prj( *pStr ); ByteString sPrjName = pNewPrj->GetProjectName(); - nObjectId = AddObject( sPrjName, FALSE ); + nObjectId = AddObject( sPrjName, sal_False ); pHObject = mpSolIdMapper->Find( *pStr ); ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 ); }*/ @@ -619,7 +619,7 @@ USHORT SolDep::ReadSource(BOOL bUpdater) if (!IsPrjView()) { AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) ); - GetDepWin()->EnablePaint( TRUE ); + GetDepWin()->EnablePaint( sal_True ); } return 0; } @@ -634,11 +634,11 @@ SolarFileList* SolDep::GetPrjListFromDir() aCurrent.ToAbs(); Dir aDir( aCurrent, FSYS_KIND_DIR ); - USHORT nEntries = aDir.Count(); + sal_uInt16 nEntries = aDir.Count(); if( nEntries ) { UniStringList aSortDirList; - for ( USHORT n = 0; n < nEntries; n++ ) + for ( sal_uInt16 n = 0; n < nEntries; n++ ) { DirEntry& rEntry = aDir[n]; UniString aName( rEntry.GetName() ); @@ -665,11 +665,11 @@ SolarFileList* SolDep::GetPrjListFromDir() } /*****************************************************************************/ -USHORT SolDep::WriteSource() +sal_uInt16 SolDep::WriteSource() /*****************************************************************************/ { /* zur Sicherheit deaktiviert - USHORT nMode = mpStarWriter->GetMode(); + sal_uInt16 nMode = mpStarWriter->GetMode(); if ( nMode == STAR_MODE_SINGLE_PARSE ) { ByteString sFileName = mpStarWriter->GetName(); if ( sFileName.Len()) { @@ -696,32 +696,32 @@ USHORT SolDep::WriteSource() return 1; } -USHORT SolDep::Load( const ByteString& rFileName ) +sal_uInt16 SolDep::Load( const ByteString& rFileName ) { // moved from depper class - DBG_ASSERT( FALSE , "you are dead!" ); + DBG_ASSERT( sal_False , "you are dead!" ); SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ ); depper_head dh; - ULONG i; - ULONG nLoadOffs = mnSolLastId; //or Prj?? + sal_uIntPtr i; + sal_uIntPtr nLoadOffs = mnSolLastId; //or Prj?? ObjectWin* pNewWin; aInFile.Read( &dh, sizeof( dh )); - ULONG nObjCount = dh.nObjectCount; - ULONG nCnctrCount = dh.nCnctrCount; + sal_uIntPtr nObjCount = dh.nObjectCount; + sal_uIntPtr 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 = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), sal_False )); pNewWin->SetId( nLoadOffs + pWin->GetId()); pNewWin->SetPosPixel( pWin->GetPosPixel()); pNewWin->SetSizePixel( pWin->GetSizePixel()); } - ULONG nStartId; - ULONG nEndId; + sal_uIntPtr nStartId; + sal_uIntPtr nEndId; // ueber addconnector fuehren! for ( i=0; i < nCnctrCount ; i++ ) { @@ -742,13 +742,13 @@ USHORT SolDep::Load( const ByteString& rFileName ) } /*****************************************************************************/ -BOOL SolDep::ViewContent( ByteString& rObjectName ) +sal_Bool SolDep::ViewContent( ByteString& rObjectName ) /*****************************************************************************/ { mpFocusWin = NULL; - SetPrjViewStatus(TRUE); + SetPrjViewStatus(sal_True); - for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ ) + for ( sal_uIntPtr i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ ) if ( mpObjectList->GetObject( i )->HasFocus()) mpFocusWin = mpObjectList->GetObject( i ); //HideObjectsAndConnections( mpObjectList ); @@ -758,11 +758,11 @@ BOOL SolDep::ViewContent( ByteString& rObjectName ) } /*****************************************************************************/ -BOOL SolDep::InitPrj( ByteString& rListName ) +sal_Bool SolDep::InitPrj( ByteString& rListName ) /*****************************************************************************/ { - ULONG nObjectId, nHashedId; - ULONG i, j; + sal_uIntPtr nObjectId, nHashedId; + sal_uIntPtr i, j; MyHashObject* pHObject; ByteString *pDepName; ByteString *pFlagName; @@ -782,14 +782,14 @@ BOOL SolDep::InitPrj( ByteString& rListName ) mnPrjWinCount = 0; mnPrjLastId = 0; - ULONG nCount = mpStarWriter->Count(); - GetDepWin()->EnablePaint( FALSE ); + sal_uIntPtr nCount = mpStarWriter->Count(); + GetDepWin()->EnablePaint( sal_False ); Point aPnt = GetGraphWin()->GetPosPixel(); Size aSize = GetGraphWin()->GetSizePixel(); GetGraphWin()->SetPosSizePixel( aPnt, aSize ); // Hier wird das Window gesetzt - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; for ( i=0; i<nCount; i++ ) { @@ -799,10 +799,10 @@ BOOL SolDep::InitPrj( ByteString& rListName ) ByteString sPrjName = pPrj->GetProjectName(); if ( sPrjName == rListName ) { - bReturn = TRUE; + bReturn = sal_True; mpPrj = mpStarWriter->GetObject(i); - ULONG nDirCount = mpPrj->Count(); + sal_uIntPtr nDirCount = mpPrj->Count(); for ( j=0; j<nDirCount; j++ ) { CommandData *pData = mpPrj->GetObject(j); @@ -813,7 +813,7 @@ BOOL SolDep::InitPrj( ByteString& rListName ) if ( pData->GetLogFile() != "" ) { ByteString sItem = pData->GetLogFile(); - nObjectId = AddPrjObject( sItem, FALSE); + nObjectId = AddPrjObject( sItem, sal_False); // there may be faster ways...... ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); pWin->SetViewMask( 0x0001 ); @@ -840,8 +840,8 @@ BOOL SolDep::InitPrj( ByteString& rListName ) nObjectId = pHObject->GetId(); - ULONG nDepCount = pDeps->Count(); - for ( ULONG k=0; k<nDepCount; k++ ) + sal_uIntPtr nDepCount = pDeps->Count(); + for ( sal_uIntPtr k=0; k<nDepCount; k++ ) { pDepName = pDeps->GetObject(k); pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.')); @@ -872,10 +872,10 @@ BOOL SolDep::InitPrj( ByteString& rListName ) } } ByteString sNullDir = "null"; - nObjectId = AddPrjObject( sNullDir, FALSE); + nObjectId = AddPrjObject( sNullDir, sal_False); ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); pWin->SetViewMask( 0x0001 ); - mpGraphPrjWin->EnablePaint( TRUE ); + mpGraphPrjWin->EnablePaint( sal_True ); //debug // int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList); // ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l ); @@ -888,7 +888,7 @@ BOOL SolDep::InitPrj( ByteString& rListName ) } /*****************************************************************************/ -USHORT SolDep::CloseWindow() +sal_uInt16 SolDep::CloseWindow() /*****************************************************************************/ { @@ -918,12 +918,12 @@ void SolDep::ShowHelp() SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP )); aHelpDlg.maMLEHelp.SetText( aHelpText ); aHelpDlg.maMLEHelp.SetReadOnly(); - aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE ); + aHelpDlg.maMLEHelp.EnableFocusSelectionHide( sal_True ); aHelpDlg.Execute(); } /*****************************************************************************/ -BOOL SolDep::FindProject() +sal_Bool SolDep::FindProject() /*****************************************************************************/ { SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() ); @@ -949,18 +949,18 @@ BOOL SolDep::FindProject() else { mpObjectList->ResetSelectedObject(); - for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + for ( sal_uInt16 i=0; i<mpObjectList->Count(); i++ ) { ObjectWin* pObjectWin = mpObjectList->GetObject( i ); if ( !pObjectWin->IsTop() ) - pObjectWin->SetViewMask(FALSE); + pObjectWin->SetViewMask(sal_False); } } } - return FALSE; + return sal_False; } -BOOL SolDep::MarkObjects( ObjectWin* pObjectWin ) +sal_Bool SolDep::MarkObjects( ObjectWin* pObjectWin ) { if (pObjectWin) { @@ -978,7 +978,7 @@ BOOL SolDep::MarkObjects( ObjectWin* pObjectWin ) fprintf(stdout,"null\n"); } } - return TRUE; + return sal_True; } void SolDep::Resize() @@ -987,11 +987,11 @@ void SolDep::Resize() Point aOutPos = Point( 0, 0 ); Size aOutSize = mpProcessWin->GetOutputSizePixel(); // calculate output size - ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height(); - ULONG nTaskWidth = maToolBox.CalcWindowSizePixel().Width(); + sal_uIntPtr nTaskHeight = maToolBox.CalcWindowSizePixel().Height(); + sal_uIntPtr nTaskWidth = maToolBox.CalcWindowSizePixel().Width(); Size aSize( aOutSize.Width(), nTaskHeight ); -// ULONG nMenuHeight = 0; +// sal_uIntPtr nMenuHeight = 0; Point aGraphWinPos = Point(0,0); Size aGraphWinSize = Size(0,0); @@ -1076,7 +1076,7 @@ void SolDep::Resize() */ maToolBox.SetDockingRects( rout, rin ); - BOOL bFloating = maToolBox.IsFloatingMode(); + sal_Bool bFloating = maToolBox.IsFloatingMode(); if ( bFloating ) { @@ -1090,7 +1090,7 @@ void SolDep::Resize() if (maToolBox.IsVisible()) maToolBox.Show(); } -USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) +sal_uInt16 SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) { // DBG_ASSERT( FALSE , "not yet" ); ByteString sEndName = pEndWin->GetBodyText(); @@ -1112,7 +1112,7 @@ USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) return AddConnectorToObjects( pStartWin, pEndWin ); } -USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) +sal_uInt16 SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) { ByteString sEndName = pEndWin->GetBodyText(); ByteString sStartName = pStartWin->GetBodyText(); @@ -1121,8 +1121,8 @@ USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin if ( pDeps ) { ByteString* pString; - ULONG nDepsCount = pDeps->Count(); - for ( ULONG j = nDepsCount; j > 0; j-- ) + sal_uIntPtr nDepsCount = pDeps->Count(); + for ( sal_uIntPtr j = nDepsCount; j > 0; j-- ) { pString = pDeps->GetObject( j - 1 ); if ( pString->GetToken( 0, '.') == sStartName ) @@ -1132,7 +1132,7 @@ USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin return RemoveConnectorFromObjects( pStartWin, pEndWin ); } -USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ) +sal_uInt16 SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr aObjID ) { AutoArrangeDlgStart(); OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID ); @@ -1140,30 +1140,30 @@ USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG n return 0; } -Point SolDep::CalcPos( USHORT nSet, USHORT nIndex ) +Point SolDep::CalcPos( sal_uInt16 nSet, sal_uInt16 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 ); + sal_uIntPtr 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; + sal_uIntPtr nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING; Point aPos( nPosX, nPosY ); return aPos; } -ULONG SolDep::CalcXOffset( ULONG nObjectsToFit ) +sal_uIntPtr SolDep::CalcXOffset( sal_uIntPtr nObjectsToFit ) { long nDynXOffs; long nXMiddle; - ULONG nTrigger; + sal_uIntPtr 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; + sal_uIntPtr nXOffs = nXMiddle - nDynXOffs; - if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs ) + if ( sal_uIntPtr(nXMiddle - nDynXOffs) < mnMinDynXOffs ) mnMinDynXOffs = nXMiddle - nDynXOffs; return nXOffs; @@ -1174,11 +1174,11 @@ double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType ) { ObjectWin* pWin; Connector* pCon; - ULONG nObjCount = pObjList->Count(); + sal_uIntPtr nObjCount = pObjList->Count(); double dRetVal = 0; double dWinVal; - USHORT i, j; - BOOL bIsStart; + sal_uInt16 i, j; + sal_Bool bIsStart; for ( i = 0; i < nObjCount; i++ ) { @@ -1197,7 +1197,7 @@ double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType ) { if ( bIsStart ) { - pCon->UpdatePosition( pWin, FALSE ); + pCon->UpdatePosition( pWin, sal_False ); dWinVal += pCon->GetLen() * pWin->mnHeadDist; } } @@ -1205,14 +1205,14 @@ double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType ) { if ( !bIsStart ) { - pCon->UpdatePosition( pWin, FALSE ); + pCon->UpdatePosition( pWin, sal_False ); dWinVal += pCon->GetLen() * pWin->mnRootDist; } } else { - pCon->UpdatePosition( pWin, FALSE ); + pCon->UpdatePosition( pWin, sal_False ); if ( !bIsStart ) dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 ); else @@ -1230,17 +1230,17 @@ double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType ) return dRetVal; } -USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth ) +sal_uInt16 SolDep::Impl_Traveller( ObjectWin* pWin, sal_uInt16 nDepth ) { - USHORT i = 0; + sal_uInt16 i = 0; ObjectWin* pNewWin; Connector* pCon; nDepth++; - USHORT nMaxDepth = nDepth; + sal_uInt16 nMaxDepth = nDepth; - pWin->mbVisited = TRUE; + pWin->mbVisited = sal_True; pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist ); if ( nDepth > DEPPER_MAX_DEPTH ) { @@ -1268,31 +1268,31 @@ USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth ) } -double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType ) +double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, sal_uIntPtr nStart, sal_uIntPtr nSize, DistType eDistType ) { - ULONG i, j, l; - ULONG nEnd = nStart + nSize; + sal_uIntPtr i, j, l; + sal_uIntPtr nEnd = nStart + nSize; ObjectWin* pSwapWin; - ULONG nLevelObjCount = rObjList.Count(); + sal_uIntPtr nLevelObjCount = rObjList.Count(); //dont use full recusion for more than 6 objects if ( nLevelObjCount > 6 ) { srand(( unsigned ) time( NULL )); - ULONG nIdx1, nIdx2; + sal_uIntPtr nIdx1, nIdx2; for ( i = 0; i < 101; i++ ) { UpdateSubProgrssBar(i); for ( j = 0; j < 100; j++ ) { - nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + nIdx1 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount ); while ( rObjList.GetObject( nIdx1 ) == NULL ) - nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); - nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + nIdx1 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + nIdx2 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount ); while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount ) - nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + nIdx2 = (sal_uIntPtr) ( double( rand() ) / RAND_MAX * nLevelObjCount ); pSwapWin = rObjList.GetObject( nIdx1 ); if ( pSwapWin ) @@ -1374,15 +1374,15 @@ double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinLi } -USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ) +sal_uInt16 SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, sal_uIntPtr nTopId, sal_uIntPtr nBottmId, sal_uIntPtr 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 ]; + sal_uInt16 nRootDist = (sal_uInt16) -1; + sal_uInt16 i, j, k, l, nRetVal; + sal_uInt16 LevelUse[ DEPPER_MAX_DEPTH ]; + sal_uInt16 LevelSecUse[ DEPPER_MAX_DEPTH ]; ObjWinList* LevelList[ DEPPER_MAX_DEPTH ]; ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ]; Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ]; @@ -1397,22 +1397,22 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT LevelSecList[ i ] = NULL; } - GetDepWin()->EnablePaint( FALSE ); + GetDepWin()->EnablePaint( sal_False ); - ULONG nObjCount = pObjLst->Count(); + sal_uIntPtr nObjCount = pObjLst->Count(); for ( i = 0; i < nObjCount; i++ ) { pWin = pObjLst->GetObject( i ); if ( pWin->IsVisible()) { - pWin->mbVisited = FALSE; + pWin->mbVisited = sal_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; + sal_uInt16 nStartCount = 0; + sal_uInt16 nEndCount = 0; while ( (pCon = pWin->GetConnector( j )) ) { if ( pCon->IsVisible()) { //null_project @@ -1452,8 +1452,8 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT return nRetVal; } - ULONG nUnvisited = 0; - ULONG nUnvisYOffs = 0; + sal_uIntPtr nUnvisited = 0; + sal_uIntPtr nUnvisYOffs = 0; // seperate mainstream, secondary and unconnected for ( i = 0; i < nObjCount; i++ ) @@ -1492,7 +1492,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT mnLevelOffset = 0; - USHORT nScaleVal; + sal_uInt16 nScaleVal; if ( nRetVal == 0 ) nScaleVal = 1; @@ -1501,14 +1501,14 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT i = 0; - USHORT nStep = 0; + sal_uInt16 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(); + sal_uIntPtr nLevelObjCount = LevelList[ i ]->Count(); if ( nLevelObjCount % 2 == 0 ) { @@ -1555,7 +1555,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT if ( LevelSecList[ i ] != NULL ) { - ULONG nLevelSecObjCount = LevelSecList[ i ]->Count(); + sal_uIntPtr nLevelSecObjCount = LevelSecList[ i ]->Count(); // expand list for better positioning while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 ) { @@ -1579,19 +1579,19 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT aWorkList.Clear(); l = 0; - BOOL bUsedPos; + sal_Bool bUsedPos; // find free positions for secondary objects for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ ) { Point aPos = CalcPos( i, j ); - bUsedPos = FALSE; + bUsedPos = sal_False; // is already occupied? for ( k = 0; k < nLevelObjCount; k++ ) { if ( LevelList[ i ]->GetObject( k ) ) if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() ) - bUsedPos = TRUE; + bUsedPos = sal_True; } // if its free, add to pool if ( !bUsedPos ) @@ -1636,11 +1636,11 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT do { i--; - UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down + UpdateMainProgressBar(i, nScaleVal, nStep, sal_True); // sal_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(); + sal_uIntPtr nLevelObjCount = LevelList[ i ]->Count(); mnXOffset = CalcXOffset( nLevelObjCount ); aWorkList.Clear(); @@ -1669,23 +1669,23 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT if ( LevelSecList[ i ] != NULL ) { - ULONG nLevelSecObjCount = LevelSecList[ i ]->Count(); + sal_uIntPtr nLevelSecObjCount = LevelSecList[ i ]->Count(); mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount ); aWorkList.Clear(); l = 0; - BOOL bUsedPos; + sal_Bool bUsedPos; for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ ) { Point aPos = CalcPos( i, j ); - bUsedPos = FALSE; + bUsedPos = sal_False; // could be faster for ( k = 0; k < nLevelObjCount; k++ ) { if ( LevelList[ i ]->GetObject( k ) ) if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() ) - bUsedPos = TRUE; + bUsedPos = sal_True; } if ( !bUsedPos ) { @@ -1716,18 +1716,18 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT } while ( i != 0 ); SetMainProgressBar( 100 ); - ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() ); + sal_uIntPtr nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() ); - // ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier mu man switchen GetStart/GetPrjStart oder so + // sal_uIntPtr 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; + sal_uIntPtr 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 aTmpSize( (sal_uIntPtr) (double(nNewXSize) * double( aMapMode.GetScaleX())), (sal_uIntPtr) (double( nNewYSize) * double( aMapMode.GetScaleY()))); Size aNowSize( GetGraphWin()->GetSizePixel()); @@ -1745,7 +1745,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT // } // now remap all objects - ULONG nAllObjCount = pObjLst->Count(); + sal_uIntPtr nAllObjCount = pObjLst->Count(); Point aTmpPos; for ( j = 0; j < nAllObjCount; j++ ) { @@ -1765,7 +1765,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT } } aWorkList.Clear(); - GetDepWin()->EnablePaint( TRUE ); + GetDepWin()->EnablePaint( sal_True ); GetDepWin()->Invalidate(); //LevelListen loeschen H? Welche Levellisten? @@ -1797,7 +1797,7 @@ void SolDep::WriteToErrorFile() FILE* pErrFile = fopen( "depper.err", "w+" ); if ( pErrFile ) { - for ( USHORT i = 0; i < mpTravellerList->Count(); i++ ) + for ( sal_uInt16 i = 0; i < mpTravellerList->Count(); i++ ) { pWin = mpTravellerList->GetObject( i ); fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer()); diff --git a/soldep/source/soldlg.cxx b/soldep/source/soldlg.cxx index 96ad469f8284..a561f5ae6f03 100644 --- a/soldep/source/soldlg.cxx +++ b/soldep/source/soldlg.cxx @@ -165,7 +165,7 @@ SolSelectVersionDlg::SolSelectVersionDlg( { FreeResource(); //Fill the ListBox with MWS versions (e.g. SRC680) from "stand.lst" - for ( ULONG i = 0; i < pStandLst->Count(); i++ ) { + for ( sal_uIntPtr i = 0; i < pStandLst->Count(); i++ ) { String sVersion( *pStandLst->GetObject( i ), RTL_TEXTENCODING_ASCII_US ); maVersionListBox.InsertEntry( sVersion ); } @@ -252,9 +252,9 @@ SolFindProjectDlg::SolFindProjectDlg( Window *pParent, ObjWinList* pObjList ) maCombobox.SetDropDownLineCount(15); // SolDep* pSolDep = ((MyApp*)GetpApp())->GetSolDep(); // ObjWinList* pObjList = pSolDep->GetObjectList(); - ULONG n = pObjList->Count(); + sal_uIntPtr n = pObjList->Count(); //Fill combobox - for (ULONG i=0; i<n; i++) { + for (sal_uIntPtr i=0; i<n; i++) { ByteString prjname = pObjList->GetObject( i )->GetBodyText(); if (prjname != ByteString("null")) //null_project maCombobox.InsertEntry( String(prjname,RTL_TEXTENCODING_UTF8) ); @@ -264,4 +264,4 @@ SolFindProjectDlg::SolFindProjectDlg( Window *pParent, ObjWinList* pObjList ) ByteString SolFindProjectDlg::GetProject() { return ByteString(maCombobox.GetText(),RTL_TEXTENCODING_UTF8); -}
\ No newline at end of file +} diff --git a/soldep/source/tbox.cxx b/soldep/source/tbox.cxx index 327941167808..4eec7dbb883c 100644 --- a/soldep/source/tbox.cxx +++ b/soldep/source/tbox.cxx @@ -34,16 +34,16 @@ -SoldepToolBox::SoldepToolBox( Window* pParent, const ResId& aId, BOOL bDAble ) : +SoldepToolBox::SoldepToolBox( Window* pParent, const ResId& aId, sal_Bool bDAble ) : ToolBox( pParent, aId ), bDockable( bDAble ), - bCloseMode( FALSE ), - bBoxIsVisible( TRUE ), - bPinable( TRUE ), + bCloseMode( sal_False ), + bBoxIsVisible( sal_True ), + bPinable( sal_True ), aPinedBitmap( DtSodResId( TID_SMALL_PIN_PINED )), // BMP_SMALL_PIN_PINED aUnpinedBitmap( DtSodResId( TID_SMALL_PIN_UNPINED )) // BMP_SMALL_PIN_UNPINED { - bPinable = TRUE; + bPinable = sal_True; SetAlign( WINDOWALIGN_TOP ); HideItem(TID_SOLDEP_BACK); //Inital hide this item, activated in project view. @@ -53,7 +53,7 @@ SoldepToolBox::SoldepToolBox( Window* pParent, const ResId& aId, BOOL bDAble ) : //SetMouseDownHdl(LINK(this,SoldepToolBox,MouseDownHdl)); //SetFloatingLines( nFloatingLines ); //SetFloatingMode( bFloatingMode ); - BOOL bFloatingMode = FALSE; + sal_Bool bFloatingMode = sal_False; if ( bFloatingMode ) { //Point aPos( sToolBoxInfo.GetToken( 4, ',' ).ToInt64(), sToolBoxInfo.GetToken( 5, ',' ).ToInt64()); @@ -64,11 +64,11 @@ SoldepToolBox::SoldepToolBox( Window* pParent, const ResId& aId, BOOL bDAble ) : // (ein Separator an 1er Pos wird // nicht gezeichnet, // schafft aber Platz.) - bBoxIsVisible = FALSE; + bBoxIsVisible = sal_False; // if ( sToolBoxInfo.GetToken( 3, ',' ) == "Visible" ) { - for ( USHORT i = 0; i < GetItemCount() && !bBoxIsVisible; i++ ) + for ( sal_uInt16 i = 0; i < GetItemCount() && !bBoxIsVisible; i++ ) { -// USHORT nItemId = GetItemId( i ); +// sal_uInt16 nItemId = GetItemId( i ); switch ( GetItemType( i )) { @@ -77,7 +77,7 @@ SoldepToolBox::SoldepToolBox( Window* pParent, const ResId& aId, BOOL bDAble ) : case TOOLBOXITEM_SEPARATOR : break; default: - bBoxIsVisible = TRUE; + bBoxIsVisible = sal_True; break; } } @@ -115,12 +115,12 @@ void SoldepToolBox::Paint( const Rectangle& rRect ) if ( bDockable ) { - USHORT nItemId = GetItemId( 0 ); + sal_uInt16 nItemId = GetItemId( 0 ); // ... zeichnen wir den wunderbaren Abreiddel ber das erste Item (Seperator) if ( !IsFloatingMode() && ( mnCurLine == 1 )) { - BOOL bIsCloseable = (( mnWinStyle & WB_CLOSEABLE ) != 0 ); + sal_Bool bIsCloseable = (( mnWinStyle & WB_CLOSEABLE ) != 0 ); ShowItem( nItemId ); Rectangle aRect = GetItemRect( nItemId ); @@ -236,7 +236,7 @@ void SoldepToolBox::MouseButtonDown(const MouseEvent& rEvent) Invalidate(); } else { - bCloseMode = TRUE; + bCloseMode = sal_True; // ... und zeichnen ggf. den Button gedrckt. @@ -274,7 +274,7 @@ void SoldepToolBox::MouseButtonUp(const MouseEvent& rEvent) if ( bCloseMode ) { - bCloseMode = FALSE; + bCloseMode = sal_False; // ... so zeichen wir diesen wieder normal ... @@ -338,7 +338,7 @@ void SoldepToolBox::MouseMove(const MouseEvent& rEvent) DrawLine( Point( aRect.Left(), aRect.Bottom()), Point( aRect.Right(), aRect.Bottom())); DrawLine( Point( aRect.Right(), aRect.Bottom()), Point( aRect.Right(), aRect.Top())); - bCloseMode = FALSE; + bCloseMode = sal_False; } else { @@ -360,7 +360,7 @@ void SoldepToolBox::ToggleFloatingMode() } /*****************************************************************************/ -void SoldepToolBox::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) +void SoldepToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) /*****************************************************************************/ { ToolBox::EndDocking( rRect, bFloatMode ); @@ -373,12 +373,12 @@ void SoldepToolBox::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) }; /*****************************************************************************/ -BOOL SoldepToolBox::Close() +sal_Bool SoldepToolBox::Close() /*****************************************************************************/ { - if (!ToolBox::Close()) return FALSE; + if (!ToolBox::Close()) return sal_False; - return TRUE; + return sal_True; } /*****************************************************************************/ @@ -396,7 +396,7 @@ void SoldepToolBox::Move() void SoldepToolBox::CloseDockingMode() { Hide(); - bBoxIsVisible = FALSE; + bBoxIsVisible = sal_False; CallEventListeners( VCLEVENT_USER_TBOX_RESIZE_APP, this); } @@ -430,10 +430,10 @@ void SoldepToolBox::Command( const CommandEvent& rCEvt) switch( GetAlign()) { - case WINDOWALIGN_TOP : aPopupMenu.EnableItem( 1, FALSE ); break; - case WINDOWALIGN_BOTTOM : aPopupMenu.EnableItem( 2, FALSE ); break; - case WINDOWALIGN_LEFT : aPopupMenu.EnableItem( 3, FALSE ); break; - case WINDOWALIGN_RIGHT : aPopupMenu.EnableItem( 4, FALSE ); break; + case WINDOWALIGN_TOP : aPopupMenu.EnableItem( 1, sal_False ); break; + case WINDOWALIGN_BOTTOM : aPopupMenu.EnableItem( 2, sal_False ); break; + case WINDOWALIGN_LEFT : aPopupMenu.EnableItem( 3, sal_False ); break; + case WINDOWALIGN_RIGHT : aPopupMenu.EnableItem( 4, sal_False ); break; } if (( mnWinStyle & WB_CLOSEABLE ) != 0 ) @@ -478,15 +478,15 @@ PopupMenu *SoldepToolBox::GetContextMenu() void SoldepToolBox::InitContextMenu() { - USHORT nStart = 0; + sal_uInt16 nStart = 0; if ( bDockable ) nStart = 1; aMenu.Clear(); - for ( USHORT i = nStart; i < GetItemCount(); i++ ) + for ( sal_uInt16 i = nStart; i < GetItemCount(); i++ ) { - USHORT nItemId = GetItemId( i ); + sal_uInt16 nItemId = GetItemId( i ); switch ( GetItemType( i )) { @@ -498,8 +498,8 @@ void SoldepToolBox::InitContextMenu() break; default: aMenu.InsertItem( nItemId, GetItemText( nItemId ), GetItemImage( nItemId )); - if (IsItemChecked( nItemId )) aMenu.CheckItem( nItemId, TRUE ); - if (!IsItemEnabled( nItemId )) aMenu.EnableItem( nItemId, FALSE ); + if (IsItemChecked( nItemId )) aMenu.CheckItem( nItemId, sal_True ); + if (!IsItemEnabled( nItemId )) aMenu.EnableItem( nItemId, sal_False ); if (!IsItemVisible( nItemId )) aMenu.HideItem(nItemId); break; } @@ -554,7 +554,7 @@ void SoldepToolBox::StartDocking() CallEventListeners( VCLEVENT_USER_TBOX_RESIZE_APP, this); }; -BOOL SoldepToolBox::GetPin() +sal_Bool SoldepToolBox::GetPin() { return bPin; @@ -565,7 +565,7 @@ void SoldepToolBox::TogglePin() bPin = !bPin; } -void SoldepToolBox::SetPin( BOOL bP ) +void SoldepToolBox::SetPin( sal_Bool bP ) { bPin = bP; } @@ -579,13 +579,13 @@ void SoldepToolBox::SetPin( BOOL bP ) IMPL_LINK ( SoldepToolBox, MenuSelectHdl, Menu*, pMenu ) { // Wenn die CurItemId <= 6 ist, dann wurde das Abreiddel-Context-Men ausgefhrt ... - ULONG itemid; + sal_uIntPtr itemid; itemid = pMenu->GetCurItemId(); if ( pMenu == &aMenu ) { // ... Andernfalls wurde das Default-Context-Men ausgefhrt ... - USHORT nTmpId = mnCurItemId; + sal_uInt16 nTmpId = mnCurItemId; mnCurItemId = pMenu->GetCurItemId(); // ... und der gesetzte Handler (in soldep.cxx) wird gerufen. @@ -593,4 +593,4 @@ IMPL_LINK ( SoldepToolBox, MenuSelectHdl, Menu*, pMenu ) mnCurItemId = nTmpId; } return 0; -}
\ No newline at end of file +} diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 05fa12f06070..d678f05052e7 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -59,6 +59,18 @@ sub action($$$) 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE <filepath>*'; $type = shift @ARGV; $loc = shift @ARGV; +if ($type eq "SharedLibrary") +{ + $type = "shl"; +} +if ($type eq "Executable") +{ + $type = "app" +} +if ($type eq "Library") +{ + $type = "shl" +} if ($type eq "extshl") { $type = "shl"; diff --git a/solenv/bin/packmodule b/solenv/bin/packmodule index dd1ac0439308..d3ae30d48dcd 100755 --- a/solenv/bin/packmodule +++ b/solenv/bin/packmodule @@ -29,7 +29,12 @@ import os, os.path, sys, zipfile def paths_to_pack(loglines): """Returns a generator iterating the outdir fields (with platform) of gb_deliver.log lines.""" - return (line.split()[2] for line in loglines) + lines=[] + for line in loglines: + fields = line.split() + if len(fields) >= 3: + lines.append(fields[2]) + return lines def stripped_paths_to_pack(loglines): """returns a generator iterating the outdir fields (stripped of the platform) of gb_deliver.log lines.""" diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests index 8b52f45a6b12..ae9b61922bd8 100755 --- a/solenv/bin/subsequenttests +++ b/solenv/bin/subsequenttests @@ -69,6 +69,7 @@ while (@ARGV) { my @testpaths = (); my $sc = SourceConfig->new($ENV{'SOLARSRC'}); my $module; +my $gbuildpath = "$ENV{'SOLARSRC'}/GNUmakefile"; foreach $module ($sc->get_active_modules()) { my $buildlst = $sc->get_module_build_list($module); next unless defined($buildlst); @@ -106,9 +107,22 @@ if ($dry_run) { foreach $path (@testpaths) { print "$path\n"; } + print "$gbuildpath\n"; exit(0); } +my @failedpaths = (); +my @gbuildargs = ("-j$max_running", "-s"); +if ($keep_going) { + push(@gbuildargs,"-k"); +} +push(@gbuildargs, "--file=$gbuildpath"); +push(@gbuildargs, "subsequentcheck"); +if (system($ENV{'GNUMAKE'}, @gbuildargs) != 0) { + push(@failedpaths,$gbuildpath); + @testpaths = () unless $keep_going; +} + my $cmd = 'dmake'; foreach (@ARGV) { s/'/'\''/g; @@ -117,7 +131,6 @@ foreach (@ARGV) { $cmd .= ' 2>&1 |'; my %pids = (); -my @failedpaths = (); my $running = 0; my $counter = 0; while (@testpaths || $running > 0) { diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl index 87dcb21deb53..b1adb03626dd 100644 --- a/solenv/bin/transform_description.pl +++ b/solenv/bin/transform_description.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl #************************************************************************* -#* +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -24,7 +24,7 @@ # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # -#************************************************************************/ +#************************************************************************* parse_args(); execute_args(); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 52300e9bd207..5a2454d6444c 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -25,7 +25,6 @@ common ENABLE_RANDR TRUE ENABLE_REPORTBUILDER YES ENABLE_SVCTAGS YES - ENABLE_VBA YES ISERVER iserver.germany.sun.com LU_HGFLAG "" LU_NOSOURCE "" @@ -611,6 +610,7 @@ unxlngi6 ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE GNUCOPY cp + GNUMAKE make } common0 { @@ -896,6 +896,7 @@ unxlngx6 ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE + GNUMAKE make } common0 { @@ -1179,6 +1180,7 @@ unxmacxi SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl GNUCOPY gnucp + GNUMAKE make } common0 { @@ -1451,6 +1453,7 @@ unxsoli4 ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE GNUCOPY gnucp + GNUMAKE gmake } common0 { @@ -1715,6 +1718,7 @@ unxsols4 ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE GNUCOPY gnucp + GNUMAKE gmake } common0 { @@ -1994,6 +1998,7 @@ unxsolu4 __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% ENABLE_GCONF TRUE # ENABLE_GNOMEVFS TRUE + GNUMAKE gmake } common0 { @@ -2232,6 +2237,7 @@ wntgcci1 SOLAR_JAVA TRUE XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl + GNUMAKE make } common0 { @@ -2772,6 +2778,7 @@ wntmsci12 BUILD_X64 TRUE CHECK_LUCENCE_INDEXER_OUTPUT TRUE GNUCOPY cp + GNUMAKE make } common0 { @@ -3115,6 +3122,7 @@ wntmsci13 ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl BUILD_X64 TRUE GNUCOPY cp + GNUMAKE make } common0 { diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index ac84aee99684..f30fb227fea6 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -98,7 +98,6 @@ common ENABLE_REPORTBUILDER ENABLE_REPORTDESIGN ENABLE_SVCTAGS - ENABLE_VBA FORCE2ARCHIVE PA_VER ENABLE_NAS @@ -291,7 +290,6 @@ common URE_BOOTSTRAP USE_FT_EMBOLDEN USE_XINERAMA - VBA_EXTENSION XINERAMA_LINK } restore diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index b937ac7a35b5..3bf50bd4e988 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -43,14 +43,14 @@ $(call gb_Helper_abbreviate_dirs_native,\ -p $(firstword $(subst /, ,$(2))) \ -i $(3) \ -o $(1) \ - -m $(4) \ + -m $(SDF) \ -l all) endef define gb_SrsPartMergeTarget__rules $$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET) $$(gb_SrsPartMergeTarget_TRANSEXAUXDEPS) - $$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<,$$(SDF)) + $$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@) endef @@ -67,13 +67,13 @@ gb_SrsPartTarget_REPOS := $(gb_REPOS) define gb_SrsPartTarget__command $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \ + RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "-s \ - $(4) \ + $(INCLUDE) \ -I$(dir $(3)) \ - $(5) \ + $(DEFS) \ -fp=$(1) \ - $(6)" > $${RESPONSEFILE} && \ + $(if $<,$<,$(MERGEDFILE))" > $${RESPONSEFILE} && \ $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \ rm -rf $${RESPONSEFILE}) @@ -81,8 +81,8 @@ endef define gb_SrsPartTarget__rules $$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET) - $$(call gb_SrsPartTarget__command_dep,$$*,$$<,$$(INCLUDE),$$(DEFS)) - $$(call gb_SrsPartTarget__command,$$@,$$*,$$<,$$(INCLUDE),$$(DEFS),$$(lastword $$< $$(MERGEDFILE))) + $$(call gb_SrsPartTarget__command_dep,$$*,$$<) + $$(call gb_SrsPartTarget__command,$$@,$$*,$$<) ifeq ($(gb_FULLDEPS),$(true)) $$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) @@ -102,12 +102,12 @@ endif define gb_SrsPartTarget_SrsPartTarget -ifeq ($(strip $(WITH_LANG)),) +ifeq ($(strip $(gb_WITH_LANG)),) $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := else $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1)) $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1)) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf +$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf) endif endef @@ -212,7 +212,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $@) $(OUTDIR)/bin \ $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \ - RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \ + RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "-r -p \ -lg$(LANGUAGE) \ -fs=$@ \ @@ -282,7 +282,7 @@ endef # AllLangResTarget -gb_AllLangResTarget_LANGS := en-US $(WITH_LANG) +gb_AllLangResTarget_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) define gb_AllLangResTarget_set_langs gb_AllLangResTarget_LANGS := $(1) diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 15d162ee29c3..5fc15baf744c 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -27,30 +27,21 @@ gb_ComponentTarget_REPOS := $(gb_REPOS) -ifeq ($(SYSTEM_LIBXSLT),YES) -gb_ComponentTarget_XSLTPROCTARGET := -gb_ComponentTarget_XSLTPROCCOMMAND := xsltproc -else -gb_ComponentTarget_XSLTPROCTARGET := $(call gb_Executable_get_target,xsltproc) -gb_ComponentTarget_XSLTPROCCOMMAND := $(gb_ComponentTarget_XSLTPROCPRECOMMAND) $(gb_ComponentTarget_XSLTPROCTARGET) -endif gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt gb_ComponentTarget_get_source = $(1)/$(2).component -# gb_ComponentTarget_PREFIXBASISNATIVE is set by the platform - define gb_ComponentTarget__command $(call gb_Output_announce,$(3),$(true),CMP,1) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - $(gb_ComponentTarget_XSLTPROCCOMMAND) --nonet --stringparam uri \ - '$(gb_ComponentTarget_PREFIXBASISNATIVE)$(LIBFILENAME)' -o $(1) \ + $(gb_XSLTPROC) --nonet --stringparam uri \ + '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2)) endef define gb_ComponentTarget__rules -$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_ComponentTarget_XSLTPROCTARGET) +$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET) $$(call gb_ComponentTarget__command,$$@,$$<,$$*) $$(call gb_ComponentTarget_get_clean_target,%) : @@ -68,7 +59,8 @@ $(call gb_ComponentTarget_get_external_target,%) : $(call gb_Deliver_deliver,$<,$@) define gb_ComponentTarget_ComponentTarget -$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(or $(3),$(2)) +$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) +$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1))) diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk new file mode 100644 index 000000000000..a3b18a4a0bbd --- /dev/null +++ b/solenv/gbuild/CppunitTest.mk @@ -0,0 +1,96 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + + +# CppunitTest class + +# defined by platform +# gb_CppunitTest_TARGETTYPE +# gb_CppunitTest_get_filename +gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester) +gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_CPPTESTTARGET) +gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) + +.PHONY : $(call gb_CppunitTest_get_clean_target,%) +$(call gb_CppunitTest_get_clean_target,%) : + $(call gb_Helper_abbreviate_dirs,\ + rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log) + +.PHONY : $(call gb_CppunitTest_get_target,%) +$(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET) + $(call gb_Output_announce,$*,$(true),CUT,2) + $(call gb_Helper_abbreviate_dirs_native,\ + mkdir -p $(dir $@) && \ + $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false)) + +define gb_CppunitTest_CppunitTest +$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1))) + +endef + +define gb_CppunitTest__CppunitTest_impl +$(call gb_LinkTarget_LinkTarget,$(2)) +$(call gb_LinkTarget_set_targettype,$(2),CppunitTest) +$(call gb_LinkTarget_add_linked_libs,$(2),cppunit) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) +$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) +$(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1))) +$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1)))) + +endef + +define gb_CppunitTest__forward_to_Linktarget +gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3)) + +endef + +$(eval $(foreach method,\ + add_cobject \ + add_cobjects \ + add_cxxobject \ + add_cxxobjects \ + add_objcxxobject \ + add_objcxxobjects \ + add_exception_objects \ + add_noexception_objects \ + set_cflags \ + set_cxxflags \ + set_objcxxflags \ + set_defs \ + set_include \ + set_ldflags \ + set_library_path_flags \ + add_linked_libs \ + add_linked_static_libs \ + add_package_headers \ + add_sdi_headers \ + add_precompiled_header \ +,\ + $(call gb_CppunitTest__forward_to_Linktarget,$(method))\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk new file mode 100644 index 000000000000..082943504594 --- /dev/null +++ b/solenv/gbuild/CustomTarget.mk @@ -0,0 +1,96 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) + +# N.B.: putting the "+" there at the start activates the GNU make job server +define gb_CustomTarget__command ++$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \ + $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \ + touch $(1)) + +endef + +define gb_CustomTarget__rules +$$(call gb_CustomTarget_get_repo_target,$(1),%) : + $$(call gb_Output_announce,$$*,$$(true),MAK,3) + $$(call gb_CustomTarget__command,$$@,$$*) + +$$(call gb_CustomTarget_get_target,%) : $$(call gb_CustomTarget_get_repo_target,$(1),%) + $$(call gb_Helper_abbreviate_dirs,\ + touch $$@) + +endef + +.PHONY: $(call gb_CustomTarget_get_clean_target,%) +$(call gb_CustomTarget_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),MAK,3) + $(call gb_Helper_abbreviate_dirs,\ + rm -rf $(call gb_CustomTarget_get_workdir,$*) && \ + rm -f $(call gb_CustomTarget_get_target,$*) \ + $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*))) + + +$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame)))) + +define gb_CustomTarget__get_makefile +$(1)/$(2)/Makefile +endef + +define gb_CustomTarget_CustomTarget +$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ + $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1)))) + +$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1)) + +endef + + +define gb_CustomTarget_add_dependency +$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ + $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2))) + +endef + +define gb_CustomTarget_add_dependencies +$(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency))) + +endef + +define gb_CustomTarget_add_outdir_dependency +$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ + $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2))) + +endef + +define gb_CustomTarget_add_outdir_dependencies +$(foreach dependency,$(2),$(call gb_CustomTarget_add_outdir_dependency,$(1),$(dependency))) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 315c9df621f1..60772894f87c 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -62,8 +62,12 @@ endif define gb_Deliver_setdeliverlogcommand ifeq ($$(words $(gb_Module_ALLMODULES)),1) $$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1)) -deliverlog : COMMAND := mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) && -deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log +deliverlog : COMMAND := \ + mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \ + && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \ + && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \ + > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \ + && rm -f $$$${RESPONSEFILE} else $$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1)) deliverlog : COMMAND := true @@ -72,11 +76,20 @@ endef # FIXME: this does not really work for real multi repository builds, but the # deliver.log format is broken in that case anyway -.PHONY : deliverlog +.PHONY : deliverlog showdeliverables deliverlog: $(eval $(call gb_Deliver_setdeliverlogcommand)) $(call gb_Helper_abbreviate_dirs, $(COMMAND)) -all : deliverlog +# all : deliverlog +define gb_Deliver_print_deliverable +$(info $(1) $(patsubst $(OUTDIR)/%,%,$(2))) +endef + +showdeliverables : + $(eval MAKEFLAGS := s) + $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\ + $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable))))) + true # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 341f7c7b66fd..a1cf1c34856b 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,22 +14,20 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* - # Executable class # defined by platform -# gb_Executable_TARGETTYPEFLAGS # gb_Executable_Executable_platform .PHONY : $(call gb_Executable_get_clean_target,%) @@ -50,7 +48,7 @@ endef define gb_Executable__Executable_impl $(call gb_LinkTarget_LinkTarget,$(2)) -$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_Executable_TARGETTYPEFLAGS) $(call gb_Executable_get_rpath,$(1))) +$(call gb_LinkTarget_set_targettype,$(2),Executable) $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Executable_Executable_platform,$(1),$(2)) @@ -73,6 +71,7 @@ $(eval $(foreach method,\ add_objcxxobjects \ add_exception_objects \ add_noexception_objects \ + add_generated_exception_objects \ set_cflags \ set_cxxflags \ set_objcxxflags \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index c5fe87bbc343..c62825dcb2e2 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -29,12 +29,22 @@ gb_Helper_NULLFILE := /dev/null gb_Helper_MISC := $(WORKDIR)/Misc +ifeq ($(JAVACOMPILER),) +JAVACOMPILER := javac +endif + +ifeq ($(JAVAINTERPRETER),) +JAVAINTERPRETER := java +endif + # general propose phony target gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY # general propose empty dummy target gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY +gb_Helper_REPOSITORYNAMES := + .PHONY : $(WORKDIR)/Misc/PHONY $(gb_Helper_MISCDUMMY) : @mkdir -p $(dir $@) && touch $@ @@ -85,6 +95,7 @@ endef define gb_Helper_register_repository gb_Helper_CURRENTREPOSITORY := $(1) +gb_Helper_REPOSITORYNAMES += $(1) endef diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk new file mode 100644 index 000000000000..655aedbd17d9 --- /dev/null +++ b/solenv/gbuild/JavaClassSet.mk @@ -0,0 +1,81 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +gb_JavaClassSet_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) + +define gb_JavaClassSet__command +$(call gb_Helper_abbreviate_dirs_native,\ + mkdir -p $(dir $(1)) && \ + $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \ + touch $(1)) + +endef + +define gb_JavaClassSet__rules +$$(call gb_JavaClassSet_get_repo_target,$(1),%) : + $$(call gb_JavaClassSet__command,$$@,$$*,$$?) + +$$(call gb_JavaClassSet_get_target,%) : $$(call gb_JavaClassSet_get_repo_target,$(1),%) + $$(call gb_Output_announce,$$*,$$(true),JCS,3) + $$(call gb_Helper_abbreviate_dirs,\ + touch $$@) + +endef + +$(call gb_JavaClassSet_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),JCS,3) + $(call gb_Helper_abbreviate_dirs,\ + rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) + + +$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call gb_JavaClassSet__rules,$(reponame)))) + +define gb_JavaClassSet_JavaClassSet +endef + +define gb_JavaClassSet__get_sourcefile +$(1)/$(2).java +endef + +define gb_JavaClassSet_add_sourcefile +$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\ + $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2)))) + +endef + +define gb_JavaClassSet_add_sourcefiles +$(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefile))) + +endef + +define gb_JavaClassSet_set_classpath +$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk new file mode 100644 index 000000000000..afc9486fd5a4 --- /dev/null +++ b/solenv/gbuild/JunitTest.mk @@ -0,0 +1,97 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + + +# JunitTest class + +gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS) + +.PHONY : $(call gb_JunitTest_get_clean_target,%) +$(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%)) + $(call gb_Helper_abbreviate_dirs,\ + rm -f $@ $@.log) + +.PHONY : $(call gb_JunitTest_get_target,$(1)) +$(call gb_JunitTest_get_target,%) : + $(call gb_Output_announce,$*,$(true),JUT,2) + $(call gb_Helper_abbreviate_dirs_native,\ + mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ + $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) + $(CLEAN_CMD) + +define gb_JunitTest_JunitTest +$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : CLASSES := +$(call gb_JunitTest_JunitTest_platform,$(1)) + +$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) +$(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1))) +$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) +endef + +define gb_JunitTest_set_defs +$(call gb_JunitTest_get_target,$(1)) : DEFS := $(2) + +endef + +define gb_JunitTest_add_classes +$(call gb_JunitTest_get_target,$(1)) : CLASSES += $(2) + +endef + +define gb_JunitTest_add_class +$(call gb_JunitTest_add_classes,$(1),$(2)) + +endef + + +define gb_JunitTest_add_sourcefile +$(call gb_JavaClassSet_add_sourcefile,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + +define gb_JunitTest_add_sourcefiles +$(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile))) + +endef + +define gb_JunitTest_set_classpath +$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2) + +endef + +define gb_JunitTest_add_jar +$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2) +$(call gb_JunitTest_get_target,$(1)) : $(2) + +endef + +define gb_JunitTest_add_jars +$(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) + +endef +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 9a0c0aadf9bf..d697b1a777ca 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -28,21 +28,22 @@ # Library class -# defined globally in gbuild.mk +# defined globally in TargetLocations.mk # gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib # gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library # defined by platform +# gb_Library_COMPONENTPREFIXES # gb_Library_DEFS # gb_Library_DLLFILENAMES # gb_Library_FILENAMES -# gb_Library_TARGETS -# gb_Library_TARGETTYPEFLAGS # gb_Library_Library_platform +# gb_Library_TARGETS +gb_Library__get_linktargetname = Library/$(call gb_Library_get_filename,$(1)) # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) -$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%$(gb_Library_PLAINEXT))) +$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) : $(call gb_Helper_abbreviate_dirs,\ rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \ $(AUXTARGETS)) @@ -59,18 +60,19 @@ $$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Librar $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk)) endif $(call gb_Library_get_target,$(1)) : AUXTARGETS := -$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,$(1)))) +$(call gb_Library__Library_impl,$(1),$(call gb_Library__get_linktargetname,$(1))) endef define gb_Library__Library_impl $(call gb_LinkTarget_LinkTarget,$(2)) -$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_Library_TARGETTYPEFLAGS) $(call gb_Library_get_rpath,$(1))) +$(call gb_LinkTarget_set_targettype,$(2),Library) $(call gb_LinkTarget_set_defs,$(2),\ $$(DEFS) \ $(gb_Library_DEFS) \ ) $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) +$(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) $$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1)))) $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2))) @@ -78,17 +80,30 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L endef define gb_Library_set_componentfile -$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library_get_filename,$(1)),$(call gb_Library_get_dllname,$(1))) +$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1))) $(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2)) endef +gb_Library__get_componentprefix = \ + $(call gb_Library__get_layer_componentprefix,$(call \ + gb_Library_get_layer,$(1))) + +gb_Library__get_layer_componentprefix = \ + $(patsubst $(1):%,%,$(or \ + $(filter $(1):%,$(gb_Library_COMPONENTPREFIXES)), \ + $(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)'))) + + define gb_Library__forward_to_Linktarget -gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_Library_get_linktargetname,$$(call gb_Library_get_filename,$$(1))),$$(2),$$(3)) +gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library__get_linktargetname,$$(1)),$$(2),$$(3)) endef +gb_Library_get_runtime_filename = \ + $(or $(call gb_Library_get_dllname,$(1)),$(call gb_Library_get_filename,$(1))) + $(eval $(foreach method,\ add_cobject \ add_cobjects \ @@ -98,6 +113,7 @@ $(eval $(foreach method,\ add_objcxxobjects \ add_exception_objects \ add_noexception_objects \ + add_generated_exception_objects \ set_cflags \ set_cxxflags \ set_objcxxflags \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index da16f6763002..612b85bf3e20 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -117,12 +117,12 @@ endef define gb_CxxObject__rules $$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%) $$(eval $$(gb_CxxObject__set_pchflags)) - $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(CXXFLAGS) $$(PCHFLAGS),$$(INCLUDE_STL) $$(INCLUDE)) + $$(call gb_CxxObject__command,$$@,$$*,$$<) ifeq ($(gb_FULLDEPS),$(true)) $$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%) $$(eval $$(gb_CxxObject__set_pchflags)) - $$(call gb_CxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CXXFLAGS) $$(PCHFLAGS),$$(INCLUDE_STL) $$(INCLUDE)) + $$(call gb_CxxObject__command_dep,$$@,$$*,$$<) endif endef @@ -138,6 +138,38 @@ endif gb_CxxObject_CxxObject = +# GenCxxObject class + +gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx +# defined by platform +# gb_CxxObject__command + +# This rule generates an "always rebuild" dep file, to have something to +# include. The dep file will be overridden on the fly, when the object is +# compiled. +ifeq ($(gb_FULLDEPS),$(true)) +define gb_GenCxxObject__command_dep +mkdir -p $(dir $(1)) && \ + echo '$(call gb_GenCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1) +endef +else +gb_GenCxxObject__command_dep = +endif + +$(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%) + $(call gb_CxxObject__command,$@,$*,$<) + +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_source,%) + $(call gb_GenCxxObject__command_dep,$@,$*,$<) + +$(call gb_GenCxxObject_get_dep_target,%) : + $(eval $(call gb_Output_error,Unable to find generated C++ file $(call gb_GenCxxObject_get_source,$*) in WORKDIR.)) +endif + +gb_GenCxxObject_GenCxxObject = + + # ObjCxxObject class # gb_ObjCxxObject_REPOS := $(gb_REPOS) @@ -192,39 +224,48 @@ gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS) .PHONY : $(call gb_LinkTarget_get_clean_target,%) $(call gb_LinkTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),LNK,4) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \ - $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ - $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \ - $(call gb_LinkTarget_get_target,$*) \ - $(call gb_LinkTarget_get_dep_target,$*) \ - $(call gb_LinkTarget_get_headers_target,$*) \ - $(call gb_LinkTarget_get_external_headers_target,$*) \ - $(DLLTARGET) \ - $(AUXTARGETS)) + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \ + $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ + $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_dep_target,$(object))) \ + $(call gb_LinkTarget_get_target,$*) \ + $(call gb_LinkTarget_get_dep_target,$*) \ + $(call gb_LinkTarget_get_headers_target,$*) \ + $(call gb_LinkTarget_get_external_headers_target,$*) \ + $(DLLTARGET) \ + $(AUXTARGETS)) && \ + cat $${RESPONSEFILE} |xargs -n 200 rm -f && \ + rm -f $${RESPONSEFILE} + # cat the deps of all objects in one file, then we need only open that one file define gb_LinkTarget__command_dep $(call gb_Output_announce,LNK:$(2),$(true),DEP,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - cat $(gb_Helper_NULLFILE)\ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ $(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \ $(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \ - $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object))) > $(1)) + $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object)))\ + $(foreach object,$(6),$(call gb_GenCxxObject_get_dep_target,$(object)))\ + ) && \ + cat $${RESPONSEFILE} |xargs -n 200 cat > $(1)) && \ + rm -f $${RESPONSEFILE} + endef $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY) - $(call gb_LinkTarget__command,$@,$*,$(TARGETTYPE_FLAGS) $(LDFLAGS),$(LINKED_LIBS),$(LINKED_STATIC_LIBS),$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS)) + $(call gb_LinkTarget__command,$@,$*) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%) $(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%) - $(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS)) + $(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS),$(GENCXXOBJECTS)) endif # Ok, this is some dark voodoo: When declaring a linktarget with @@ -241,7 +282,7 @@ define gb_LinkTarget__get_external_headers_check ifneq ($$(SELF),$$*) $$(eval $$(call gb_Output_info,LinkTarget $$* not defined: Assuming headers to be there!,ALL)) endif -$$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touch $$@) +$$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touch $$@ && mkdir -p $(call gb_LinkTarget_get_target,)pdb/$$(dir $$*)) endef @@ -277,8 +318,8 @@ $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_h # - PCH_CXXFLAGS and PCH_DEFS are the flags that the precompiled headers will # be compiled with. They should never be overridden in a single object # files. -# - TARGETTYPEFLAGS are the flags that are needed for a specific kind of target -# (shl,exe...) They are mostly used by the platforms. +# - TARGETTYPE is the type of linktarget as some platforms need very different +# command to link different targettypes. # # Since most variables are set on the linktarget and not on the object, the # object learns about these setting via GNU makes scoping of target variables. @@ -295,12 +336,14 @@ $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS := $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS := +$(call gb_LinkTarget_get_clean_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(gb_COMPILEROPTFLAGS) $(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) @@ -313,9 +356,12 @@ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_ $(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := -$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE_FLAGS := +$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := +$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS := +$(call gb_LinkTarget_get_headers_target,$(1)) \ +$(call gb_LinkTarget_get_target,$(1)) : PDBFILE := ifeq ($(gb_FULLDEPS),$(true)) ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),) @@ -326,15 +372,16 @@ endif $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS := +$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) +$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(gb_COMPILEROPTFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) -$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE_FLAGS := +$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := endif @@ -476,12 +523,27 @@ endif endef +define gb_LinkTarget_add_generated_cxx_object +$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) +$(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2) + +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2)) +$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) +$(call gb_GenCxxObject_get_target,$(2)) : CXXFLAGS += $(3) $(gb_COMPILEROPTFLAGS) + +ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2)) +endif + +endef + define gb_LinkTarget_add_noexception_object -$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS)) +$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) endef define gb_LinkTarget_add_exception_object -$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS)) +$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) endef define gb_LinkTarget_add_cobjects @@ -504,9 +566,17 @@ define gb_LinkTarget_add_exception_objects $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj))) endef -define gb_LinkTarget_set_targettype_flags +define gb_LinkTarget_add_generated_exception_object +$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS)) +endef + +define gb_LinkTarget_add_generated_exception_objects +$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_exception_object,$(1),$(obj))) +endef + +define gb_LinkTarget_set_targettype $(call gb_LinkTarget_get_target,$(1)) \ -$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE_FLAGS := $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2) endef define gb_LinkTarget_set_dlltarget @@ -525,7 +595,7 @@ $(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1)) endef define gb_LinkTarget_add_package_headers -$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach package,$(2),$(call gb_Package_get_target,$(package)))) +$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package)))) $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package))) endef @@ -545,6 +615,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_ge $(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3) +$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $(call gb_PrecompiledHeader_get_target,$(3)).obj $(call gb_NoexPrecompiledHeader_get_target,$(3)).obj + $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS $(call gb_LinkTarget_get_headers_target,$(1)) \ diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index afc40a835cfe..b909b46e27a0 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -31,6 +31,8 @@ gb_Module_ALLMODULES := gb_Module_MODULELOCATIONS := gb_Module_TARGETSTACK := +gb_Module_CHECKTARGETSTACK := +gb_Module_SUBSEQUENTCHECKTARGETSTACK := gb_Module_CLEANTARGETSTACK := .PHONY : $(call gb_Module_get_clean_target,%) @@ -38,7 +40,21 @@ $(call gb_Module_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),MOD,5) $(call gb_Output_announce_title,module $* cleared.) -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Module_get_target,$*)) + rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*)) + +$(call gb_Module_get_check_target,%) : + $(call gb_Output_announce,$*,$(true),CHK,5) + $(call gb_Output_announce_title,module $* checks done.) + -$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) && \ + touch $@) + +$(call gb_Module_get_subsequentcheck_target,%) : + $(call gb_Output_announce,$*,$(true),SCK,5) + $(call gb_Output_announce_title,module $* subsequentchecks done.) + -$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) && \ + touch $@) $(call gb_Module_get_target,%) : $(call gb_Output_announce,$*,$(true),MOD,5) @@ -47,8 +63,15 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) && \ touch $@) -.PHONY : all clean -.DEFAULT_GOAL := all +.PHONY : all allandcheck clean check subsequentcheck +.DEFAULT_GOAL := allandcheck + +allandcheck : all check + +# compatibility with the old build system +ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),) +.DEFAULT_GOAL := subsequentcheck +endif all : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6) @@ -56,6 +79,16 @@ all : $(call gb_Output_announce_title,all done.) $(call gb_Output_announce_bell) +check : + $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6) + $(call gb_Output_announce_title,all tests checked.) + $(call gb_Output_announce_bell) + +subsequentcheck : all + $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6) + $(call gb_Output_announce_title,all subsequent tests checked.) + $(call gb_Output_announce_bell) + clean : $(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6) $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6) @@ -65,7 +98,10 @@ clean : define gb_Module_Module gb_Module_ALLMODULES += $(1) gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST)))) -$$(eval $$(call gb_Module_register_target,$(call gb_Module_get_target,$(1)),$(call gb_Module_get_clean_target,$(1)))) +gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK) +gb_Module_CHECKTARGETSTACK := $(call gb_Module_get_check_target,$(1)) $(gb_Module_CHECKTARGETSTACK) +gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_target,$(1)) $(gb_Module_SUBSEQUENTCHECKTARGETSTACK) +gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK) endef @@ -74,28 +110,72 @@ endef # should never be inlined ($(call )) as the calls defining it might be sourced # before gb_Module. define gb_Module_register_target -gb_Module_TARGETSTACK := $(1) $(gb_Module_TARGETSTACK) -gb_Module_CLEANTARGETSTACK := $(2) $(gb_Module_CLEANTARGETSTACK) +gb_Module_CURRENTTARGET := $(1) +gb_Module_CURRENTCLEANTARGET := $(2) + +endef + +# Here we include the file (in it there will be a call to gb_Module_register_target) +define gb_Module__read_targetfile +gb_Module_CURRENTTARGET := +gb_Module_CURRENTCLEANTARGET := +include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk +ifneq ($$(words $$(gb_Module_CURRENTTARGET)) $$(words $$(gb_Module_CURRENTCLEANTARGET)),1 1) +$$(eval $$(call gb_Output_error,No $(3) registered while reading $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk!)) +endif endef -# Here we include the file (in it there will be a call to -# gb_Module_register_target) and pop one target from each stack afterwards. define gb_Module_add_target -include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2).mk +$(call gb_Module__read_targetfile,$(1),$(2),target) + +$(call gb_Module_get_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) + +endef + +define gb_Module_add_check_target +$(call gb_Module__read_targetfile,$(1),$(2),check target) + +$(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) + +endef + +define gb_Module_add_subsequentcheck_target +$(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) + +$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) + +endef + +define gb_Module_add_moduledir +include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK)) +$(call gb_Module_get_check_target,$(1)) : $$(firstword $$(gb_Module_CHECKTARGETSTACK)) +$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) $(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK)) gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK)) +gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK)) +gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK)) endef -define gb_Module_add_moduledir -$(call gb_Module_add_target,$(1),$(2)/Module_$(2)) -endef - define gb_Module_add_targets $(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target))) + +endef + +define gb_Module_add_check_targets +$(foreach target,$(2),$(call gb_Module_add_check_target,$(1),$(target))) + +endef + +define gb_Module_add_subsequentcheck_targets +$(foreach target,$(2),$(call gb_Module_add_subsequentcheck_target,$(1),$(target))) + endef define gb_Module_add_moduledirs @@ -104,23 +184,27 @@ endef define gb_Module_make_global_targets ifneq ($$(gb_Module_TARGETSTACK),) -$$(eval $$(call gb_Output_error,Corrupted module target stack!)) +$$(eval $$(call gb_Output_error,Corrupted module target stack!1)) endif include $(1) all : $$(firstword $$(gb_Module_TARGETSTACK)) +check : $$(firstword $$(gb_Module_CHECKTARGETSTACK)) +subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK)) ifneq ($$(words $$(gb_Module_TARGETSTACK)),1) -$$(eval $$(call gb_Output_error,Corrupted module target stack!)) +$$(eval $$(call gb_Output_error,Corrupted module target stack! $(gb_Module_TARGETSTACK))) endif gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK)) +gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK)) +gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK)) -ifneq ($$(gb_Module_TARGETSTACK),) -$$(eval $$(call gb_Output_error,Corrupted module target stack!)) +ifneq ($$(and $$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),) +$$(eval $$(call gb_Output_error,Corrupted module target stack!3)) endif endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 7ed91db48a06..6e16b21d9b05 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -32,7 +32,8 @@ $(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%) $(call gb_Deliver_deliver,$<,$@) define gb_PackagePart_PackagePart -$(OUTDIR)/$(1) : $(2) +$(OUTDIR)/$(1) : $(2) +$(2) :| $(3) $(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2)) endef @@ -46,22 +47,34 @@ $(call gb_Package_get_clean_target,%) : -$(call gb_Helper_abbreviate_dirs,\ rm -f $(FILES)) +$(call gb_Package_get_preparation_target,%) : + mkdir -p $(dir $@) && touch $@ + $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) mkdir -p $(dir $@) && touch $@ + define gb_Package_Package gb_Package_SOURCEDIR_$(1) := $(2) -$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) +$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1)) $$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1)))) +$(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1)) endef define gb_Package_add_file $(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2) $(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2) -$(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3)) -$(OUTDIR)/$(2) : $$(gb_Package_SOURCEDIR_$(1))/$(3) +$(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call gb_Package_get_preparation_target,$(1))) + +endef + +define gb_Package_add_customtarget +$(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2)) +$(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) +$(call gb_CustomTarget_CustomTarget,$(2)) + endef # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk index 23e075f2adb3..2c7ececf4a0a 100644 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ b/solenv/gbuild/PrecompiledHeaders.mk @@ -60,6 +60,7 @@ $(call gb_PrecompiledHeader_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),PCH,1) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_PrecompiledHeader_get_target,$*) \ + $(call gb_PrecompiledHeader_get_target,$*).obj \ $(call gb_PrecompiledHeader_get_target,$*).pdb \ $(call gb_PrecompiledHeader_get_dep_target,$*)) @@ -68,6 +69,7 @@ $(call gb_NoexPrecompiledHeader_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),PCH,1) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \ + $(call gb_NoexPrecompiledHeader_get_target,$*).obj \ $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \ $(call gb_NoexPrecompiledHeader_get_dep_target,$*)) endif diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 0281337fc85f..49bf290e096c 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -38,7 +38,7 @@ gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVID $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET) $(gb_SdiTarget_SVIDLAUXDEPS) $(call gb_Output_announce,$*,$(true),SDI,1) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(WORKDIR)/inc/$*) $(dir $@)) + mkdir -p $(dir $@)) $(call gb_Helper_abbreviate_dirs_native,\ cd $(dir $<) && \ $(gb_SdiTarget_SVIDLCOMMAND) -quiet \ @@ -60,7 +60,7 @@ $(call gb_SdiTarget_get_clean_target,%) : $(call gb_SdiTarget_get_target,$*)) define gb_SdiTarget_SdiTarget -$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := -I$(WORKDIR)/inc/ $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC)) +$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC)) $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi endef diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 6d1f07b068f1..a2521bc4d242 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -34,12 +34,12 @@ # gb_StaticLibrary_DEFS # gb_StaticLibrary_FILENAMES # gb_StaticLibrary_TARGETS -# gb_StaticLibrary_TARGETTYPEFLAGS +gb_StaticLibrary__get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) -$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_StaticLibrary_get_linktargetname,%$(gb_StaticLibrary_PLAINEXT))) +$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) : $(call gb_Helper_abbreviate_dirs,\ rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \ $(AUXTARGETS)) @@ -56,18 +56,19 @@ $$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb $$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk)) endif $(call gb_StaticLibrary_get_target,$(1)) : AUXTARGETS := -$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(call gb_StaticLibrary_get_filename,$(1)))) +$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary__get_linktargetname,$(1))) endef define gb_StaticLibrary__StaticLibrary_impl $(call gb_LinkTarget_LinkTarget,$(2)) -$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_StaticLibrary_TARGETTYPEFLAGS)) +$(call gb_LinkTarget_set_targettype,$(2),StaticLibrary) $(call gb_LinkTarget_set_defs,$(2),\ $$(DEFS) \ $(gb_StaticLibrary_DEFS) \ ) $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) +$(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2)) $$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1)))) $(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2))) @@ -75,7 +76,7 @@ $(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(cal endef define gb_StaticLibrary_forward_to_Linktarget -gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_StaticLibrary_get_linktargetname,$$(call gb_StaticLibrary_get_filename,$$(1))),$$(2),$$(3)) +gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary__get_linktargetname,$$(1)),$$(2),$$(3)) endef @@ -88,6 +89,7 @@ $(eval $(foreach method,\ add_objcxxobjects \ add_exception_objects \ add_noexception_objects \ + add_generated_exception_objects \ set_cflags \ set_cxxflags \ set_objcxxflags \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 933fc48c09d4..aba209c29136 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -48,16 +48,30 @@ endef gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1) gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component +gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test +gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done +gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done +gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1) gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o +gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1) gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1) +gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1) +gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done +gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done +gb_JunitTest_get_classsetname = JunitTest/$(1) +gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done +gb_JunitTest_get_userdir = $(WORKDIR)/JunitTest/$(1)/user gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1) gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1) gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1) +gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) +gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) gb_Module_get_target = $(WORKDIR)/Module/$(1) gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o +gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1) gb_Package_get_target = $(WORKDIR)/Package/$(1) gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch @@ -87,6 +101,8 @@ endef $(eval $(call gb_Helper_make_clean_targets,\ AllLangResTarget \ ComponentTarget \ + JavaClassSet \ + JunitTest \ LinkTarget \ Module \ NoexPrecompiledHeader \ @@ -95,6 +111,8 @@ $(eval $(call gb_Helper_make_clean_targets,\ ResTarget \ SdiTarget \ SrsTarget \ + CppunitTest \ + CustomTarget \ )) $(eval $(call gb_Helper_make_outdir_clean_targets,\ @@ -112,13 +130,11 @@ $(eval $(call gb_Helper_make_dep_targets,\ SrsPartTarget \ SrsTarget \ )) - +# needs to use same dep target because we use gb_CxxObject__command +gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target) # other getters -gb_Library_get_linktargetname = Library/$(1) -gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1) - define gb_Library_get_layer $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER))) endef @@ -140,6 +156,7 @@ endef gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library +gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk new file mode 100644 index 000000000000..5b80452056e0 --- /dev/null +++ b/solenv/gbuild/Tempfile.mk @@ -0,0 +1,18 @@ +# Write string to temporary file by chopping into pieces that +# fit the commandline +# parameters: filename, maxitems (for one write), string +# returns: filename +define var2file +$(strip $(1) +$(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\ +$(foreach item,$(3),$(eval gb_var2file_curblock += $(item) + ifeq ($$(words $$(gb_var2file_curblock)),$(2)) + gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) ) + gb_var2file_curblock := + endif + ))\ + $(eval gb_var2file_helpervar := $(shell echo " "$(gb_var2file_curblock) >> $(1) ) + gb_var2file_curblock := + )) +endef + diff --git a/solenv/gbuild/extensions/PackModule.mk b/solenv/gbuild/extensions/post_PackModule.mk index 237ffcf72670..3a573cbc5d7e 100644 --- a/solenv/gbuild/extensions/PackModule.mk +++ b/solenv/gbuild/extensions/post_PackModule.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -41,7 +41,7 @@ packmodule : COMMAND := true endif endef -packmodule : all +packmodule : all deliverlog $(eval $(call gb_PackModule_setpackmodulecommand)) $(COMMAND) diff --git a/solenv/gbuild/extensions/SetupLocal.mk b/solenv/gbuild/extensions/post_SetupLocal.mk index 483b8a163056..483b8a163056 100644 --- a/solenv/gbuild/extensions/SetupLocal.mk +++ b/solenv/gbuild/extensions/post_SetupLocal.mk diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk new file mode 100644 index 000000000000..47669daa0a13 --- /dev/null +++ b/solenv/gbuild/extensions/pre_SharedLangList.mk @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +# share language list with dmake build system +include $(SOLARENV)/inc/langlist.mk + +ifneq ($(WITH_LANG),ALL) +gb_WITH_LANG=$(WITH_LANG) +else +# expand ALL based on language list) +gb_WITH_LANG=$(completelangiso) +endif + +# vim: set noet ts=4 sw=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9eee851cefac..3c7010a32158 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -62,6 +62,11 @@ endef COMMA :=, +# optional extensions that should never be essential +ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),) +include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk) +endif + include $(GBUILDDIR)/Output.mk # BuildDirs uses the Output functions already @@ -95,7 +100,7 @@ gb_ENABLE_PCH := $(false) endif # for clean, setuplocal and removelocal goals we switch off dependencies -ifneq ($(filter clean setuplocal removelocal,$(MAKECMDGOALS)),) +ifneq ($(filter clean setuplocal removelocal showdeliverables,$(MAKECMDGOALS)),) gb_FULLDEPS := $(false) else gb_FULLDEPS := $(true) @@ -130,6 +135,8 @@ endif endif endif +include $(GBUILDDIR)/Tempfile.mk + include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk) $(eval $(call gb_Helper_collect_knownlibs)) @@ -172,6 +179,22 @@ gb_GLOBALDEFS += \ endif +ifneq ($(strip $(ENABLE_GTK)),) +gb_GLOBALDEFS += -DENABLE_GTK +endif + +ifneq ($(strip $(ENABLE_KDE)),) +gb_GLOBALDEFS += -DENABLE_KDE +endif + +ifneq ($(strip $(ENABLE_KDE4)),) +gb_GLOBALDEFS += -DENABLE_KDE4 +endif + +ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE) +gb_GLOBALDEFS += -DENABLE_GRAPHITE +endif + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) include $(GBUILDDIR)/Deliver.mk @@ -204,13 +227,28 @@ include $(foreach class, \ Executable \ SdiTarget \ Package \ + CustomTarget \ PrecompiledHeaders \ + CppunitTest \ + JavaClassSet \ + JunitTest \ Module \ ,$(GBUILDDIR)/$(class).mk) # optional extensions that should never be essential -ifneq ($(wildcard $(GBUILDDIR)/extensions/*.mk),) -include $(wildcard $(GBUILDDIR)/extensions/*.mk) +ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),) +include $(wildcard $(GBUILDDIR)/extensions/post_*.mk) endif +ifeq ($(SYSTEM_LIBXSLT),YES) +gb_XSLTPROCTARGET := +gb_XSLTPROC := xsltproc +else +gb_XSLTPROCTARGET := $(call gb_Executable_get_target,xsltproc) +gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET) +endif + +export gb_AWK +export gb_XSLTPROC + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 746765e2e82c..ed8c08ac348a 100755 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -28,12 +28,14 @@ GUI := UNX COM := GCC -gb_MKTEMP := mktemp -p +gb_MKTEMP := mktemp -t gbuild.XXXXXX -gb_CC := gcc +gb_CC := cc gb_CXX := g++ gb_GCCP := gcc +gb_AR := ar gb_AWK := awk +gb_CLASSPATHSEP := : # normalize setsolar and configure env. ifeq ($(CPU),X) @@ -50,7 +52,7 @@ gb_CXX := $(CXX) endif gb_OSDEFS := \ - -DLINUX \ + -D$(OS) \ -D_PTHREADS \ -DUNIX \ -DUNX \ @@ -61,13 +63,10 @@ GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion) endif gb_COMPILERDEFS := \ - -DGCC \ - -D$(CVER) \ - -DCVER=$(CVER) \ - -DGLIBC=2 \ - -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \ + -D$(COM) \ -DHAVE_GCC_VISIBILITY_FEATURE \ -DCPPU_ENV=gcc3 \ + -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \ ifeq ($(CPUNAME),X86_64) gb_CPUDEFS := -D$(CPUNAME) @@ -79,9 +78,11 @@ gb_CFLAGS := \ -Wall \ -Wendif-labels \ -Wextra \ + -Wshadow \ + -fPIC \ -fmessage-length=0 \ + -fno-common \ -fno-strict-aliasing \ - -fpic \ -fvisibility=hidden \ -pipe \ @@ -91,18 +92,22 @@ gb_CXXFLAGS := \ -Wextra \ -Wno-ctor-dtor-privacy \ -Wno-non-virtual-dtor \ - -Wreturn-type \ -Wshadow \ - -Wuninitialized \ + -fPIC \ -fmessage-length=0 \ + -fno-common \ -fno-strict-aliasing \ -fno-use-cxa-atexit \ - -fpic \ - -fvisibility=hidden \ -fvisibility-inlines-hidden \ + -fvisibility=hidden \ -pipe \ -ifneq ($(SYSBASE),) +ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +gb_CFLAGS_WERROR := -Werror +gb_CXXFLAGS_WERROR := -Werror +endif + +ifneq ($(strip $(SYSBASE)),) gb_CXXFLAGS += --sysroot=$(SYSBASE) gb_CFLAGS += --sysroot=$(SYSBASE) endif @@ -114,15 +119,20 @@ gb_LinkTarget_EXCEPTIONFLAGS := \ gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ -fno-exceptions \ - + gb_LinkTarget_LDFLAGS := \ -Wl,--sysroot=$(SYSBASE) \ -Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ - -Wl,--hash-style=both \ -Wl,-z,combreloc \ -Wl,-z,defs \ $(subst -L../lib , ,$(SOLARLIB)) \ +ifeq ($(HAVE_LD_HASH_STYLE),TRUE) +gb_LinkTarget_LDFLAGS += \ + -Wl,--hash-style=both \ + +endif + ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),) gb_LinkTarget_LDFLAGS += \ -Wl,--dynamic-list-cpp-new \ @@ -137,11 +147,13 @@ else gb_COMPILEROPTFLAGS := -Os endif +gb_COMPILERNOOPTFLAGS := -O0 # Helper class gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) + # CObject class define gb_CObject__command @@ -150,13 +162,13 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ $(gb_CC) \ + $(DEFS) $(CFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_CObject_get_target,$(2)) \ -MF $(call gb_CObject_get_dep_target,$(2)) \ - $(4) $(5) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE)) endef @@ -168,13 +180,13 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ $(gb_CXX) \ + $(DEFS) $(CXXFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ -MF $(call gb_CxxObject_get_dep_target,$(2)) \ - $(4) $(5) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE_STL) $(INCLUDE)) endef @@ -185,15 +197,15 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS))) endef gb_LinkTarget__RPATHS := \ - URELIB:'$$$$ORIGIN' \ - UREBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \ - OOOLIB:'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' \ - BRAND:'$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib' \ - SDKBIN:'$$$$ORIGIN/../../ure-link/lib' \ - NONEBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \ + URELIB:\dORIGIN \ + UREBIN:\dORIGIN/../lib:\dORIGIN \ + OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ + BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \ + SDKBIN:\dORIGIN/../../ure-link/lib \ + NONEBIN:\dORIGIN/../lib:\dORIGIN \ -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS) -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) ifeq ($(gb_DEBUGLEVEL),2) gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline @@ -204,23 +216,40 @@ endif gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) -define gb_LinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) +define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ - $(3) \ - $(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - -Wl$(COMMA)--start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ -o $(1)) endef +define gb_LinkTarget__command_staticlink +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(gb_AR) -rsu $(1) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + 2> /dev/null) +endef + +define gb_LinkTarget__command +$(call gb_Output_announce,$(2),$(true),LNK,4) +$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1))) +$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) +endef + # Library class -gb_Library_DEFS := -D_DLL_ +gb_Library_DEFS := gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ @@ -265,29 +294,31 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ -gb_Library_Library_platform = - -define gb_Library_get_rpath --Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \ --Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION) -endef - gb_Library_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ +define gb_Library_get_rpath +'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \ +'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' +endef + +define gb_Library_Library_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) + +endef + # StaticLibrary class gb_StaticLibrary_DEFS := -gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack -static -nostdlib gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) @@ -298,25 +329,53 @@ gb_StaticLibrary_FILENAMES := \ gb_StaticLibrary_StaticLibrary_platform = + # Executable class gb_Executable_EXT := -gb_Executable_TARGETTYPEFLAGS := -gb_Executable_Executable_platform = gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ - $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \ + $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \ define gb_Executable_get_rpath --Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \ +'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \ -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION) endef +define gb_Executable_Executable_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1)) + +endef + + +# CppunitTest class + +gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib +gb_CppunitTest_SYSPRE := libtest_ +gb_CppunitTest_EXT := .so +gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) +gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) + +define gb_CppunitTest_CppunitTest_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := + +endef + +# JunitTest class + +define gb_JunitTest_JunitTest_platform +$(call gb_JunitTest_get_target,$(1)) : DEFS := \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \ + -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \ + -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ + +endef + # SdiTarget class gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib @@ -334,8 +393,8 @@ define gb_SrsPartTarget__command_dep $(call gb_Helper_abbreviate_dirs,\ $(gb_GCCP) \ -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \ - $(3) \ - $(4) \ + $(INCLUDE) \ + $(DEFS) \ -c -x c++-header $(2) \ -o $(call gb_SrsPartTarget_get_dep_target,$(1))) endef @@ -343,8 +402,10 @@ endef # ComponentTarget -gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib -gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib +gb_Library_COMPONENTPREFIXES := \ + OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ + URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c7c3558583a3..d6b84dc43e6d 100755 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -1,8 +1,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -28,39 +28,45 @@ GUI := UNX COM := GCC -gb_MKTEMP := TMPDIR= /usr/bin/mktemp -t +# Darwin mktemp -t expects a prefix, not a pattern +gb_MKTEMP := /usr/bin/mktemp -t gbuild. -gb_CC := $(CC) -gb_CXX := $(CXX) -gb_GCCP := $(CC) +gb_CC := cc +gb_CXX := g++ +gb_GCCP := gcc +gb_AR := ar gb_AWK := awk +gb_CLASSPATHSEP := : +# use CC/CXX if they are nondefaults +ifneq ($(origin CC),default) +gb_CC := $(CC) +gb_GCCP := $(CC) +endif +ifneq ($(origin CXX),default) +gb_CXX := $(CXX) +endif gb_OSDEFS := \ -D$(OS) \ - -D$(GUI) \ - -DUNIX \ -D_PTHREADS \ + -DUNIX \ + -DUNX \ -D_REENTRANT \ -DNO_PTHREAD_PRIORITY \ -DQUARTZ \ $(EXTRA_CDEFS) \ -# $(PTHREAD_CFLAGS) \ gb_COMPILERDEFS := \ -D$(COM) \ - -DGLIBC=2 \ - -D_USE_NAMESPACE=1 \ -DHAVE_GCC_VISIBILITY_FEATURE \ -DCPPU_ENV=gcc3 \ -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \ -# -D$(CVER) \ -# -DCVER=$(CVER) \ -ifeq ($(CPUNAME),INTEL) -gb_CPUDEFS := -DX86 -else # ifeq ($(CPUNAME),POWERPC) +ifeq ($(CPUNAME),POWERPC) gb_CPUDEFS := -DPOWERPC -DPPC +else +gb_CPUDEFS := -DX86 endif ifeq ($(strip $(SYSBASE)),) @@ -72,43 +78,43 @@ endif gb_CFLAGS := \ -isysroot $(gb_SDKDIR) \ - -fsigned-char \ - -fmessage-length=0 \ - -malign-natural \ -Wall \ -Wendif-labels \ - -fno-strict-aliasing \ + -Wextra \ + -Wshadow \ -fPIC \ + -fmessage-length=0 \ -fno-common \ + -fno-strict-aliasing \ -pipe \ -# -fvisibility=hidden \ gb_CXXFLAGS := \ -isysroot $(gb_SDKDIR) \ - -fsigned-char \ - -fmessage-length=0 \ - -malign-natural \ -Wall \ -Wendif-labels \ - -Wno-long-double \ + -Wextra \ -Wno-ctor-dtor-privacy \ + -Wno-long-double \ -Wno-non-virtual-dtor \ - -fno-strict-aliasing \ -fPIC \ + -fmessage-length=0 \ -fno-common \ + -fno-strict-aliasing \ + -fsigned-char \ + -malign-natural \ -pipe \ -# -fvisibility=hidden \ -# -fvisibility-inlines-hidden \ + #-Wshadow \ break in compiler headers already + #-fsigned-char \ might be removed? + #-malign-natural \ might be removed? # these are to get g++ to switch to Objective-C++ mode # (see toolkit module for a case where it is necessary to do it this way) gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions -gb_CFLAGS_WERROR := \ - -Werror \ - -gb_CXXFLAGS_WERROR := \ - -Werror \ +ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +gb_CFLAGS_WERROR := -Werror +gb_CXXFLAGS_WERROR := -Werror +endif gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ @@ -130,6 +136,7 @@ else gb_COMPILEROPTFLAGS := -O2 endif +gb_COMPILERNOOPTFLAGS := -O0 # Helper class @@ -144,32 +151,32 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ $(gb_CC) \ - $(4) $(5) \ + $(DEFS) $(CFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_CObject_get_target,$(2)) \ -MF $(call gb_CObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE)) endef # CxxObject class -# N.B: $(4) or $(5) may contain -x objective-c++, which must come before -c +# N.B: $(CXXFLAGS) may contain -x objective-c++, which must come before -c define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ $(gb_CXX) \ - $(4) $(5) \ + $(DEFS) $(CXXFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_CxxObject_get_target,$(2)) \ -MF $(call gb_CxxObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE_STL) $(INCLUDE)) endef @@ -181,26 +188,26 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \ $(gb_CXX) \ - $(4) $(5) \ + $(DEFS) $(OBJCXXFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \ -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE_STL) $(INCLUDE)) endef # LinkTarget class define gb_LinkTarget__get_rpath_for_layer -$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget_RPATHS))) +$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS))) endef -gb_LinkTarget_RPATHS := \ +gb_LinkTarget__RPATHS := \ URELIB:@__________________________________________________URELIB/ \ UREBIN: \ - OOOLIB:@__________________________________________________OOO/ \ + OOO:@__________________________________________________OOO/ \ BRAND: \ SDKBIN: \ NONEBIN: \ @@ -209,8 +216,8 @@ define gb_LinkTarget__get_installname $(if $(2),-install_name '$(2)$(1)',) endef -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS) -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS) ifeq ($(gb_DEBUGLEVEL),2) @@ -222,30 +229,65 @@ endif gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +# FIXME framework handling very hackish +define gb_LinkTarget__get_liblinkflags +$(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \ +$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1))) +endef + +define gb_LinkTarget__get_layer +$(if $(filter Executable,$(1)),\ + $$(call gb_Executable_get_layer,$(2)),\ + $$(call gb_Library_get_layer,$(2))) +endef + # FIXME the DYLIB_FILE mess is only necessary because # solver layout is different from installation layout -# FIXME framework handling very hackish -define gb_LinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) +define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - DYLIB_FILE=`$(gb_MKTEMP) $(dir $(1))` && \ - $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl $(3) $(patsubst lib%.dylib,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \ + DYLIB_FILE=`$(gb_MKTEMP)` && \ + $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \ $(gb_CXX) \ - $(3) \ - $(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(4)),$(call gb_Library_get_filename,$(lib)))) \ - $(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(4))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(8),$(call gb_ObjCxxObject_get_target,$(object))) \ - $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) \ + $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1) \ `cat $${DYLIB_FILE}` && \ - $(if $(filter shl exe,$(TARGETTYPE)),$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl $(TARGETTYPE) $(LAYER) $(1) &&,) \ - $(if $(filter shl,$(TARGETTYPE)),macosx-create-bundle $(1) &&,) \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \ + ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \ rm -f $${DYLIB_FILE}) endef +# parameters: 1-linktarget 2-cobjects 3-cxxobjects +define gb_LinkTarget__command_staticlink +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(gb_AR) -rsu $(1) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + 2> /dev/null) +endef + +define gb_LinkTarget__command +$(call gb_Output_announce,$(2),$(true),LNK,4) +$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))) +$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) +endef + # Library class @@ -269,7 +311,7 @@ gb_Library_OOOEXT := mxp$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) endif -gb_Library__FRAMEWORKS += \ +gb_Library__FRAMEWORKS := \ Cocoa \ gb_Library_PLAINLIBS_NONE += \ @@ -293,34 +335,31 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ -# HACK -# SUBSTITING OOOLIB with OOO to make the perl script happy -define gb_Library_Library_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := shl -$(call gb_LinkTarget_get_target,$(2)) : LAYER :=$(subst OOOLIB,OOO,$(call gb_Library_get_layer,$(1))) - -endef - -define gb_Library_get_rpath -$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))) -endef - gb_Library_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ +define gb_Library_get_rpath +$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))) +endef + +define gb_Library_Library_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) +$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1)) + +endef + # StaticLibrary class gb_StaticLibrary_DEFS := -gb_StaticLibrary_TARGETTYPEFLAGS := -static -nostdlib gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) @@ -329,37 +368,57 @@ gb_StaticLibrary_FILENAMES := \ $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \ $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \ -define gb_StaticLibrary_StaticLibrary_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := staticlib -$(call gb_LinkTarget_get_target,$(2)) : LAYER := +gb_StaticLibrary_StaticLibrary_platform = -endef # Executable class gb_Executable_EXT := gb_Executable_TARGETTYPEFLAGS := -bind_at_load -# HACK -# SUBSTITING OOOLIB with OOO to make the perl script happy -define gb_Executable_Library_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := exe -$(call gb_LinkTarget_get_target,$(2)) : LAYER :=$(subst OOOLIB,OOO,$(call gb_Executable_get_layer,$(1))) +gb_Executable_LAYER := \ + $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ + $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ + $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ + $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ + $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \ -endef define gb_Executable_get_rpath $(call gb_LinkTarget__get_installname,$(1),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))) endef -gb_Executable_LAYER := \ - $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ - $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ - $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \ - $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ - $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \ +define gb_Executable_Executable_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1)) +$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Executable_get_layer,$(1)) + +endef +# CppunitTest class + +gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib +gb_CppunitTest_SYSPRE := libtest_ +gb_CppunitTest_EXT := .dylib +gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) +gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) + +define gb_CppunitTest_CppunitTest_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := +$(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE + +endef + +# JunitTest class + +define gb_JunitTest_JunitTest_platform +$(call gb_JunitTest_get_target,$(1)) : DEFS := \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/OpenOffice.org.app/Contents/MacOS/soffice}" \ + -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \ + -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ + +endef + # SdiTarget class gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib @@ -377,15 +436,19 @@ define gb_SrsPartTarget__command_dep $(call gb_Helper_abbreviate_dirs,\ $(gb_GCCP) \ -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \ - $(3) \ - $(4) \ + $(INCLUDE) \ + $(DEFS) \ -c -x c++-header $(2) \ -o $(call gb_SrsPartTarget_get_dep_target,$(1))) endef + # ComponentTarget -gb_ComponentTarget_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib -gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib +gb_Library_COMPONENTPREFIXES := \ + OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ + URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index a616a40c9ccf..0caafa5446fa 100755 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -1,8 +1,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -28,12 +28,23 @@ GUI := UNX COM := C52 -gb_MKTEMP := mktemp -p -gb_AWK := nawk +gb_MKTEMP := mktemp -t gbuild.XXXXXX gb_CC := cc gb_CXX := CC gb_GCCP := cc +gb_AR := ar +gb_AWK := nawk +gb_CLASSPATHSEP := : + +# use CC/CXX if they are nondefaults +ifneq ($(origin CC),default) +gb_CC := $(CC) +gb_GCCP := $(CC) +endif +ifneq ($(origin CXX),default) +gb_CXX := $(CXX) +endif gb_OSDEFS := \ -D$(OS) \ @@ -45,13 +56,10 @@ gb_OSDEFS := \ -D_POSIX_PTHREAD_SEMANTICS \ -D_PTHREADS \ -DUNIX \ -# $(PTHREAD_CFLAGS) \ gb_COMPILERDEFS := \ -D$(COM) \ -DCPPU_ENV=sunpro5 \ -# -D$(CVER) \ -# -DCVER=$(CVER) \ gb_CPUDEFS := -D$(CPUNAME) ifeq ($(CPUNAME),SPARC) @@ -76,11 +84,10 @@ gb_CXXFLAGS := \ +w2 \ -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype \ -gb_CFLAGS_WERROR := \ - -errwarn=%all \ - -gb_CXXFLAGS_WERROR := \ - -xwe \ +ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +gb_CFLAGS_WERROR := -errwarn=%all +gb_CXXFLAGS_WERROR := -xwe +endif gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ @@ -113,11 +120,13 @@ gb_COMPILEROPTFLAGS := -m32 -xarch=sparc -xO3 -xspace -xprefetch=yes endif endif +gb_COMPILERNOOPTFLAGS := # Helper class gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) + # CObject class define gb_CObject__command @@ -131,9 +140,9 @@ $(call gb_Helper_abbreviate_dirs,\ -o $(1) \ -xMMD \ -xMF $(call gb_CObject_get_dep_target,$(2)) \ - $(4) $(5) \ + $(DEFS) $(CFLAGS) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE)) endef @@ -145,13 +154,13 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ $(gb_CXX) \ + $(DEFS) $(CXXFLAGS) \ -c $(3) \ -o $(1) \ -xMMD \ -xMF $(call gb_CxxObject_get_dep_target,$(2)) \ - $(4) $(5) \ -I$(dir $(3)) \ - $(6)) + $(INCLUDE_STL) $(INCLUDE)) endef @@ -162,15 +171,15 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS))) endef gb_LinkTarget__RPATHS := \ - URELIB:$$$$ORIGIN \ - UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ - OOOLIB:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \ - BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \ - SDKBIN:$$$$ORIGIN/../../ure-link/lib \ - NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \ + URELIB:\dORIGIN \ + UREBIN:\dORIGIN/../lib:\dORIGIN \ + OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ + BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \ + SDKBIN:\dORIGIN/../../ure-link/lib \ + NONEBIN:\dORIGIN/../lib:\dORIGIN \ -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS) -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) ifeq ($(gb_DEBUGLEVEL),2) gb_LinkTarget_CXXFLAGS += -g @@ -180,19 +189,35 @@ endif gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) -define gb_LinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) +define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ - $(3) \ - $(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(subst \d,$$,$(RPATH)) $(LDFLAGS) \ + $(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1)) endef +define gb_LinkTarget__command_staticlink +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(gb_AR) -rsu $(1) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + 2> /dev/null) +endef + +define gb_LinkTarget__command +$(call gb_Output_announce,$(2),$(true),LNK,4) +$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1))) +$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) +endef # Library class @@ -241,31 +266,30 @@ gb_Library_FILENAMES := \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ -gb_Library__Library_platform = - -define gb_Library_get_rpath -'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' -endef - gb_Library_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \ + $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ +define gb_Library_get_rpath +'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' +endef + +define gb_Library_Library_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) + +endef + # StaticLibrary class gb_StaticLibrary_DEFS := -gb_StaticLibrary_TARGETTYPEFLAGS := \ - -Bstatic \ - -xar \ - gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) @@ -276,24 +300,52 @@ gb_StaticLibrary_FILENAMES := \ gb_StaticLibrary_StaticLibrary_platform = + # Executable class gb_Executable_EXT := -gb_Executable_TARGETTYPEFLAGS := -gb_Executable__Executable_platform = - -define gb_Executable_get_rpath -'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' -endef gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ - $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \ + $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \ +define gb_Executable_get_rpath +'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' +endef + +define gb_Executable_Executable_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1)) + +endef + + +# CppunitTest class + +gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib +gb_CppunitTest_SYSPRE := libtest_ +gb_CppunitTest_EXT := .so +gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) +gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) + +define gb_CppunitTest_CppunitTest_platform +$(call gb_LinkTarget_get_target,$(2)) : RPATH := + +endef + +# JunitTest class + +define gb_JunitTest_JunitTest_platform +$(call gb_JunitTest_get_target,$(1)) : DEFS := \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \ + -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \ + -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ + +endef + # SdiTarget class gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib @@ -312,7 +364,8 @@ gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDI define gb_SrsPartTarget__command_dep $(call gb_Helper_abbreviate_dirs_native,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ - $(3) $(4) \ + $(INCLUDE) \ + $(DEFS) \ $(2) \ -f - \ | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ @@ -327,8 +380,10 @@ endef # ComponentTarget -gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib -gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib +gb_Library_COMPONENTPREFIXES := \ + OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ + URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ -# vim: set noet sw=4 ts=4: +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index be8f34bdd258..e85bdb5a0f80 100755 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -28,12 +28,24 @@ GUI := WNT COM := MSC -gb_MKTEMP := mktemp -p +# set tmpdir to some mixed case path, suitable for native tools +gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp)) +gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) -t gbuild.XXXXXX gb_CC := cl gb_CXX := cl gb_LINK := link gb_AWK := awk +gb_CLASSPATHSEP := ; + +# use CC/CXX if they are nondefaults +ifneq ($(origin CC),default) +gb_CC := $(CC) +gb_GCCP := $(CC) +endif +ifneq ($(origin CXX),default) +gb_CXX := $(CXX) +endif gb_OSDEFS := \ -DWINVER=0x0500 \ @@ -99,7 +111,6 @@ gb_CFLAGS := \ -wd4800 \ -wd4820 \ -wd4826 \ - -WX \ -Zc:forScope,wchar_t- \ -Zm500 \ @@ -146,10 +157,20 @@ gb_CXXFLAGS := \ -wd4800 \ -wd4820 \ -wd4826 \ - -WX \ -Zc:forScope,wchar_t- \ -Zm500 \ +gb_STDLIBS := \ + uwinapi \ + kernel32 \ + msvcrt \ + oldnames \ + +ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +gb_CFLAGS_WERROR := -WX +gb_CXXFLAGS_WERROR := -WX +endif + gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -EHa \ @@ -187,21 +208,21 @@ else gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy- endif +gb_COMPILERNOOPTFLAGS := -Od -# Helper class -gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR)) -gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR)) -gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR)) -gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR)) +# Helper class +gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') +gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') +gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') +gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') define gb_Helper_abbreviate_dirs_native -R=$(gb_Helper_REPODIR_NATIVE) && \ -$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,S=$(gb_Helper_SRCDIR_NATIVE) && \ -$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \ -$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1))))))))) +R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \ +$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1))))))))) endef + # CObject class ifeq ($(gb_FULLDEPS),$(true)) @@ -231,16 +252,16 @@ $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ unset INCLUDE && \ $(gb_CC) \ - $(4) $(5) \ + $(DEFS) $(CFLAGS) -Fd$(PDBFILE) \ + $(PCHFLAGS) \ -I$(dir $(3)) \ - $(6) \ + $(INCLUDE) \ -c $(3) \ -Fo$(1)) -$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) +$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE)) endef - # CxxObject class ifeq ($(gb_FULLDEPS),$(true)) @@ -253,13 +274,13 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(3) \ -f - \ | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(1) \ - -v OUTDIR=$(OUTDIR)/ \ + -v OBJECTFILE=$(1) \ + -v OUTDIR=$(OUTDIR)/ \ -v WORKDIR=$(WORKDIR)/ \ -v SRCDIR=$(SRCDIR)/ \ - -v REPODIR=$(REPODIR)/ \ + -v REPODIR=$(REPODIR)/ \ > $(call gb_CxxObject_get_dep_target,$(2))) -endef + endef else gb_CxxObject__command_deponcompile = endif @@ -270,21 +291,20 @@ $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ unset INCLUDE && \ $(gb_CXX) \ - $(4) $(5) \ + $(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\ + $(PCHFLAGS) \ -I$(dir $(3)) \ - $(6) \ + $(INCLUDE_STL) $(INCLUDE) \ -c $(3) \ -Fo$(1)) -$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - +$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE)) endef # PrecompiledHeader class gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \ - -Fp$(call gb_PrecompiledHeader_get_target,$(1)) \ - -Fd$(call gb_PrecompiledHeader_get_target,$(1)).pdb + -Fp$(call gb_PrecompiledHeader_get_target,$(1)) ifeq ($(gb_FULLDEPS),$(true)) define gb_PrecompiledHeader__command_deponcompile @@ -307,27 +327,25 @@ else gb_PrecompiledHeader__command_deponcompile = endif + define gb_PrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ unset INCLUDE && \ $(gb_CXX) \ - $(4) $(5) \ + $(4) $(5) -Fd$(PDBFILE) \ -I$(dir $(3)) \ $(6) \ -c $(3) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fd$(1).pdb -Fo$(1).obj) -rm $(1).obj + -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - endef # NoexPrecompiledHeader class gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \ - -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) \ - -Fd$(call gb_NoexPrecompiledHeader_get_target,$(1)).pdb + -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) ifeq ($(gb_FULLDEPS),$(true)) define gb_NoexPrecompiledHeader__command_deponcompile @@ -350,27 +368,26 @@ else gb_NoexPrecompiledHeader__command_deponcompile = endif + define gb_NoexPrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \ unset INCLUDE && \ $(gb_CXX) \ - $(4) $(5) \ + $(4) $(5) -Fd$(PDBFILE) \ -I$(dir $(3)) \ $(6) \ -c $(3) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fd$(1).pdb -Fo$(1).obj) -rm $(1).obj + -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - endef # LinkTarget class -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS) -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) gb_LinkTarget_INCLUDE :=\ $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \ @@ -378,25 +395,34 @@ gb_LinkTarget_INCLUDE :=\ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb + define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \ - echo "$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object)))" > $${RESPONSEFILE} && \ + rm -f $(1) && \ + RESPONSEFILE=`$(gb_MKTEMP)` && \ + echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(PCHOBJS)" > $${RESPONSEFILE} && \ $(gb_LINK) \ - $(3) \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ + $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ + $(LDFLAGS) \ @$${RESPONSEFILE} \ - $(foreach lib,$(4),$(call gb_Library_get_filename,$(lib))) \ - $(foreach lib,$(5),$(call gb_StaticLibrary_get_filename,$(lib))) \ - $(subst -out: -implib:$(1),-out:$(1),-out:$(DLLTARGET) -implib:$(1)) && rm $${RESPONSEFILE}) + $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \ + $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \ + $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \ + $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC) endef # Library class -gb_Library_DEFS := -D_DLL_ -D_DLL +gb_Library_DEFS := -D_DLL gb_Library_TARGETTYPEFLAGS := -DLL gb_Library_get_rpath := @@ -424,17 +450,17 @@ gb_Library_PLAINLIBS_NONE += \ winspool \ z \ -gb_LinkTarget_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOOLIB) \ +gb_Library_LAYER := \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -464,13 +490,13 @@ gb_Library_DLLFILENAMES :=\ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \ - define gb_Library_Library_platform $(call gb_LinkTarget_set_dlltarget,$(2),$(3)) $(call gb_LinkTarget_set_auxtargets,$(2),\ $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \ $(3).manifest \ + $(call gb_LinkTarget_get_pdbfile,$(2)) \ $(patsubst %.dll,%.pdb,$(3)) \ $(patsubst %.dll,%.ilk,$(3)) \ ) @@ -488,6 +514,9 @@ endif $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3)) +$(call gb_LinkTarget_get_target,$(2)) \ +$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) + endef define gb_Library_get_dllname @@ -509,7 +538,15 @@ gb_StaticLibrary_FILENAMES := \ gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) -gb_StaticLibrary_StaticLibrary_platform = +define gb_StaticLibrary_StaticLibrary_platform +$(call gb_LinkTarget_get_target,$(2)) \ +$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) + +$(call gb_LinkTarget_set_auxtargets,$(2),\ + $(call gb_LinkTarget_get_pdbfile,$(2)) \ +) + +endef # Executable class @@ -520,6 +557,7 @@ gb_Executable_get_rpath := define gb_Executable_Executable_platform $(call gb_LinkTarget_set_auxtargets,$(2),\ $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \ + $(call gb_LinkTarget_get_pdbfile,$(2)) \ $(call gb_LinkTarget_get_target,$(2)).manifest \ ) @@ -527,8 +565,80 @@ $(call gb_Executable_get_target,$(1)) \ $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest $(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest) +$(call gb_LinkTarget_get_target,$(2)) \ +$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) + endef +# CppunitTest class + +gb_CppunitTest_CPPTESTPRECOMMAND := +gb_CppunitTest_SYSPRE := itest_ +gb_CppunitTest_EXT := .lib +gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) +gb_CppunitTest_get_libfilename = test_$(1).dll + +define gb_CppunitTest_CppunitTest_platform +$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) + +$(call gb_LinkTarget_set_auxtargets,$(2),\ + $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \ + $(3).manifest \ + $(patsubst %.dll,%.pdb,$(3)) \ + $(call gb_LinkTarget_get_pdbfile,$(2)) \ + $(patsubst %.dll,%.ilk,$(3)) \ +) + +$(call gb_LinkTarget_get_target,$(2)) \ +$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) + +endef + +# JunitTest class + +gb_defaultlangiso := en-US +gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip + +ifeq ($(OOO_TEST_SOFFICE),) + + +# Work around Windows problems with long pathnames (see issue 50885) by +# installing into the temp directory instead of the module output tree (in which +# case $(target).instpath contains the path to the temp installation, +# which is removed after smoketest); can be removed once issue 50885 is fixed; +# on other platforms, a single installation to solver is created in +# smoketestoo_native. + +# for now, no dependency on $(shell ls $(gb_smoketest_instset)) +# because that doesn't work before the instset is built +# and there is not much of a benefit anyway (gbuild not knowing about smoketest) +define gb_JunitTest_JunitTest_platform_longpathname_hack +$(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).instpath +$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath) + +$(call gb_JunitTest_get_target,$(1)).instpath : + INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \ + && unzip -d "$$$${INST_DIR}" $$(gb_smoketest_instset) \ + && mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\ + && mkdir -p $$(dir $$@) \ + && echo "$$$${INST_DIR}" > $$@ + +endef +else # OOO_TEST_SOFFICE +gb_JunitTest_JunitTest_platform_longpathname_hack = +endif # OOO_TEST_SOFFICE + +define gb_JunitTest_JunitTest_platform +$(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1)) + +$(call gb_JunitTest_get_target,$(1)) : DEFS := \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \ + -Dorg.openoffice.test.arg.env=PATH \ + -Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \ + +endef + + # SdiTarget class gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" @@ -546,7 +656,8 @@ ifeq ($(gb_FULLDEPS),$(true)) define gb_SrsPartTarget__command_dep $(call gb_Helper_abbreviate_dirs_native,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ - $(3) $(4) \ + $(INCLUDE) \ + $(DEFS) \ $(2) \ -f - \ | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ @@ -564,7 +675,9 @@ endif # ComponentTarget -gb_ComponentTarget_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" -gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ +gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +gb_Library_COMPONENTPREFIXES := \ + OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \ + URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 430a4edb3f05..b9eec5eaf417 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -28,7 +28,7 @@ GUI := WNT COM := GCC -gb_MKTEMP := mktemp -p +gb_MKTEMP := mktemp -t gbuild.XXXXXX gb_CC := $(CC) gb_CXX := $(CXX) @@ -120,6 +120,11 @@ gb_CXXFLAGS := \ -pipe \ -nostdinc \ +ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) +gb_CFLAGS_WERROR := -Werror +gb_CXXFLAGS_WERROR := -Werror +endif + ifneq ($(SYSBASE),) gb_CXXFLAGS += --sysroot=$(SYSBASE) gb_CFLAGS += --sysroot=$(SYSBASE) @@ -158,19 +163,30 @@ else gb_COMPILEROPTFLAGS := -Os endif +gb_COMPILERNOOPTFLAGS := -O0 + +gb_STDLIBS := \ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + # Helper class -gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR)) -gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR)) -gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR)) -gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR)) +gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') +gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') +gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') +gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') define gb_Helper_abbreviate_dirs_native -R=$(gb_Helper_REPODIR_NATIVE) && \ -$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,S=$(gb_Helper_SRCDIR_NATIVE) && \ -$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \ -$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1))))))))) +R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \ +$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1))))))))) endef # CObject class @@ -200,14 +216,13 @@ define gb_CObject__command $(call gb_Output_announce,$(2),$(true),C ,3) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - unset INCLUDE && \ $(gb_CC) \ + $(DEFS) $(CFLAGS) \ -c $(3) \ -o $(1) \ - $(4) $(5) \ -I$(dir $(3)) \ - $(6)) -$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) + $(INCLUDE)) +$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE)) endef @@ -239,15 +254,13 @@ define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - unset INCLUDE && \ $(gb_CXX) \ + $(DEFS) $(CXXFLAGS) \ -c $(3) \ -o $(1) \ - $(4) $(5) \ -I$(dir $(3)) \ - $(6)) -$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - + $(INCLUDE_STL) $(INCLUDE)) +$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CXXFLAGS),$(INCLUDE_STL) $(INCLUDE)) endef @@ -284,7 +297,6 @@ define gb_PrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ - unset INCLUDE && \ $(gb_CXX) \ -x c++-header \ $(4) $(5) \ @@ -328,7 +340,6 @@ define gb_NoexPrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \ - unset INCLUDE && \ $(gb_CXX) \ -x c++-header \ $(4) $(5) \ @@ -343,8 +354,8 @@ endef # LinkTarget class -gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS) -gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS) +gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) ifeq ($(gb_DEBUGLEVEL),2) gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline @@ -358,66 +369,73 @@ gb_LinkTarget_INCLUDE :=\ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) -define gb_LinkTarget__command -$(if $(subst -static $(LDFLAGS),,$(TARGETTYPE_FLAGS) $(LDFLAGS)),$(if $(DLLTARGET),$(call gb_SharedLinkTarget__command,$(1),$(2),$(3),$(4),$(5),$(6),$(7)),$(call gb_ExecutableLinkTarget__command,$(1),$(2),$(3),$(4),$(5),$(6),$(7))),$(call gb_StaticLinkTarget__command,$(1),$(2),$(6),$(7))) -endef - -define gb_SharedLinkTarget__command +define gb_LinkTarget__command_dynamiclinkexecutable $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \ - echo "$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object)))" > $${RESPONSEFILE} && \ + RESPONSEFILE=`$(gb_MKTEMP)` && \ + echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \ $(gb_LINK) \ - $(3) \ - --enable-auto-image-base \ - -e _DllMainCRTStartup@12 \ - $(gb_MINGWLIBDIR)/dllcrt2.o \ + $(gb_Executable_TARGETTYPEFLAGS) \ + $(LDFLAGS) \ + $(gb_MINGWLIBDIR)/crt2.o \ $(MINGW_CLIB_DIR)/crtbegin.o \ @$${RESPONSEFILE} \ - --start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \ - --start-group $(patsubst %.dll,-l%,$(foreach lib,$(4),$(call gb_Library_get_dllname,$(lib)))) --end-group \ + --start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \ + --start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \ $(MINGW_CLIB_DIR)/crtend.o \ - -Map $(basename $(DLLTARGET)).map \ - -o $(DLLTARGET) && touch $(1)) + -Map $(basename $(1)).map \ + -o $(1)) endef -define gb_ExecutableLinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) +define gb_LinkTarget__command_dynamiclinklibrary $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \ - echo "$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object)))" > $${RESPONSEFILE} && \ + rm -f $(1) && \ + RESPONSEFILE=`$(gb_MKTEMP)` && \ + echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \ $(gb_LINK) \ - $(3) \ - $(gb_MINGWLIBDIR)/crt2.o \ + $(gb_Library_TARGETTYPEFLAGS) \ + $(LDFLAGS) \ + --enable-auto-image-base \ + -e _DllMainCRTStartup@12 \ + $(gb_MINGWLIBDIR)/dllcrt2.o \ $(MINGW_CLIB_DIR)/crtbegin.o \ @$${RESPONSEFILE} \ - --start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \ - --start-group $(patsubst %.dll,-l%,$(foreach lib,$(4),$(call gb_Library_get_dllname,$(lib)))) --end-group \ + --start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \ + --start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \ $(MINGW_CLIB_DIR)/crtend.o \ - -Map $(basename $(1)).map \ - -o $(1)) + -Map $(basename $(DLLTARGET)).map \ + -o $(DLLTARGET) && touch $(1)) endef -define gb_StaticLinkTarget__command -$(call gb_Output_announce,$(2),$(true),LNK,4) +define gb_LinkTarget__command_staticlinklibrary $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \ - echo "$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(6),$(call gb_CObject_get_target,$(object)))" > $${RESPONSEFILE} && \ + RESPONSEFILE=`$(gb_MKTEMP)` && \ + echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \ $(gb_AR) -rsu\ $(1) \ @$${RESPONSEFILE}) endef +define gb_LinkTarget__command +$(call gb_Output_announce,$(2),$(true),LNK,4) +$(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2))) +$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2))) +$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1))) +endef + # Library class -gb_Library_DEFS := -D_DLL_ -D_DLL +gb_Library_DEFS := -D_DLL gb_Library_TARGETTYPEFLAGS := -shared gb_Library_get_rpath := @@ -445,16 +463,17 @@ gb_Library_PLAINLIBS_NONE += \ uwinapi \ z \ -gb_LinkTarget_LAYER := \ - $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \ - $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOOLIB) \ +gb_Library_LAYER := \ + $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \ + $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -510,7 +529,6 @@ endef # StaticLibrary class gb_StaticLibrary_DEFS := -gb_StaticLibrary_TARGETTYPEFLAGS := -static gb_StaticLibrary_SYSPRE := lib gb_StaticLibrary_PLAINEXT := .a gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT) @@ -521,11 +539,7 @@ gb_StaticLibrary_FILENAMES := \ gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) -define gb_StaticLibrary_StaticLibrary_platform -$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := staticlib -$(call gb_LinkTarget_get_target,$(2)) : LAYER := - -endef +gb_StaticLibrary_StaticLibrary_platform = # Executable class @@ -535,6 +549,23 @@ gb_Executable_get_rpath := gb_Executable_Executable_platform = +# CppunitTest class + +gb_CppunitTest_CPPTESTPRECOMMAND := +gb_CppunitTest_SYSPRE := itest_ +gb_CppunitTest_EXT := .lib +gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) +gb_CppunitTest_get_libfilename = test_$(1).dll + +define gb_CppunitTest_CppunitTest_platform +$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) + +$(call gb_LinkTarget_set_auxtargets,$(2),\ + $(patsubst %.dll,%.map,$(3)) \ +) + +endef + # SdiTarget class gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" @@ -552,7 +583,8 @@ ifeq ($(gb_FULLDEPS),$(true)) define gb_SrsPartTarget__command_dep $(call gb_Helper_abbreviate_dirs_native,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ - $(3) $(4) \ + $(INCLUDE) \ + $(DEFS) \ $(2) \ -f - \ | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ @@ -569,7 +601,9 @@ endif # ComponentTarget -gb_ComponentTarget_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" -gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ +gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +gb_Library_COMPONENTPREFIXES := \ + OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \ + URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/processdelivered.awk b/solenv/gbuild/processdelivered.awk index 7bf574c45524..9fdb2ec30c74 100644 --- a/solenv/gbuild/processdelivered.awk +++ b/solenv/gbuild/processdelivered.awk @@ -30,6 +30,7 @@ BEGIN { FS=":" } -length($1) > 0 && length($2) > 0 { - print "COPY " $1 " " $2; +{ + if( NF == 2 ) + print "COPY " $1 " " $2; } diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk index c5efb1e0ad3d..9014427fa461 100644 --- a/solenv/gbuild/processdeps.awk +++ b/solenv/gbuild/processdeps.awk @@ -47,7 +47,7 @@ function mangle_path(path) { gsub("\\\\", "/", path); if( path ~ /^[a-zA-Z]:/ ) - path = toupper(substr(path,0,1)) substr(path,2); + path = tolower(substr(path,0,1)) substr(path,2); gsub(WORKDIR, "$(WORKDIR)/", path); gsub(OUTDIR, "$(OUTDIR)/", path); gsub(SRCDIR, "$(SRCDIR)/", path); @@ -58,11 +58,15 @@ function mangle_path(path) { } BEGIN { + WORKDIR = tolower(substr(WORKDIR,0,1)) substr(WORKDIR,2); + OUTDIR = tolower(substr(OUTDIR,0,1)) substr(OUTDIR,2); + SRCDIR = tolower(substr(SRCDIR,0,1)) substr(SRCDIR,2); + REPODIR = tolower(substr(REPODIR,0,1)) substr(REPODIR,2); # print "# WORKDIR=" WORKDIR; # print "# OUTDIR=" OUTDIR; # print "# SRCDIR=" SRCDIR; # print "# REPODIR=" REPODIR; - print mangle_path(OBJECTFILE) ": \\"; + print mangle_path(OBJECTFILE) ": \\"; } /^[^#]/ { diff --git a/solenv/gbuild/templates/AllLangResTarget.mk b/solenv/gbuild/templates/AllLangResTarget.mk new file mode 100644 index 000000000000..c38b8ea42fc2 --- /dev/null +++ b/solenv/gbuild/templates/AllLangResTarget.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +# RES is the name of the resource; its file name will be RES-LOCALE.res +# MODULE is the name of the code module the makefile is located in + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,RES)) + +# declaration of images folder (e.g. default_images/MODULE/res) +$(eval $(call gb_AllLangResTarget_set_reslocation,RES,MODULE)) + +# declaration of a resource intermediate file (srs) +$(eval $(call gb_AllLangResTarget_add_srs,RES, RES/res)) +$(eval $(call gb_SrsTarget_SrsTarget,RES/res)) + +# add any additional include paths here +$(eval $(call gb_SrsTarget_set_include,RES/res,\ + $$(INCLUDE) \ +)) + +# add src files here (complete path relative to repository root) +$(eval $(call gb_SrsTarget_add_files,RES/res,\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/CppunitTest.mk b/solenv/gbuild/templates/CppunitTest.mk new file mode 100644 index 000000000000..56f3452ede14 --- /dev/null +++ b/solenv/gbuild/templates/CppunitTest.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME)) + +$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\ + $$(INCLUDE) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk new file mode 100644 index 000000000000..691e53012d58 --- /dev/null +++ b/solenv/gbuild/templates/Executable.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,EXEC)) + +$(eval $(call gb_Executable_set_include,EXEC,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_set_cxxflags,EXEC,\ + $$(CXXFLAGS) \ +)) + +$(eval $(call gb_Executable_add_linked_libs,EXEC,\ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_exception_objects,EXEC,\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/JunitTest.mk b/solenv/gbuild/templates/JunitTest.mk new file mode 100644 index 000000000000..4492d9ef45f3 --- /dev/null +++ b/solenv/gbuild/templates/JunitTest.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,MODULE_TYPE)) + +$(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \ +)) + +$(eval $(call gb_JunitTest_add_jars,MODULE_TYPE,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,MODULE_TYPE,\ +)) + +$(eval $(call gb_JunitTest_add_classes,MODULE_COMPLEX,\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk new file mode 100644 index 000000000000..2e62cfe9a64b --- /dev/null +++ b/solenv/gbuild/templates/Library.mk @@ -0,0 +1,86 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +# MODULE is the name of the module the makefile is located in + +# declare a library +# LIB is the name of the library as it is found in Repository.mk +$(eval $(call gb_Library_Library,LIB)) + +# declare packages that will be delivered before compilation of LIB +# learn more about TYPE in the Package.mk template +$(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE)) + +# for platforms supporting PCH: declare the location of the pch file +# this is the name of the cxx file (without extension) +$(eval $(call gb_Library_add_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE)) + +# in case UNO services are exported: declare location of component file +$(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,LIB,\ + $$(INCLUDE) \ +)) + +# add any additional definitions to be set for compilation here +# (e.g. -DLIB_DLLIMPLEMENTATION) +$(eval $(call gb_Library_set_defs,LIB,\ + $$(DEFS) \ +)) + +# add libraries to be linked to LIB; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,LIB,\ + $(gb_STDLIBS) \ +)) + +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension +$(eval $(call gb_Library_add_exception_objects,LIB,\ +)) + +# in case sdi files need to be processed: declare "root" (main) sdi target and sdi header target +# "ROOT_SDI_FILE" is the file that is handed over to svidl (all other sdi files are included in the root file) +$(eval $(call gb_Library_add_sdi_headers,LIB,MODULE/sdi/ROOT_SDI_FILE)) +$(eval $(call gb_SdiTarget_SdiTarget,MODULE/sdi/ROOT_SDI_FILE,MODULE/sdi/LIB)) + +# add any additional include paths for sdi processing here +$(eval $(call gb_SdiTarget_set_include,MODULE/sdi/ROOT_SDI_FILE,\ + $$(INCLUDE) \ +)) + +# this is an example how files can be added that require special compiler settings, e.g. building without optimizing +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_cxxobjects,LIB,\ + MODULE/source/foo/bar \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/solenv/gbuild/templates/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/Module.mk b/solenv/gbuild/templates/Module.mk new file mode 100644 index 000000000000..6adb9bfab4a2 --- /dev/null +++ b/solenv/gbuild/templates/Module.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +# replace MODULE by the name of the module you are creating + +$(eval $(call gb_Module_Module,MODULE)) + +# the targets to be inserted are their file names without .mk extension +$(eval $(call gb_Module_add_targets,MODULE,\ +)) + +# add any runtime tests (unit tests) here +# remove if no tests +$(eval $(call gb_Module_add_check_targets,MODULE,\ +)) + +# add any subsequent checks (e.g. complex tests) here +$(eval $(call gb_Module_add_subsequentcheck_targets,MODULE,\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/Package.mk b/solenv/gbuild/templates/Package.mk new file mode 100644 index 000000000000..1b9ae0315990 --- /dev/null +++ b/solenv/gbuild/templates/Package.mk @@ -0,0 +1,42 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +# MODULE is the name of the module the makefile is located in + +# TYPE is an arbitrary name that should denote what is inside this package +# typical names are "inc", "uiconfig", "xml" etc. +# "MODULE_TYPE" is the package name +# the file name of the corresponding makefile should be Package_TYPE.mk +# SOURCE is the name of the root folder of the package that shall be delivered +$(eval $(call gb_Package_Package,MODULE_TYPE,$(SRCDIR)/MODULE/SOURCE)) + +# add files to the package +# SOURCE_RELPATH/file.ext is the name of the source file (relative to the root give above) +# DESTINATION_RELPATH/file.ext is the destination file (relative to $(OUTDIR)) +$(eval $(call gb_Package_add_file,MODULE_TYPE,DESTINATION_RELPATH/file.ext,SOURCE_RELPATH/file.ext)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/StaticLibrary.mk b/solenv/gbuild/templates/StaticLibrary.mk new file mode 100644 index 000000000000..5b0176b8b41c --- /dev/null +++ b/solenv/gbuild/templates/StaticLibrary.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_StaticLibrary_StaticLibrary,LIB)) + +$(eval $(call gb_StaticLibrary_add_package_headers,LIB,MODULE_inc)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\ +)) + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk new file mode 100644 index 000000000000..e312a7ccab65 --- /dev/null +++ b/solenv/gbuild/templates/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 4c67a1d58c97..561b4224e649 100644..100755 --- a/solenv/inc/_tg_rslb.mk +++ b/solenv/inc/_tg_rslb.mk @@ -15,7 +15,8 @@ $(RSC_MULTI1) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -30,7 +31,8 @@ $(RSC_MULTI1) : \ -fs={$(BIN)/$(RESLIB1NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -76,7 +78,8 @@ $(RSC_MULTI2) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -91,7 +94,8 @@ $(RSC_MULTI2) : \ -fs={$(BIN)/$(RESLIB2NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -137,7 +141,8 @@ $(RSC_MULTI3) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -152,7 +157,8 @@ $(RSC_MULTI3) : \ -fs={$(BIN)/$(RESLIB3NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -198,7 +204,8 @@ $(RSC_MULTI4) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -213,7 +220,8 @@ $(RSC_MULTI4) : \ -fs={$(BIN)/$(RESLIB4NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -259,7 +267,8 @@ $(RSC_MULTI5) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -274,7 +283,8 @@ $(RSC_MULTI5) : \ -fs={$(BIN)/$(RESLIB5NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -320,7 +330,8 @@ $(RSC_MULTI6) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -335,7 +346,8 @@ $(RSC_MULTI6) : \ -fs={$(BIN)/$(RESLIB6NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -381,7 +393,8 @@ $(RSC_MULTI7) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -396,7 +409,8 @@ $(RSC_MULTI7) : \ -fs={$(BIN)/$(RESLIB7NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -442,7 +456,8 @@ $(RSC_MULTI8) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -457,7 +472,8 @@ $(RSC_MULTI8) : \ -fs={$(BIN)/$(RESLIB8NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -503,7 +519,8 @@ $(RSC_MULTI9) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -518,7 +535,8 @@ $(RSC_MULTI9) : \ -fs={$(BIN)/$(RESLIB9NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ @@ -564,7 +582,8 @@ $(RSC_MULTI10) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -579,7 +598,8 @@ $(RSC_MULTI10) : \ -fs={$(BIN)/$(RESLIB10NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 41d48c839949..ac930bdd8a08 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -333,7 +333,7 @@ $(SHL1TARGETN) : \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -357,7 +357,7 @@ $(SHL1TARGETN) : \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -529,7 +529,6 @@ $(SHL1TARGETN) : \ $(SHL1STDLIBS:^"-l") \ $(SHL1LINKRES) \ $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -877,7 +876,7 @@ $(SHL2TARGETN) : \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -901,7 +900,7 @@ $(SHL2TARGETN) : \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -1073,7 +1072,6 @@ $(SHL2TARGETN) : \ $(SHL2STDLIBS:^"-l") \ $(SHL2LINKRES) \ $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -1421,7 +1419,7 @@ $(SHL3TARGETN) : \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -1445,7 +1443,7 @@ $(SHL3TARGETN) : \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -1617,7 +1615,6 @@ $(SHL3TARGETN) : \ $(SHL3STDLIBS:^"-l") \ $(SHL3LINKRES) \ $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -1965,7 +1962,7 @@ $(SHL4TARGETN) : \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -1989,7 +1986,7 @@ $(SHL4TARGETN) : \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2161,7 +2158,6 @@ $(SHL4TARGETN) : \ $(SHL4STDLIBS:^"-l") \ $(SHL4LINKRES) \ $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -2509,7 +2505,7 @@ $(SHL5TARGETN) : \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2533,7 +2529,7 @@ $(SHL5TARGETN) : \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2705,7 +2701,6 @@ $(SHL5TARGETN) : \ $(SHL5STDLIBS:^"-l") \ $(SHL5LINKRES) \ $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -3053,7 +3048,7 @@ $(SHL6TARGETN) : \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3077,7 +3072,7 @@ $(SHL6TARGETN) : \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3249,7 +3244,6 @@ $(SHL6TARGETN) : \ $(SHL6STDLIBS:^"-l") \ $(SHL6LINKRES) \ $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -3597,7 +3591,7 @@ $(SHL7TARGETN) : \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3621,7 +3615,7 @@ $(SHL7TARGETN) : \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3793,7 +3787,6 @@ $(SHL7TARGETN) : \ $(SHL7STDLIBS:^"-l") \ $(SHL7LINKRES) \ $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -4141,7 +4134,7 @@ $(SHL8TARGETN) : \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4165,7 +4158,7 @@ $(SHL8TARGETN) : \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4337,7 +4330,6 @@ $(SHL8TARGETN) : \ $(SHL8STDLIBS:^"-l") \ $(SHL8LINKRES) \ $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -4685,7 +4677,7 @@ $(SHL9TARGETN) : \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4709,7 +4701,7 @@ $(SHL9TARGETN) : \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4881,7 +4873,6 @@ $(SHL9TARGETN) : \ $(SHL9STDLIBS:^"-l") \ $(SHL9LINKRES) \ $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -5229,7 +5220,7 @@ $(SHL10TARGETN) : \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -5253,7 +5244,7 @@ $(SHL10TARGETN) : \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -5425,7 +5416,6 @@ $(SHL10TARGETN) : \ $(SHL10STDLIBS:^"-l") \ $(SHL10LINKRES) \ $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 5d99bdeb0e2a..b7b49c4aec3b 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -105,10 +105,25 @@ cpptest : $(MISC)/$(TARGET)/installation.flag .END .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" -javatest .PHONY : $(JAVATARGET) +javatest_% .PHONY : $(JAVATARGET) + $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ + '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ + -Dorg.openoffice.test.arg.soffice=$(my_soffice) \ + -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ + $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \ + org.junit.runner.JUnitCore \ + $(subst,/,. $(PACKAGE)).$(@:s/javatest_//) $(RM) -r $(MISC)/$(TARGET)/user - $(MKDIRHIER) $(MISC)/$(TARGET)/user - $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" + $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag +javatest : $(MISC)/$(TARGET)/installation.flag +.END +javatest .PHONY : $(JAVATARGET) + $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ -Dorg.openoffice.test.arg.soffice=$(my_soffice) \ -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk new file mode 100644 index 000000000000..32045cbf6262 --- /dev/null +++ b/solenv/inc/langlist.mk @@ -0,0 +1,163 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# 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. +# +#************************************************************************* + + +completelangiso=af \ +ar \ +as \ +as-IN \ +ast \ +be-BY \ +bo \ +bg \ +br \ +brx \ +bn \ +bn-BD \ +bn-IN \ +bs \ +by \ +ca \ +ca-XV \ +cs \ +cy \ +da \ +de \ +dgo \ +dz \ +el \ +en-GB \ +en-US \ +en-ZA \ +eo \ +es \ +et \ +eu \ +fa \ +fi \ +fr \ +ga \ +gd \ +gl \ +gu \ +gu-IN \ +he \ +hi \ +hi-IN \ +hr \ +hu \ +is \ +it \ +ja \ +kid \ +ky \ +ka \ +kab \ +kk \ +km \ +kn \ +ko \ +kok \ +ks \ +ku \ +lo \ +lt \ +lv \ +mai \ +mk \ +mn \ +mni \ +ms \ +ml \ +ml-IN \ +mr \ +mr-IN \ +my \ +ne \ +nb \ +nl \ +nn \ +nr \ +ns \ +nso \ +om \ +oms \ +oc \ +or \ +or-IN \ +pap \ +pa \ +pa-IN \ +pl \ +ps \ +pt \ +pt-BR \ +gug \ +pyg \ +ro \ +ru \ +rw \ +sat \ +sa \ +sa-IN \ +si \ +sc \ +sd \ +sq \ +sk \ +sl \ +sh \ +son \ +sr \ +ss \ +st \ +sv \ +sw \ +sw-TZ \ +te \ +te-IN \ +ti \ +ti-ER \ +ta \ +ta-IN \ +tlh \ +th \ +tn \ +tr \ +ts \ +tg \ +ug \ +ur \ +ur-IN \ +uk \ +uz \ +ve \ +vi \ +xh \ +zh-CN \ +zh-TW \ +zu diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 4f7ffbf40851..7ee473cb116f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -59,8 +59,7 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) -.INCLUDE .IGNORE : comphelper/version.mk -COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID) +COMPHELPERLIB=-lcomphelp$(COMID) CONNECTIVITYLIB=-lconnectivity LDAPBERLIB=-lldapber TOOLSLIBST=-latools @@ -182,9 +181,7 @@ SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) BASICLIB=-lsb$(DLLPOSTFIX) -.IF "$(ENABLE_VBA)"=="YES" VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX) -.ENDIF DBTOOLSLIB=-ldbtools$(DLLPOSTFIX) HM2LIBSH=-lhmwrpdll HM2LIBST=-lhmwrap diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 7e9c2e2bf834..240547d98fa7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m98(Build:9568) -BUILD=9568 -LAST_MINOR=m98 +RSCREVISION=300m100(Build:9571) +BUILD=9571 +LAST_MINOR=m100 SOURCEVERSION=DEV300 diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h index 68f85b6c0f65..8a36af4c4389 100644 --- a/solenv/inc/postmac.h +++ b/solenv/inc/postmac.h @@ -25,8 +25,8 @@ * ************************************************************************/ -#undef Boolean -#undef BOOL +//#undef Boolean +//#undef BOOL #undef Button #undef Byte #undef Control @@ -46,7 +46,7 @@ //#undef ShowWindow #undef StringPtr #undef DirInfo -#undef ULONG +//#undef ULONG #undef Line #undef TimeValue #undef Pattern diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 888098fde3df..59d37a95405e 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -30,140 +30,6 @@ defaultlangiso=en-US # Complete list of all supported ISO codes -completelangiso=af \ -ar \ -as \ -as-IN \ -ast \ -be-BY \ -bo \ -bg \ -br \ -brx \ -bn \ -bn-BD \ -bn-IN \ -bs \ -by \ -ca \ -ca-XV \ -cs \ -cy \ -da \ -de \ -dgo \ -dz \ -el \ -en-GB \ -en-US \ -en-ZA \ -eo \ -es \ -et \ -eu \ -fa \ -fi \ -fr \ -ga \ -gd \ -gl \ -gu \ -gu-IN \ -he \ -hi \ -hi-IN \ -hr \ -hu \ -is \ -it \ -ja \ -kid \ -ky \ -ka \ -kab \ -kk \ -km \ -kn \ -ko \ -kok \ -ks \ -ku \ -lo \ -lt \ -lv \ -mai \ -mk \ -mn \ -mni \ -ms \ -ml \ -ml-IN \ -mr \ -mr-IN \ -my \ -ne \ -nb \ -nl \ -nn \ -nr \ -ns \ -nso \ -om \ -oms \ -oc \ -or \ -or-IN \ -pap \ -pa \ -pa-IN \ -pl \ -ps \ -pt \ -pt-BR \ -gug \ -pyg \ -ro \ -ru \ -rw \ -sat \ -sa \ -sa-IN \ -si \ -sc \ -sd \ -sq \ -sk \ -sl \ -sh \ -son \ -sr \ -ss \ -st \ -sv \ -sw \ -sw-TZ \ -te \ -te-IN \ -ti \ -ti-ER \ -ta \ -ta-IN \ -tlh \ -th \ -tn \ -tr \ -ts \ -tg \ -ug \ -ur \ -ur-IN \ -uk \ -uz \ -ve \ -vi \ -xh \ -zh-CN \ -zh-TW \ -zu +.INCLUDE : langlist.mk alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index 451a33b8ab00..1c453c8f51a7 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -26,8 +26,8 @@ ************************************************************************/ -#define Boolean MacOSBoolean -#define BOOL MacOSBOOL +//#define Boolean MacOSBoolean +//#define BOOL MacOSBOOL #define Button MacOSButton #define Byte MacOSByte #define Control MacOSControl @@ -46,7 +46,7 @@ //#define ShowWindow MacOSShowWindow #define StringPtr MacOSStringPtr #define DirInfo MacOSDirInfo -#define ULONG MacOSULONG +//#define ULONG MacOSULONG #define Line MacOSLine #define TimeValue MacOSTimeValue #define Pattern MacOSPattern diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index a4b02a9ed164..a095b7762fbe 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -607,6 +607,8 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) # --- generate output tree ----------------------------------------- +# disable for makefiles wrapping a gnumake module +.IF "$(TARGET)"!="prj" # As this is not part of the initial startup makefile we define an infered # target instead of using $(OUT)/inc/myworld.mk as target name. # (See iz62795) @@ -623,6 +625,7 @@ $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk : .INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk .ENDIF # "$(common_build)"!="" +.ENDIF # "$(TARGET)"!="prj" .INCLUDE .IGNORE : office.mk diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index d1109ec4e8f1..fa6ae24110b7 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -57,7 +57,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) @@-$(RM) $@ $(COMMAND_ECHO)echo Manifest-Version: 1.0 > $@ .IF "$(JARCLASSPATH)" != "" - echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@ + $(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@ .ENDIF # $(RSCREVISION) contains chars that must be quoted (for *NIX shells) $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@ @@ -67,6 +67,14 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) .ENDIF # "$(JARMANIFEST)"!="" .ENDIF # "$(NEW_JAR_PACK)"!="" +.IF "$(JARCLASSEXCLUDES)" == "" +ZIPJAR_EXCLUDE= +.ELSE # "$(JARCLASSEXCLUDES)" == "" +ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i") +# format: +# JARCLASSEXCLUDES=foo/* bar/* +.ENDIF # "$(JARCLASSEXCLUDES)" == "" + # # build jar # @@ -82,8 +90,8 @@ $(JARTARGETN) : @-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 .ENDIF .IF "$(JARMANIFEST)"!="" - $(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(CHECKZIPRESULT) + $(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT) .ENDIF # "$(JARMANIFEST)"!="" - $(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT) + $(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT) .ENDIF diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk index 5c00f2bbf7f5..c85d2d9bdfd2 100644 --- a/solenv/inc/tg_java.mk +++ b/solenv/inc/tg_java.mk @@ -42,13 +42,11 @@ $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY: .IF "$(JAVATARGET)"!="" .IF "$(PACKAGE)"!="" -$(CLASSDIR)/$(IDLPACKAGE)/%.class .NOINFER .IGNORE : %.java -# echo $@ - @@-$(RM) $(JAVATARGET) +$(CLASSDIR)/$(PACKAGE)/%.class .NOINFER .IGNORE : %.java + $(COMMAND_ECHO)-$(RM) $(JAVATARGET) .ELSE # "$(PACKAGE)"!="" $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java -# echo $@ - @@-$(RM) $(JAVATARGET) + $(COMMAND_ECHO)-$(RM) $(JAVATARGET) .ENDIF # "$(PACKAGE)"!="" $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) @@ -78,7 +76,6 @@ $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) @@-find $(CLASSDIR) -type d -user $(USER) \! -perm -5 -print | xargs chmod a+r $$1 .ENDIF .ENDIF - @echo > $@ + @$(TOUCH) $@ .ENDIF # "$(JAVATARGET)"!="" - diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 69721a7e2204..1f0aff311903 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -43,7 +43,8 @@ $(RSC_MULTI$(TNR)) : \ -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ @@ -58,7 +59,8 @@ $(RSC_MULTI$(TNR)) : \ -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \ $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/$i -lip=$(SOLARSRC)/$(RSCDEFIMG) ) \ -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index ab95b1a75c4f..1bcebb8c72e3 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -362,7 +362,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -386,7 +386,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -558,7 +558,6 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)STDLIBS:^"-l") \ $(SHL$(TNR)LINKRES) \ $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 972feb0a8fdc..d70fb134f056 100755 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -230,10 +230,9 @@ _VC_MANIFEST_BASENAME=__VC80 _VC_MANIFEST_BASENAME=__VC90 .ENDIF -LINK=link /MACHINE:IX86 +LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197 # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with # a return value 1, which makes dmake think it failed -LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:" .IF "$(PRODUCT)"!="full" .ELSE LINKFLAGS=/MAP /OPT:NOREF |