writerfilter07: merged DEV300_m70

This commit is contained in:
Henning Brinkmann 2010-01-27 13:08:32 +01:00
commit a79c9eca4a
14 changed files with 10095 additions and 9553 deletions

18840
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -1439,7 +1439,6 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
AC_MSG_CHECKING([the GNU gcc compiler version])
_gcc_version=`$CC -dumpversion`
_gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
_gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
if test "$_gcc_major" -lt "3"; then
@ -1451,6 +1450,9 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
fi
fi
fi
if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly])
fi
AC_MSG_RESULT([checked (gcc $_gcc_version)])
if test "$_os" = "SunOS"; then
AC_MSG_CHECKING([gcc linker])
@ -2058,6 +2060,10 @@ if test "$GXX" = "yes"; then
_gpp_version=`$CXX -dumpversion`
_gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'`
_gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'`
if test "$_os" = "Darwin" -a "$_gpp_major" -ge "4" -a "$_gpp_minor" -ge "1" ; then
AC_MSG_ERROR([You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly])
fi
AC_MSG_RESULT([checked (g++ $_gpp_version)])
@ -3696,29 +3702,27 @@ AC_SUBST(SYSTEM_LIBXML)
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
dnl ===================================================================
dnl Check for system python
dnl ===================================================================
# ===================================================================
# Check for system python
# ===================================================================
AC_MSG_CHECKING([which python to use])
if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
with_system_python=yes
fi
AC_MSG_CHECKING([which python to use])
if test -n "$with_system_python" -o -n "$with_system_libs" && \
AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)])
PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
PYTHON_LIBS="-framework Python"
elif test -n "$with_system_python" -o -n "$with_system_libs" && \
test "$with_system_python" != "no"; then
SYSTEM_PYTHON=YES
AC_MSG_RESULT([external])
AM_PATH_PYTHON([2.2])
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
PYTHON_CFLAGS="-I$python_include"
if test "$_os" = "Darwin"; then
PYTHON_LIBS="-framework Python"
else
PYTHON_LIBS="-lpython$python_version"
fi
PYTHON_LIBS="-lpython$python_version"
fi
if test "$with_system_python" != "no" ; then
SYSTEM_PYTHON=YES
dnl check if the headers really work:
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
@ -4275,6 +4279,16 @@ else
fi
AC_MSG_CHECKING([whether to build provided NSS module])
if test "$_os" = "Darwin" -a "$enable_nss_module" != "no" ; then
# FIXME: TODO: make the nss module work with the SDK (conflicting libsqlite3.dylib)
dnl bother with a Snow-Leopard specific check or just disable for all?
MACOSXVER=`sw_vers -productVersion | $AWK -F. '{print \$1*10000+\$2*100+\$3}'`
if test "$MACOSXVER" -ge "100600" ; then
AC_MSG_WARN([The nss module causes trouble when building on Snow Leopard with the MacOSX10.4u.sdk - disabling])
echo "The nss module causes trouble when building on Snow Leopard with the MacOSX10.4u.sdk - disabling" >> warn
enable_nss_module=no
fi
fi
if test "$enable_nss_module" != "no"; then
ENABLE_NSS_MODULE="YES"
BUILD_TYPE="$BUILD_TYPE NSS"

View file

@ -1,12 +0,0 @@
[OOO_CUSTOMACTION_1]
en-US = "A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first."
[OOO_CUSTOMACTION_2]
en-US = "The same version of this product is already installed."
[OOO_CUSTOMACTION_3]
en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
[OOO_CUSTOMACTION_4]
en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."

View file

@ -89,9 +89,9 @@ OpenOffice
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
}
@ -153,9 +153,9 @@ OpenOffice_wJRE
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
}
@ -224,9 +224,9 @@ OpenOffice_Dev
DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
}
@ -267,9 +267,9 @@ URE
DONTUSESTARTMENUFOLDER 1
SERVICESPROJEKT 1
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
PACKAGEMAP package_names_ext.txt
}
@ -312,9 +312,9 @@ OpenOffice_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
}
active 1
compression 5
@ -361,9 +361,9 @@ OpenOffice_Dev_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
}
active 1
compression 5
@ -424,9 +424,9 @@ BrOffice
DOWNLOADBITMAP brobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
}
@ -492,9 +492,9 @@ BrOffice_wJRE
DOWNLOADBITMAP brobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
}
@ -566,9 +566,9 @@ BrOffice_Dev
DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
STARTCENTER_INFO_URL http://www.openoffice.org
STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
}

View file

@ -2959,6 +2959,15 @@ File gid_File_Extension_Dictionary_Af
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Ca
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-ca.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Cs
Dir = gid_Brand_Dir_Share_Extension_Install;
@ -2978,14 +2987,32 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_De
File gid_File_Extension_Dictionary_De_AT
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-de.oxt";
Name = "dict-de-AT.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_De_CH
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-de-CH.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_De_DE
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-de-DE.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_En
Dir = gid_Brand_Dir_Share_Extension_Install;
@ -3085,6 +3112,15 @@ File gid_File_Extension_Dictionary_Nl
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_No
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-no.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Pl
Dir = gid_Brand_Dir_Share_Extension_Install;
@ -3103,6 +3139,15 @@ File gid_File_Extension_Dictionary_Pt
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Ro
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-ro.oxt";
Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Ru
Dir = gid_Brand_Dir_Share_Extension_Install;

View file

@ -972,6 +972,17 @@ Module gid_Module_Root_Extension_Dictionary_Af
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_Ca
Name = "gid_Module_Root_Extension_Dictionary_Ca";
Description = "gid_Module_Root_Extension_Dictionary_Ca";
Files = (gid_File_Extension_Dictionary_Ca);
InstallOrder = "2000";
Spellcheckerlanguage = "ca";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_Cs
Name = "gid_Module_Root_Extension_Dictionary_Cs";
Description = "gid_Module_Root_Extension_Dictionary_Cs";
@ -994,17 +1005,39 @@ Module gid_Module_Root_Extension_Dictionary_Da
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_De
Name = "gid_Module_Root_Extension_Dictionary_De";
Description = "gid_Module_Root_Extension_Dictionary_De";
Files = (gid_File_Extension_Dictionary_De);
Module gid_Module_Root_Extension_Dictionary_De_AT
Name = "gid_Module_Root_Extension_Dictionary_De_AT";
Description = "gid_Module_Root_Extension_Dictionary_De_AT";
Files = (gid_File_Extension_Dictionary_De_AT);
InstallOrder = "2000";
Spellcheckerlanguage = "de";
Spellcheckerlanguage = "de-AT";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_De_CH
Name = "gid_Module_Root_Extension_Dictionary_De_CH";
Description = "gid_Module_Root_Extension_Dictionary_De_CH";
Files = (gid_File_Extension_Dictionary_De_CH);
InstallOrder = "2000";
Spellcheckerlanguage = "de-CH";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_De_DE
Name = "gid_Module_Root_Extension_Dictionary_De_DE";
Description = "gid_Module_Root_Extension_Dictionary_De_DE";
Files = (gid_File_Extension_Dictionary_De_DE);
InstallOrder = "2000";
Spellcheckerlanguage = "de-DE";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_En
Name = "gid_Module_Root_Extension_Dictionary_En";
Description = "gid_Module_Root_Extension_Dictionary_En";
@ -1126,6 +1159,17 @@ Module gid_Module_Root_Extension_Dictionary_Nl
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_No
Name = "gid_Module_Root_Extension_Dictionary_No";
Description = "gid_Module_Root_Extension_Dictionary_No";
Files = (gid_File_Extension_Dictionary_No);
InstallOrder = "2000";
Spellcheckerlanguage = "no";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_Pl
Name = "gid_Module_Root_Extension_Dictionary_Pl";
Description = "gid_Module_Root_Extension_Dictionary_Pl";
@ -1148,6 +1192,17 @@ Module gid_Module_Root_Extension_Dictionary_Pt
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_Ro
Name = "gid_Module_Root_Extension_Dictionary_Ro";
Description = "gid_Module_Root_Extension_Dictionary_Ro";
Files = (gid_File_Extension_Dictionary_Ro);
InstallOrder = "2000";
Spellcheckerlanguage = "ro";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
Styles = (HIDDEN_ROOT);
End
Module gid_Module_Root_Extension_Dictionary_Ru
Name = "gid_Module_Root_Extension_Dictionary_Ru";
Description = "gid_Module_Root_Extension_Dictionary_Ru";

0
solenv/config/sdev300.ini Executable file → Normal file
View file

View file

@ -1,5 +1,5 @@
RSCVERSION=300
RSCREVISION=300m69(Build:9475)
BUILD=9475
LAST_MINOR=m69
RSCREVISION=300m70(Build:9478)
BUILD=9478
LAST_MINOR=m70
SOURCEVERSION=DEV300

View file

@ -114,6 +114,7 @@ pl \
ps \
pt \
pt-BR \
ro \
ru \
rw \
sat \

86
solenv/inc/tg_help.mk Normal file
View file

@ -0,0 +1,86 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.pmk,v $
#
# $Revision: 1.25 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
# to make it usable with special lang selection of
# helpcontent2
aux_alllangiso*:=$(alllangiso)
SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
$(HLANGXHPFILES) : $$(@:d)thisdir.created
$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
@$(TOUCH) $@
# internal dependencies not sufficient to trigger merge?
# @$(NULL)
$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
.IF "$(WITH_LANG)"!=""
$(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
.ELSE # "$(WITH_LANG)"!=""
cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
.ENDIF # "$(WITH_LANG)"!=""
.IF "$(OS)"=="SOLARIS"
@$(ECHONL) " "
.ELSE # "$(OS)"=="SOLARIS"
@$(ECHONL)
.ENDIF # "$(OS)"=="SOLARIS"
$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
@$(TOUCH) $@
# urks - dmake mixes up operators and strings :-(
.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
.IF "$(HELPTRANSPHONY)"!=""
$(COMMONMISC)$/$(TARGET).done .PHONY :
.ELSE # "$(HELPTRANSPHONY)"!=""
$(COMMONMISC)$/$(TARGET).done : makefile.mk
.IF "$(WITH_LANG)"!=""
$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF)
.ENDIF # "$(WITH_LANG)"!=""
.ENDIF # "$(HELPTRANSPHONY)"!=""
.ENDIF # "$(HLANGXHPFILES)"!=""
optix: $(COMMONMISC)$/$(TARGET).done
@echo done
%.created :
@@-$(MKDIRHIER) $(@:d)
@$(TOUCH) $@

View file

@ -1,163 +0,0 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: unxirgm.mk,v $
#
# $Revision: 1.15 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI
ASM=
AFLAGS=
SOLAR_JAVA=TRUE
JAVADEF=-DSOLAR_JAVA
#JAVAFLAGSDEBUG=-g
.IF "$(debug)"==""
JAVA_RUNTIME=-ljava
.ELSE
JAVA_RUNTIME=-ljava_g
.ENDIF
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=
CC= gcc
CXX= g++
CFLAGS=-c
CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
CFLAGSCC=$(ARCH_FLAGS)
CFLAGSCXX=$(ARCH_FLAGS)
PICSWITCH:=-fpic
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
CFLAGSOBJGUIMT=
# Compiler flags for compiling static object in multi threaded environment with character user interface
CFLAGSOBJCUIMT=
# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
CFLAGSSLOGUIMT=$(PICSWITCH)
# Compiler flags for compiling shared object in multi threaded environment with character user interface
CFLAGSSLOCUIMT=$(PICSWITCH)
# Compiler flags for profiling
CFLAGSPROF=
# Compiler flags for debugging
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
CFLAGSOPT=-O2
# Compiler flags for disabling optimizations
CFLAGSNOOPT=-O0
# Compiler flags for describing the output path
CFLAGSOUTOBJ=-o
CFLAGSWARNCC=-w
CFLAGSWALLCC=-Wall
CFLAGSWERRCC=-Werror
# exception flags
CFLAGSEXCEPTIONS=-fexceptions
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
STATIC= -Wl,-Bstatic
DYNAMIC= -Wl,-Bdynamic
#
# To use the map files, you need to have a gcc_specs file which contains:
# *linker:
# /path/to/bin/ld.sh
# where ld.sh is a wrapper script that does some conversion of the
# map files on the fly.
#
LINK= g++
LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
LINKVERSIONMAPFLAG= -Wl,-exports_file
LINKFLAGSAPPGUI= $(THREADLIB)
LINKFLAGSAPPCUI= $(THREADLIB)
LINKFLAGSSHLGUI= $(THREADLIB)
LINKFLAGSSHLCUI= $(THREADLIB)
LINKFLAGSAPPGUI+= -Wl,-multigot
LINKFLAGSAPPCUI+= -Wl,-multigot
LINKFLAGSSHLGUI+= -shared
LINKFLAGSSHLCUI+= -shared
LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG= -g
LINKFLAGSOPT=
LINKFLAGSSHLGUI += -Wl,-Bsymbolic
LINKFLAGSSHLCUI += -Wl,-Bsymbolic
APPLINKSTATIC=-Bstatic
APPLINKSHARED=-Bsymbolic
SONAME_SWITCH = -Wl,-soname -Wl,
# Sequence of libraries DOES matter!
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
THREADLIB= -lpthread
.IF "$(STLPORT_VER)" >= "500"
LIBSTLPORT=$(DYNAMIC) -lstlport
LIBSTLPORTST= -lstlport
.ELSE
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST= -lstlport_gcc
.ENDIF
LIBMGR= ar
LIBFLAGS= -r
IMPLIB=
IMPLIBFLAGS=
MAPSYM=
MAPSYMFLAGS=
RC= irc
RCFLAGS= -fo$@ $(RCFILES)
RCLINK=
RCLINKFLAGS=
RCSETVERSION=
DLLPOSTFIX= im
DLLPRE= lib
DLLPOST= .so
LDUMP=c++filt

View file

@ -1,162 +0,0 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: unxirxm.mk,v $
#
# $Revision: 1.10 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
# mak-file for IRIX/mips
ASM=
AFLAGS=
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=
#
# Zu den Compilerflags:
#
# -ptused : instantisiert Templates, wenn sie benutzt werden.
# Der Schalter wurde neu eingefuegt, weil sich eine
# statische Memberfunktion nicht instantisieren liess.
# (ts&sdo/10.06.98)
#
CC= cc -KPIC -c -n32
CXX= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523
CDEFS+=-D_PTHREADS
CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
# 1009 ...nested comment is not allowed...
# 1021 ...type qualifiers are meaningless in this declaration...
# 1107 ...signed bit field of length 1...
# 1110 ...statement not reached...
# 1155 ...unrecognized #pragma...
# 1171 ...expression has no effect...
# 1183 ...comparison of unsigned integer with zero...
# 1185 ...enumerated type mixed with another type...
# 1188 ...type qualifier is meaningless on cast type...
# 1233 ...explicit type is missing ("int" assumed)...
# 1234 ...access control not specified...
# 1257 ...NULL reference is not allowed...
# 1440 ...initial value of reference to non-const must be an lvalue...
# 1516 ...pointless comparison of unsigned integer with a negative constant
# 1681 ...virtual function override intended...
# 1682 ...is only partially overridden in class...
CFLAGSCC= -Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
CFLAGSCXX= -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
CFLAGSOBJGUIMT=
CFLAGSOBJCUIMT=
CFLAGSSLOGUIMT=
CFLAGSSLOCUIMT=
CFLAGSPROF=
CFLAGSDEBUG= -g
CFLAGSDBGUTIL=
CFLAGSOPT= -O
CFLAGSNOOPT=
CFLAGSOUTOBJ= -o
STATIC= -B static
DYNAMIC= -B dynamic
#
# Zu den Linkflags:
#
# -update_registry <file> : fuer das Linken mehrerer shared Libraries
# erforderlich.
# **FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER
# MECHANISMUS**
#
LINK= CC
LINKFLAGS=
LINKFLAGSAPPGUI=-n32 -multigot
LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
LINKFLAGSAPPCUI=-n32 -multigot
LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG=
LINKFLAGSOPT=
APPLINKSTATIC=-Bstatic
APPLINKSHARED=-Bsymbolic
# Reihenfolge der Libraries NICHT egal!
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm
# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
THREADLIB= -lpthread
LIBMGR= ar
LIBFLAGS= -r
# LIBEXT= .so
IMPLIB=
IMPLIBFLAGS=
MAPSYM=
MAPSYMFLAGS=
RC= irc
RCFLAGS= -fo$@ $(RCFILES)
RCLINK=
RCLINKFLAGS=
RCSETVERSION=
DLLPOSTFIX= im
.IF "$(WORK_STAMP)"=="MIX364"
DLLPOSTFIX=
.ENDIF
DLLPRE= lib
DLLPOST= .so
LDUMP=
# --------------------------
# AUS DEM ALTEN ENVIRONMENT:
# --------------------------
#
# Linken einer statischen Library:
# ar -r ...
#
# Linken einer shared Library:
# CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot
# -update_registry <...> ...
#
# Linken einer Applikation mit statischen Librarys:
# CC -B static ...
#
# Linken einer Applikation mit stared Librarys:
# CC -n32 -multigot ...
#

View file

@ -1,162 +0,0 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: unxirxm3.mk,v $
#
# $Revision: 1.12 $
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
# Makefile for IRIX/mips
ASM=
AFLAGS=
SOLAR_JAVA*=TRUE
JAVADEF=-DSOLAR_JAVA
#JAVAFLAGSDEBUG=-g
.IF "$(debug)"==""
JAVA_RUNTIME=-ljava
.ELSE
JAVA_RUNTIME=-ljava_g
.ENDIF
# architecture dependent flags for the C and C++ compiler that can be changed by
# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
ARCH_FLAGS*=
CC= cc
CXX= CC
CFLAGS= -c
CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
CFLAGSCC=$(ARCH_FLAGS)
CFLAGSCXX= -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS)
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
CFLAGSOBJGUIMT=
# Compiler flags for compiling static object in multi threaded environment with character user interface
CFLAGSOBJCUIMT=
# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
CFLAGSSLOGUIMT=-KPIC
# Compiler flags for compiling shared object in multi threaded environment with character user interface
CFLAGSSLOCUIMT=-KPIC
# Compiler flags for profiling
CFLAGSPROF=
# Compiler flags for debugging
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
CFLAGSOPT=-O2
# Compiler flags for disabling optimizations
CFLAGSNOOPT=-O0
# Compiler flags for describing the output path
CFLAGSOUTOBJ=-o
CFLAGSWARNCC=-w
CFLAGSWALLCC=-fullwarn
CFLAGSWERRCC=
# exception flags
CFLAGSEXCEPTIONS=-LANG:exceptions=ON
CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF
#CFLAGS_NO_EXCEPTIONS=
STATIC= -Wl,-Bstatic
DYNAMIC= -Wl,-Bdynamic
#
# To use the map files, you need to have a gcc_specs file which contains:
# *linker:
# /path/to/bin/ld.sh
# where ld.sh is a wrapper script that does some conversion of the
# map files on the fly.
#
LINK= CC
LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
LINKVERSIONMAPFLAG= -Wl,-exports_file
LINKFLAGSAPPGUI= $(THREADLIB)
LINKFLAGSAPPCUI= $(THREADLIB)
LINKFLAGSSHLGUI= $(THREADLIB)
LINKFLAGSSHLCUI= $(THREADLIB)
LINKFLAGSAPPGUI+= -Wl,-multigot
LINKFLAGSAPPCUI+= -Wl,-multigot
LINKFLAGSSHLGUI+= -shared
LINKFLAGSSHLCUI+= -shared
LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG= -g
LINKFLAGSOPT=
LINKFLAGSSHLGUI += -Wl,-Bsymbolic
LINKFLAGSSHLCUI += -Wl,-Bsymbolic
APPLINKSTATIC=-Bstatic
APPLINKSHARED=-Bsymbolic
SONAME_SWITCH = -Wl,-soname -Wl,
# Sequence of libraries DOES matter!
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm
STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc
THREADLIB= -lpthread
#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro
LIBSTLPORT=$(DYNAMIC)
LIBSTLPORTST=
#LIBSTLPORTST= -lstlport_mipspro
LIBMGR= ar
LIBFLAGS= -r
IMPLIB=
IMPLIBFLAGS=
MAPSYM=
MAPSYMFLAGS=
RC= irc
RCFLAGS= -fo$@ $(RCFILES)
RCLINK=
RCLINKFLAGS=
RCSETVERSION=
DLLPOSTFIX= im
DLLPRE= lib
DLLPOST= .so
LDUMP=c++filt

View file

@ -89,8 +89,8 @@ ARCH_FLAGS*=
# objcpp = Objective C++ compiler to use
CXX*=g++
CC*=gcc
objc*=gcc
objcpp*=g++
objc*=$(CC)
objcpp*=$(CXX)
CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)