Author: hdu Date: Thu Jan 23 17:13:05 2014 New Revision: 1560760 URL: http://svn.apache.org/r1560760 Log: #123509# adapt settings etc. to work with 64 bit office and environment
merge from revision 1536312 in the branch rejuvenate01 Patch by: Juergen Schmidt <[email protected]> Modified: openoffice/trunk/ (props changed) openoffice/trunk/main/odk/configure.pl openoffice/trunk/main/odk/setsdkenv_unix.sh.in openoffice/trunk/main/odk/settings/settings.mk openoffice/trunk/main/odk/settings/std.mk Propchange: openoffice/trunk/ ------------------------------------------------------------------------------ Merged /openoffice/branches/rejuvenate01:r1536312,1560617 Modified: openoffice/trunk/main/odk/configure.pl URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/configure.pl?rev=1560760&r1=1560759&r2=1560760&view=diff ============================================================================== --- openoffice/trunk/main/odk/configure.pl (original) +++ openoffice/trunk/main/odk/configure.pl Thu Jan 23 17:13:05 2014 @@ -82,8 +82,19 @@ if ( $main::operatingSystem =~ m/solaris $main::cppName = "CC"; $main::cppVersion = "5.2"; } +if ( $main::operatingSystem =~ m/darwin/ ) +{ + $main::cppName = "clang"; + $main::cppVersion = "4.2"; +} $main::OO_SDK_CC_55_OR_HIGHER = ""; -$main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName); +if ( $main::operatingSystem =~ m/darwin/ ) +{ + $clangpath = `xcrun -f clang++`; + $main::OO_SDK_CPP_HOME_SUGGESTION = substr($clangpath, 0, rindex($clangpath, "/")); +} else { + $main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName); +} $main::OO_SDK_JAVA_HOME = ""; $main::OO_SDK_JAVA_BIN_DIR = "bin"; @@ -348,18 +359,28 @@ while ( (!$main::correctVersion) && print " C++ compilers where for example a language binding exist:\n"; print " - Solaris, Sun WorkShop 6 update 1 C++ 5.2 2000/09/11 or higher\n"; print " - Linux, GNU C++ compiler, gcc version 4.0.1 or higher\n"; - print " - MacOS, GNU C++ compiler, gcc version 4.0.1 or higher\n"; - print " Enter the directory of the C++ compiler, the directory\n"; - print " where the compiler is located (optional) [$main::OO_SDK_CPP_HOME_SUGGESTION]: "; - - $main::OO_SDK_CPP_HOME = readStdIn(); - chop($main::OO_SDK_CPP_HOME); - if ( $main::OO_SDK_CPP_HOME eq "" ) + print " - MacOS 64bit, Apple LLVM version 4.2 (clang-425.0.28) or higher\n"; + print " on MacOS auto detected using xcrun -f clang'\n"; + + if ( $main::operatingSystem =~ m/darwin/ ) { + # xcrun is used to find the correct clang compiler, just print the result as information $main::OO_SDK_CPP_HOME = $main::OO_SDK_CPP_HOME_SUGGESTION; + print " Used clang compiler: $main::OO_SDK_CPP_HOME\n"; + } else + { + print " Enter the directory of the C++ compiler, the directory\n"; + print " where the compiler is located (optional) [$main::OO_SDK_CPP_HOME_SUGGESTION]: "; + + $main::OO_SDK_CPP_HOME = readStdIn(); + chop($main::OO_SDK_CPP_HOME); + if ( $main::OO_SDK_CPP_HOME eq "" ) + { + $main::OO_SDK_CPP_HOME = $main::OO_SDK_CPP_HOME_SUGGESTION; + } } - if ( ! $main::OO_SDK_CPP_HOME eq "" ) + if ( (!$main::operatingSystem =~ m/darwin/) && (! $main::OO_SDK_CPP_HOME eq "") ) { if ( (! -d "$main::OO_SDK_CPP_HOME") || ((-d "$main::OO_SDK_CPP_HOME") && (! -e "$main::OO_SDK_CPP_HOME/$main::cppName")) ) Modified: openoffice/trunk/main/odk/setsdkenv_unix.sh.in URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_unix.sh.in?rev=1560760&r1=1560759&r2=1560760&view=diff ============================================================================== --- openoffice/trunk/main/odk/setsdkenv_unix.sh.in (original) +++ openoffice/trunk/main/odk/setsdkenv_unix.sh.in Thu Jan 23 17:13:05 2014 @@ -151,7 +151,6 @@ case ${sdk_platform} in platform='Solaris x86' fi comid=C52 - pltfrm=sunpro soext=so exampleout=SOLARISexample.out stldebug=_debug @@ -162,13 +161,12 @@ case ${sdk_platform} in darwin*) if [ -n "$OO_SDK_CPP_HOME" ] then - SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/clang++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` export SDK_GXX_INCLUDE_PATH fi directoryname=macosx - comid=gcc3 - pltfrm=gcc + comid=s5abi soext=dylib exampleout=MACOSXexample.out platform=MacOSX @@ -186,7 +184,6 @@ case ${sdk_platform} in directoryname=linux comid=gcc3 - pltfrm=gcc soext=so exampleout=LINUXexample.out platform=Linux @@ -204,7 +201,6 @@ case ${sdk_platform} in directoryname=freebsd comid=gcc3 - pltfrm=gcc soext=so exampleout=FREEBSDexample.out platform=FreeBSD Modified: openoffice/trunk/main/odk/settings/settings.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1560760&r1=1560759&r2=1560760&view=diff ============================================================================== --- openoffice/trunk/main/odk/settings/settings.mk (original) +++ openoffice/trunk/main/odk/settings/settings.mk Thu Jan 23 17:13:05 2014 @@ -72,7 +72,6 @@ EXE_EXT=.exe COPY=copy SHAREDLIB_EXT=dll SHAREDLIB_OUT=$(OUT_BIN) -PACKAGE_LIB_DIR=windows.plt UNOPKG_PLATFORM=Windows OSEP=^< @@ -153,18 +152,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess ifeq "$(PROCTYPE)" "sparc" PLATFORM=solsparc -PACKAGE_LIB_DIR=solaris_sparc.plt UNOPKG_PLATFORM=Solaris_SPARC JAVA_PROC_TYPE=sparc else ifeq "$(PROCTYPE)" "sparc64" PLATFORM=solsparc -PACKAGE_LIB_DIR=solaris_sparc64.plt UNOPKG_PLATFORM=Solaris_SPARC64 JAVA_PROC_TYPE=sparcv9 else PLATFORM=solintel -PACKAGE_LIB_DIR=solaris_x86.plt UNOPKG_PLATFORM=Solaris_x86 JAVA_PROC_TYPE=i386 endif @@ -260,24 +256,20 @@ ifneq (,$(findstring linux,$(PLATFORM))) PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/') PLATFORM=linux -PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt UNOPKG_PLATFORM=Linux_$(PROCTYPE) JAVA_PROC_TYPE=$(PROCTYPE) ifeq "$(PROCTYPE)" "i386" -PACKAGE_LIB_DIR=linux_x86.plt UNOPKG_PLATFORM=Linux_x86 JAVA_PROC_TYPE=i386 endif ifeq "$(PROCTYPE)" "powerpc" -PACKAGE_LIB_DIR=linux_powerpc.plt UNOPKG_PLATFORM=Linux_PowerPC JAVA_PROC_TYPE=ppc endif ifeq "$(PROCTYPE)" "sparc" -PACKAGE_LIB_DIR=linux_sparc.plt UNOPKG_PLATFORM=Linux_SPARC JAVA_PROC_TYPE=sparc endif @@ -383,41 +375,30 @@ endif # ########################################################################### ifneq (,$(findstring darwin,$(PLATFORM))) -# Settings for MacOSX using gcc 4.0.1 compiler +# Settings for MacOSX using LLVM version 4.2 (clang-425.0.28) PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) # Default is MacOSX on a Intel machine PLATFORM=macosx -ifeq "$(PROCTYPE)" "i386" -PACKAGE_LIB_DIR=macosx_x86.plt -UNOPKG_PLATFORM=MacOSX_x86 -JAVA_PROC_TYPE=x86 -else ifeq "$(PROCTYPE)" "x86_64" -PACKAGE_LIB_DIR=macosx_x86.plt -UNOPKG_PLATFORM=MacOSX_x86 -JAVA_PROC_TYPE=x86 -else -PACKAGE_LIB_DIR=macosx_ppc.plt -UNOPKG_PLATFORM=MacOSX_PowerPC -JAVA_PROC_TYPE=ppc -endif +UNOPKG_PLATFORM=MacOSX_x86_64 endif + JAVABIN=Commands -GCC_VERSION =$(shell gcc -dumpversion| cut -d"." -f1,2) -ifeq "$(GCC_VERSION)" "4.2" -GCC_ARCH_OPTION=-arch i386 -endif +GCC_ARCH_OPTION=-arch x86_64 OS=MACOSX PS=/ ICL=\$$ -CC=gcc-$(GCC_VERSION) -LINK=g++-$(GCC_VERSION) -LIB=g++-$(GCC_VERSION) +CC=`xcrun -f clang` -arch x86_64 +CXX=`xcrun -f clang++` -arch x86_64 -std=c++11 +LINK=`xcrun -f clang++` -arch x86_64 -std=c++11 +LIB=`xcrun -f clang++` -arch x86_64 -std=c++11 +INSTALLTOOL=`xcrun -f install_name_tool` + ECHO=@echo MKDIR=mkdir -p CAT=cat @@ -428,6 +409,8 @@ SHAREDLIB_OUT=$(OUT_LIB) COMID=gcc3 CPPU_ENV=gcc3 +COMID=s5abi +CPPU_ENV=s5abi OSEP=\< CSEP=\> @@ -459,15 +442,16 @@ SALHELPERDYLIB=-Wl,-dylib_file,@________ REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib' STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib' -INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3 +INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3 -INSTALL_NAME_URELIBS_BIN=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 +INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 EMPTYSTRING= PATH_SEPARATOR=: -CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden +CC_FLAGS_JNI=-c -fPIC -fno-common $(GCC_ARCH_OPTION) +CC_FLAGS=-c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden + # -O is necessary for inlining (see gcc documentation) ifeq "$(DEBUG)" "yes" CC_FLAGS_JNI+=-g @@ -512,19 +496,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM))) PLATFORM=kfreebsd ifeq "$(PROCTYPE)" "x86_64" -PACKAGE_LIB_DIR=kfreebsd_x86_64.plt UNOPKG_PLATFORM=kFreeBSD_x86_64 else -PACKAGE_LIB_DIR=kfreebsd_x86.plt UNOPKG_PLATFORM=kFreeBSD_x86 endif else PLATFORM=freebsd ifeq "$(PROCTYPE)" "x86_64" -PACKAGE_LIB_DIR=freebsd_x86_64.plt UNOPKG_PLATFORM=FreeBSD_x86_64 else -PACKAGE_LIB_DIR=freebsd_x86.plt UNOPKG_PLATFORM=FreeBSD_x86 endif endif Modified: openoffice/trunk/main/odk/settings/std.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/std.mk?rev=1560760&r1=1560759&r2=1560760&view=diff ============================================================================== --- openoffice/trunk/main/odk/settings/std.mk (original) +++ openoffice/trunk/main/odk/settings/std.mk Thu Jan 23 17:13:05 2014 @@ -54,13 +54,18 @@ OFFICE_SERVICES="$(subst \\,\,$(OFFICE_P OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" -JAVA_OPTIONS= ifneq "$(OO_SDK_JAVA_HOME)" "" JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3) ifeq "$(JAVA_BITS)" "64-Bit" -ifneq "$(PLATFORM)" "linux" -JAVA_OPTIONS=-d32 +JAVA_OPTIONS=-32 + +ifeq "$(PLATFORM)" "linux" +JAVA_OPTIONS= endif +ifeq "$(PLATFORM)" "macosx" +JAVA_OPTIONS= +endif + endif endif
