[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in set_soenv.in
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Fri Dec 30 18:19:31 PST 2011
config_host.mk.in | 16
configure.in | 854 +++++++++++++++++++++++++++++++++++---------------
set_soenv.in | 919 ++++++++++++++++++++++--------------------------------
3 files changed, 1008 insertions(+), 781 deletions(-)
New commits:
commit 480b32d3809830002ecc28508d40af3ecd4ad272
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Dec 30 19:34:10 2011 -0600
migrate COM,CPU,CPUNAME,GUI,GUIBASE,INPATH,OUTPATH,PATH_SEPARATOR
diff --git a/config_host.mk.in b/config_host.mk.in
index b80abce..de607c3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -8,8 +8,13 @@ export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
export CAIRO_LIBS="@CAIRO_LIBS@"
export CDR_CFLAGS="@CDR_CFLAGS@"
export CDR_LIBS="@CDR_LIBS@"
+export COM="@COM@"
export CPPUNIT_CFLAGS="@CPPUNIT_CFLAGS@"
export CPPUNIT_LIBS="@CPPUNIT_LIBS@"
+export CPU="@CPU@"
+export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
+export CPUNAME="@CPUNAME@"
+export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
export CURL_CFLAGS="@CURL_CFLAGS@"
export CURL_LIBS="@CURL_LIBS@"
export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
@@ -71,6 +76,10 @@ export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
export GSTREAMER_LIBS="@GSTREAMER_LIBS@"
export GTHREAD_CFLAGS="@GTHREAD_CFLAGS@"
export GTHREAD_LIBS="@GTHREAD_LIBS@"
+export GUI="@GUI@"
+export GUI_FOR_BUILD="@GUI_FOR_BUILD@"
+export GUIBASE="@GUIBASE@"
+export GUIBASE_FOR_BUILD="@GUIBASE_FOR_BUILD@"
export GTK3_CFLAGS="@GTK3_CFLAGS@"
export GTK3_LIBS="@GTK3_LIBS@"
export GTK_CFLAGS="@GTK_CFLAGS@"
@@ -79,6 +88,8 @@ export GTK_PRINT_CFLAGS="@GTK_PRINT_CFLAGS@"
export GTK_PRINT_LIBS="@GTK_PRINT_LIBS@"
export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
+export INPATH="@INPATH@"
+export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
export KDE4_CFLAGS="@KDE4_CFLAGS@"
export KDE4_LIBS="@KDE4_LIBS@"
export KDE_CFLAGS="@KDE_CFLAGS@"
@@ -107,6 +118,11 @@ export NSS_CFLAGS="@NSS_CFLAGS@"
export NSS_LIBS="@NSS_LIBS@"
export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
export OPENSSL_LIBS="@OPENSSL_LIBS@"
+export OS="@OS@"
+export OS_FOR_BUILD="@OS@"
+export OUTPATH="@OUTPATH@"
+export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
+export PATH_SEPERATOR="@P_SEP@"
export POPPLER_CFLAGS="@POPPLER_CFLAGS@"
export POPPLER_LIBS="@POPPLER_LIBS@"
export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
diff --git a/configure.in b/configure.in
index 899ef51..1675108 100644
--- a/configure.in
+++ b/configure.in
@@ -2508,6 +2508,354 @@ fi
AC_SUBST(COMEX)
AC_SUBST(MSPDB_PATH)
AC_SUBST(SHOWINCLUDES_PREFIX)
+
+#
+# determine CPI, CPUNAME, GUI, GUIBASE, ...
+#
+case "$host_os" in
+
+aix*)
+ COM=GCC
+ CPU=P
+ CPUNAME=POWERPC
+ GUI=UNX
+ GUIBASE=unx
+ OS=AIX
+ OUTPATH=unxaigppc
+ P_SEP=:
+ ;;
+
+cygwin*)
+ COM=MSC
+ GUI=WNT
+ GUIBASE=WIN
+ OS=WNT
+ P_SEP=";"
+
+ case "$host_cpu" in
+ i*86|x86_64)
+ if test "$CL_X64" = ""; then
+ CPU=X
+ CPUNAME=X86_64
+ OUTPATH=wntmscx$(COMEX)
+ else
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=wntmsci$(COMEX)
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+darwin*)
+ COM=GCC
+ GUI=UNX
+ GUIBASE="aqua"
+ OS=MACOSX
+ P_SEP=:
+
+ case "$host_cpu" in
+ arm*)
+ CPU=R
+ CPUNAME=ARM
+ GUIBASE=cocoatouch
+ OUTPATH=unxiosr
+ OS=IOS;
+ ;;
+ powerpc*)
+ CPU=P
+ CPUNAME="POWERPC"
+ OUTPATH="unxmacxp"
+ ;;
+ i*86|x86_64)
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=unxmacxi
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+dragonfly*)
+ COM=GCC
+ GUI=UNX
+ GUIBASE=unx
+ OS=DRAGONFLY
+ OUTPATH=unxdfly
+ P_SEP=:
+
+ case "$host_cpu" in
+ i*86)
+ CPU=I
+ CPUNAME=INTEL
+ ;;
+ x86_64)
+ CPU=X
+ CPUNAME=X86_64
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+freebsd*)
+ COM=GCC
+ GUI=UNX
+ GUIBASE=unx
+ OS=FREEBSD
+ OUTPATH=unxfbsd
+ P_SEP=:
+
+ case "$host_cpu" in
+ i*86)
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=unxfbsdi
+ ;;
+ x86_64)
+ CPU=X
+ CPUNAME=X86_64
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+linux-gnu*)
+ COM=GCC
+ GUI=UNX
+ GUIBASE=unx
+ OS=LINUX
+ P_SEP=:
+
+ case "$host_cpu" in
+
+ alpha)
+ CPU=L
+ CPUNAME=AXP
+ OUTPATH=unxlngaxp
+ ;;
+ armel)
+ CPU=R
+ CPUNAME=ARM
+ OUTPATH=unxlngr
+ ;;
+ armel-androideabi)
+ CPU=R
+ CPUNAME=ARM
+ OUTPATH=unxandr
+ GUIBASE=android
+ ;;
+ hppa)
+ CPU=H
+ CPUNAME=HPPA
+ OUTPATH=unxlnghppa
+ ;;
+ i*86)
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=unxlngi6
+ ;;
+ ia64)
+ CPU=A
+ CPUNAME=IA64
+ OUTPATH=unxlnga
+ ;;
+ mips)
+ CPU=M
+ CPUNAME=GODSON
+ OUTPATH=unxlngmips
+ ;;
+ m68k)
+ CPU=6
+ CPUNAME=M68K
+ OUTPATH=unxlngm68k
+ ;;
+ powerpc)
+ CPU=P
+ CPUNAME=POWERPC
+ OUTPATH=unxlngppc
+ ;;
+ powerpc64)
+ CPU=P
+ CPUNAME=POWERPC64
+ OUTPATH=unxlngppc64
+ ;;
+ sparc)
+ CPU=S
+ CPUNAME=SPARC
+ OUTPATH=unxlngs
+ ;;
+ s390)
+ CPU=3
+ CPUNAME=S390
+ OUTPATH=unxlngs390
+ ;;
+ s390x)
+ CPU=3
+ CPUNAME=S390x
+ OUTPATH=unxlngs390x
+ ;;
+ x86_64)
+ CPU=X
+ CPUNAME=X86_64
+ OUTPATH=unxlngx6
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+linux-androideabi*)
+ COM=GCC
+ GUI=UNX
+ GUIBASE=android
+ OS=ANDROID
+ P_SEP=:
+
+ case "$host_cpu" in
+
+ armel)
+ CPU=R
+ CPUNAME=ARM
+ OUTPATH=unxandr
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+mingw*)
+ COM=GCC
+ GUI=WNT
+ GUIBASE=WIN
+ OS=WNT
+ P_SEP=:
+
+ case "$host_cpu" in
+ i*86|x86_64)
+ if test "$CL_X64" = ""; then
+ CPU=X
+ CPUNAME=X86_64
+ OUTPATH=wntgccx$(COMEX)
+ else
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=wntgcci$(COMEX)
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+*netbsd*)
+
+ COM=GCC
+ GUI=UNX
+ GUIBASE=unx
+ OS=NETBSD
+ OUTPATH=unxnbsd
+ P_SEP=:
+
+ case "$host_cpu" in
+ i*86)
+ CPU=I
+ CPUNAME=INTEL
+ ;;
+ powerpc)
+ CPU=P
+ CPUNAME=POWERPC
+ ;;
+ sparc)
+ CPU=S
+ CPUNAME=SPARC
+ ;;
+ x86_64)
+ CPU=X
+ CPUNAME=X86_64
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+openbsd*)
+ COM=GCC
+ GUI=UNX
+ GUIBASE=unx
+ OS=OPENBSD
+ OUTPATH=unxobsd
+ P_SEP=:
+
+ case "$host_cpu" in
+ i*86)
+ CPU=I
+ CPUNAME=INTEL
+ ;;
+ x86_64)
+ CPU=X
+ CPUNAME=X86_64
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+solaris*)
+
+ COM=GCC
+ GUI=UNX
+ GUIBASE=unx
+ OS=SOLARIS
+ P_SEP=:
+
+ case "$host_cpu" in
+ i*86)
+ CPU=I
+ CPUNAME=INTEL
+ OUTPATH=unxsoli
+ ;;
+ sparc)
+ CPU=S
+ CPUNAME=SPARC
+ OUTPATH=unxsogs
+ ;;
+ *)
+ AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+ ;;
+ esac
+ ;;
+
+*)
+ AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice for!])
+ ;;
+esac
+
+INPATH=${OUTPATH}${PROEXT}
+AC_SUBST(COM)
+AC_SUBST(CPU)
+AC_SUBST(CPUNAME)
+AC_SUBST(GUI)
+AC_SUBST(GUIBASE)
+AC_SUBST(INPATH)
+AC_SUBST(OS)
+AC_SUBST(OUTPATH)
+AC_SUBST(P_SEP)
+
+dnl ===================================================================
dnl Set up a different compiler to produce tools to run on the build
dnl machine when doing cross-compilation
dnl ===================================================================
@@ -2591,6 +2939,16 @@ if test "$cross_compiling" = "yes"; then
else
CC_FOR_BUILD="$CC"
CXX_FOR_BUILD="$CXX"
+ CC_FOR_BUILD="$CC"
+ COM_FOR_BUILD="$COM"
+ CPUNAME_FOR_BUILD="$CPUNAME"
+ CPU_FOR_BUILD="$CPU"
+ CXX_FOR_BUILD="$CXX"
+ GUIBASE_FOR_BUILD="$GUIBASE"
+ GUI_FOR_BUILD="$GUI"
+ INPATH_FOR_BUILD="$INPATH"
+ OS_FOR_BUILD="$OS"
+ OUTPATH_FOR_BUILD="$OUTPATH"
fi
AC_SUBST(COM_FOR_BUILD)
AC_SUBST(GUI_FOR_BUILD)
@@ -5476,7 +5834,7 @@ esac
if test "$_os" = Darwin; then
supp_path=''
for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin /opt/local/lib/postgresql9*/bin; do
- pg_supp_path="$PATH_SEPARATOR$d$pg_supp_path"
+ pg_supp_path="$P_SEP$d$pg_supp_path"
done
fi
AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path)
diff --git a/set_soenv.in b/set_soenv.in
index e7938f3..e63e44c 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -49,8 +49,8 @@ my ( $SOLAR_JAVA,
$CC, $CXX);
#
# Platform dependent constant values.
-my ( $COM, $ARCH, $CPU, $CPUNAME, $GUI, $GUIBASE,
- $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
+my ( $COM, $ARCH, $CPU,
+ $OS, $OSVERSION, $OUTPATH, $INPATH,
$DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR );
#
@@ -89,6 +89,12 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
my ( $dmake, $build, $mkout, $deliver, $zipdep );
#
+$OS="@OS@";
+$CPU="@CPU@";
+$COM="@COM@";
+$INPATH="@INPATH@";
+$OUTPATH="@OUTPATH@";
+
#-------------------------------------------------------------
# IIIa. Initialising constants.
#-------------------------------------------------------------
@@ -165,572 +171,447 @@ $TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external
# Setting platform dependent constant values.
if ( $platform =~ m/solaris/ )
-{ print "Setting Solaris specific values... ";
- if ($platform =~ m/^i[3456]86/)
- {
- if ( $CC =~ "gcc") {
- $OUTPATH = "unxsogi";
- } else {
- $OUTPATH = "unxsoli4";
- }
- $CPU = "I";
- $CPUNAME = "INTEL";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-
- }
- else
- {
- if ( $CC =~ "gcc") {
- $OUTPATH = "unxsogs";
- } else {
- $OUTPATH = "unxsols4";
- }
- $CPU = "S";
- $CPUNAME = "SPARC";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
- }
+{
+ print "Setting Solaris specific values... ";
+ if ($platform =~ m/^i[3456]86/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ else
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
+ }
- $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $INPATH = $OUTPATH.$PROEXT;
- $OS = "SOLARIS";
- $PATH_SEPERATOR = $ps;
+ $COMPATH = '@COMPATH@';
}
elsif ( $platform =~ m/netbsd/ )
{
#Set platform specific values:
- if ($platform =~ m/^i[3456]86/)
- { print "Setting NetBSD x86 specific values... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- }
- elsif ($platform =~ m/^x86_64/)
- { print "Setting NetBSD x86-64 specific values... ";
- $CPU = "X";
- $CPUNAME = "X86_64";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
- elsif ($platform =~ m/^sparc/)
- { print "Setting NetBSD Sparc specific values... ";
- $CPU = "S";
- $CPUNAME = "SPARC";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
- }
- elsif ($platform =~ m/powerpc/)
- { print "Setting NetBSD PPC specific values... ";
- $CPU = "P";
- $CPUNAME = "POWERPC";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
- }
- else
- { print "Unsupported NetBSD architecture: $platform \n";
- exit 1;
- }
+ if ($platform =~ m/^i[3456]86/)
+ {
+ print "Setting NetBSD x86 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^x86_64/)
+ {
+ print "Setting NetBSD x86-64 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^sparc/)
+ {
+ print "Setting NetBSD Sparc specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
+ }
+ elsif ($platform =~ m/powerpc/)
+ {
+ print "Setting NetBSD PPC specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ }
+ else
+ {
+ print "Unsupported NetBSD architecture: $platform \n";
+ exit 1;
+ }
# General NetBSD settings:
- $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $OS = "NETBSD";
- $PATH_SEPERATOR = $ps;
- $OUTPATH = "unxnbsd";
- $INPATH = $OUTPATH.$PROEXT;
+ $COMPATH = '@COMPATH@';
}
elsif ( $platform =~ m/kfreebsd/ )
{
# General GNU/kFreeBSD settings:
- $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $OS = "LINUX";
- $PATH_SEPERATOR = $ps;
+ $COMPATH = '@COMPATH@';
#Set platform specific values:
- if ($platform =~ m/^i[3456]86/)
- { print "Setting GNU/kFreeBSD x86 specific values... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
- $OUTPATH = "unxkfgi6";
-
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ if ($platform =~ m/^i[3456]86/)
+ {
+ print "Setting GNU/kFreeBSD x86 specific values... ";
- }
- elsif ($platform =~ m/^x86_64/)
- { print "Setting GNU/kFreeBSD x86-64 specific values... ";
- $CPU = "X";
- $CPUNAME = "X86_64";
- $OUTPATH = "unxkfgx6";
-
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^x86_64/)
+ {
+ print "Setting GNU/kFreeBSD x86-64 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
- $INPATH = $OUTPATH.$PROEXT;
}
elsif ( $platform =~ m/freebsd/ )
-{ $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $OS = "FREEBSD";
- $PATH_SEPERATOR = $ps;
- $OSVERSION = '@OSVERSION@';
- $OUTPATH = 'unxfbsd';
- if ($platform =~ m/^(amd64|x86_64)/)
- { my ( $JAVA_OS );
- print "Setting FreeBSD AMD64 specific values... ";
- $CPU = "X";
- $CPUNAME = "X86_64";
- $JAVA_OS = '@JAVA_HOME@';
- $JAVA_OS =~ s/.*\///;
- if ($JAVA_OS =~ m/^linux/)
- { $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- }
- else
- { $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
+{
+ $COMPATH = '@COMPATH@';
+ $OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^(amd64|x86_64)/)
+ {
+ my ( $JAVA_OS );
+ print "Setting FreeBSD AMD64 specific values... ";
+ $JAVA_OS = '@JAVA_HOME@';
+ $JAVA_OS =~ s/.*\///;
+ if ($JAVA_OS =~ m/^linux/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ else
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
}
elsif ($platform =~ m/^i386/)
- { print "Setting FreeBSD x86 specific values... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
- $OUTPATH = "unxfbsdi";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ {
+ print "Setting FreeBSD x86 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
else
- { print "Unsupported FreeBSD architecture: $platform \n";
- exit 1;
+ {
+ print "Unsupported FreeBSD architecture: $platform \n";
+ exit 1;
}
- $INPATH = $OUTPATH.$PROEXT;
}
elsif ( $platform =~ m/openbsd/ )
-{ $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $OS = "OPENBSD";
- $PATH_SEPERATOR = $ps;
- $OSVERSION = '@OSVERSION@';
- $OUTPATH = "unxobsd";
- if ($platform =~ m/^(amd64|x86_64)/)
- {
- print "Setting OpenBSD AMD64 specific values... ";
- $CPU = "X";
- $CPUNAME = "X86_64";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
- elsif ($platform =~ m/^i386/)
- { print "Setting OpenBSD x86 specific values... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- }
- else
- { print "Unsupported OpenBSD architecture: $platform \n";
- exit 1;
- }
- $INPATH = $OUTPATH.$PROEXT;
+{
+ $COMPATH = '@COMPATH@';
+ $OSVERSION = '@OSVERSION@';
+ if ($platform =~ m/^(amd64|x86_64)/)
+ {
+ print "Setting OpenBSD AMD64 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^i386/)
+ {
+ print "Setting OpenBSD x86 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ else
+ {
+ print "Unsupported OpenBSD architecture: $platform \n";
+ exit 1;
+ }
}
elsif ( $platform =~ m/linux/ )
{
# General Linux settings:
- $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $OS = "LINUX";
- $PATH_SEPERATOR = $ps;
+ $COMPATH = '@COMPATH@';
#Set platform specific values:
- if ($platform =~ m/^i[3456]86/)
- { print "Setting Linux x86 specific values... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
-
- if ($JDK =~ m/^[Ii][Bb][Mm]/)
- { $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."bin";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."bin".$ds."classic";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."bin"; }
-
- elsif ($JDK =~ m/^[Bb][Ee][Aa]/)
- { $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."jrockit";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; }
-
- else {
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- # has both server and client
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- }
-
- $OUTPATH = "unxlngi6";
- }
- elsif ($platform =~ m/^x86_64/)
- { print "Setting Linux x86-64 specific values... ";
- $CPU = "X";
- $CPUNAME = "X86_64";
- $OUTPATH = "unxlngx6";
- # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
- # has both server and client
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
- elsif ($platform =~ m/^ia64/)
- { print "Setting Linux ia64 specific values... ";
- $CPU = "A";
- $CPUNAME = "IA64";
- $OUTPATH = "unxlnga";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64".$ds."native_threads";
- }
- elsif ($platform =~ m/^sparc/)
-
- { print "Setting Linux Sparc specific values... ";
- $CPU = "S";
- $CPUNAME = "SPARC";
- $OUTPATH = "unxlngs";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
- }
- elsif ($platform =~ m/^powerpc/)
- {
- if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
- print "Setting Linux PPC64 specific values... ";
- $OUTPATH = "unxlngppc64";
- $CPUNAME = "POWERPC64";
-
- if ( $JDK eq "gcj" ) {
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
- }
- # OpenJDK
- elsif ($JDK =~ m/sun/) {
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
- }
- }
- else {
- print "Setting Linux PPC specific values... ";
- $OUTPATH = "unxlngppc";
- $CPUNAME = "POWERPC";
-
- if ( $JDK eq "gcj" ) {
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
- elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
- { $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
- }
- # OpenJDK
- elsif ($JDK =~ m/sun/) {
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
- }
- }
-
- $CPU = "P";
-
- }
- elsif ($platform =~ m/^s390/)
- {
- if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) {
- print "Setting Linux zSeries specific values... ";
- $CPUNAME = "S390X";
- $ARCH = "s390x";
- $OUTPATH = "unxlngs390x";
- }
- else {
- print "Setting Linux S/390 specific values... ";
- $CPUNAME = "S390";
- $ARCH = "s390";
- $OUTPATH = "unxlngs390";
- }
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH;
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
- $CPU = "3";
- }
- elsif ($platform =~ m/^m68k/)
- { print "Setting Linux m68k specific values... ";
- $CPU = "6";
- $CPUNAME = "M68K";
- $OUTPATH = "unxlngm68k";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads";
- }
- elsif ($platform =~ m/^hppa/)
- { print "Setting Linux hppa specific values... ";
- $CPU = "H";
- $CPUNAME = "HPPA";
- $OUTPATH = "unxlnghppa";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads";
- $EPM_FLAGS = "-a hppa";
- }
- elsif ($platform =~ m/^alpha/)
- { print "Setting Linux Alpha specific values... ";
- $CPU = "L";
- $CPUNAME = "AXP";
- $OUTPATH = "unxlngaxp";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
- }
- elsif ($platform =~ m/^arm.*?l-/)
- { print "Setting Linux ARM specific values... ";
- $CPU = "R";
- $CPUNAME = "ARM";
- $OUTPATH = "unxlngr";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
- $EPM_FLAGS = "-a arm";
- }
- elsif ($platform =~ m/^arm.*-androideabi/)
- { print "Setting Android ARM specific values... ";
- $GUIBASE = "android";
- $OS = "ANDROID";
- $CPU = "R";
- $CPUNAME = "ARM";
- $OUTPATH = "unxandr";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
- $EPM_FLAGS = "-a arm";
- }
- elsif ($platform =~ m/^mips/)
- { print "Setting Linux MIPS specific values... ";
- $CPU = "M";
- $CPUNAME = "GODSON";
- $OUTPATH = "unxlngmips";
-
- if ('@SIZEOF_LONG@' eq '8') {
- if ('@WORDS_BIGENDIAN@' ne 'yes') {
- $EPM_FLAGS = "-a mips64el";
- if ( $JDK eq "gcj" ) {
- $ARCH = "mips64el";
- }
+ if ($platform =~ m/^i[3456]86/)
+ {
+ print "Setting Linux x86 specific values... ";
+ if ($JDK =~ m/^[Ii][Bb][Mm]/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."bin";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."bin".$ds."classic";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."bin";
}
- else {
- $ARCH = "mips64";
+ elsif ($JDK =~ m/^[Bb][Ee][Aa]/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."jrockit";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
- }
- else {
- if ('@WORDS_BIGENDIAN@' ne 'yes') {
- $EPM_FLAGS = "-a mipsel";
- if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
- $ARCH = "mips32"; # Lemote
- } else {
- $ARCH = "mipsel";
- }
+ else
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ # has both server and client
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
- else {
- $ARCH = "mips";
+ }
+ elsif ($platform =~ m/^x86_64/)
+ {
+ print "Setting Linux x86-64 specific values... ";
+ # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
+ # has both server and client
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^ia64/)
+ {
+ print "Setting Linux ia64 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^sparc/)
+ {
+ print "Setting Linux Sparc specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^powerpc/)
+ {
+ if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8'))
+ {
+ print "Setting Linux PPC64 specific values... ";
+ if ( $JDK eq "gcj" )
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+ }
+ # OpenJDK
+ elsif ($JDK =~ m/sun/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+ }
+ }
+ else
+ {
+ print "Setting Linux PPC specific values... ";
+ if ( $JDK eq "gcj" )
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ }
+ elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
+ }
+ # OpenJDK
+ elsif ($JDK =~ m/sun/)
+ {
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ }
+ }
+ }
+ elsif ($platform =~ m/^s390/)
+ {
+ if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8'))
+ {
+ print "Setting Linux zSeries specific values... ";
+ $ARCH = "s390x";
+ }
+ else
+ {
+ print "Setting Linux S/390 specific values... ";
+ $ARCH = "s390";
+ }
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH;
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
+ }
+ elsif ($platform =~ m/^m68k/)
+ {
+ print "Setting Linux m68k specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^hppa/)
+ {
+ print "Setting Linux hppa specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads";
+ $EPM_FLAGS = "-a hppa";
+ }
+ elsif ($platform =~ m/^alpha/)
+ {
+ print "Setting Linux Alpha specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^arm.*?l-/)
+ {
+ print "Setting Linux ARM specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
+ $EPM_FLAGS = "-a arm";
+ }
+ elsif ($platform =~ m/^arm.*-androideabi/)
+ {
+ print "Setting Android ARM specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
+ $EPM_FLAGS = "-a arm";
+ }
+ elsif ($platform =~ m/^mips/)
+ {
+ print "Setting Linux MIPS specific values... ";
+
+ if ('@SIZEOF_LONG@' eq '8')
+ {
+ if ('@WORDS_BIGENDIAN@' ne 'yes')
+ {
+ $EPM_FLAGS = "-a mips64el";
+ if ( $JDK eq "gcj" )
+ {
+ $ARCH = "mips64el";
+ }
+ }
+ else
+ {
+ $ARCH = "mips64";
+ }
+ }
+ else
+ {
+ if ('@WORDS_BIGENDIAN@' ne 'yes')
+ {
+ $EPM_FLAGS = "-a mipsel";
+ if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" )
+ {
+ $ARCH = "mips32"; # Lemote
+ }
+ else
+ {
+ $ARCH = "mipsel";
+ }
+ }
+ else
+ {
+ $ARCH = "mips";
+ }
}
- }
-
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH;
- if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
- } else {
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
- }
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
- }
-
- $INPATH = $OUTPATH.$PROEXT;
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH;
+ if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" )
+ {
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
+ }
+ else
+ {
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
+ }
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
+ }
}
elsif ( $platform =~ m/cygwin|mingw32/ )
{
- $MSPDB_PATH = PathFormat('@MSPDB_PATH@');
- $MIDL_PATH = PathFormat('@MIDL_PATH@');
- $CSC_PATH = PathFormat('@CSC_PATH@');
- $SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
- $WINDOWS_SDK_HOME = PathFormat('@WINDOWS_SDK_HOME@');
- $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
- $USE_DIRECTX5 = "";
- $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
- $CPUNAME = "INTEL";
- $CPUNAME = "X86_64" if $CL_X64;
- $CPU = "I";
- $CPU = "X" if $CL_X64;
- $GUI = "WNT";
- $GUIBASE = "WIN";
- $OS = "WNT";
- $DYNAMIC_CRT = "TRUE";
- $use_shl_versions = "TRUE";
- $wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
- if ( $MINGW eq "yes" )
- { print "Setting Windows (MinGW cross-compilation) specific values... ";
-
- die 'For building natively on Windows we support only MSVC' if ('@build_os@' eq 'cygwin');
-
- $PATH_SEPERATOR = ':';
- $COMPATH = PathFormat('@COMPATH@/bin');
- $COMPATH =~ s/\/bin$//i;
- $COM = "GCC";
- $OUTPATH = "wntgcci";
- $OUTPATH = "wntgccx" if $platform =~ m/^x86_64/;
- $INPATH = $OUTPATH.$PROEXT;
- }
- else # The MSVC section starts here
- { print "Setting Windows (MSVC) specific values... ";
- $COMPATH = PathFormat('@COMPATH@');
- $COM = "MSC";
- $OUTPATH = "wntmsci at COMEX@";
- $OUTPATH = "wntmscx at COMEX@" if $CL_X64;
- $INPATH = $OUTPATH.$PROEXT;
- $COMEX = '@COMEX@';
- if ( "@DISABLE_ACTIVEX@" ) {
- $ATL_LIB = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
- $ATL_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."atl";
- $MFC_LIB = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
- $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
- } else {
- $ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
- $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
- $MFC_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
- $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
- }
- if ($CL_X64) {
- $ATL_LIB .= $ds."amd64";
- $MFC_LIB .= $ds."amd64";
- }
- $PATH_SEPERATOR = ';';
- }
+ $MSPDB_PATH = PathFormat('@MSPDB_PATH@');
+ $MIDL_PATH = PathFormat('@MIDL_PATH@');
+ $CSC_PATH = PathFormat('@CSC_PATH@');
+ $SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
+ $WINDOWS_SDK_HOME = PathFormat('@WINDOWS_SDK_HOME@');
+ $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
+ $USE_DIRECTX5 = "";
+ $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
+ $DYNAMIC_CRT = "TRUE";
+ $use_shl_versions = "TRUE";
+ $wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
+ if ( $MINGW eq "yes" )
+ {
+ print "Setting Windows (MinGW cross-compilation) specific values... ";
+
+ die 'For building natively on Windows we support only MSVC' if ('@build_os@' eq 'cygwin');
+
+ $COMPATH = PathFormat('@COMPATH@/bin');
+ $COMPATH =~ s/\/bin$//i;
+ }
+ else # The MSVC section starts here
+ {
+ print "Setting Windows (MSVC) specific values... ";
+ $COMPATH = PathFormat('@COMPATH@');
+ $COMEX = '@COMEX@';
+ if ( "@DISABLE_ACTIVEX@" )
+ {
+ $ATL_LIB = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
+ $ATL_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."atl";
+ $MFC_LIB = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
+ $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
+ }
+ else
+ {
+ $ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
+ $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
+ $MFC_LIB = $COMPATH.$ds."atlmfc".$ds."lib";
+ $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
+ }
+ if ($CL_X64)
+ {
+ $ATL_LIB .= $ds."amd64";
+ $MFC_LIB .= $ds."amd64";
+ }
+ }
}
elsif ( $platform =~ m/darwin/ )
{
- $COM = "GCC";
$COMPATH = '@COMPATH@';
if ($platform =~ m/^arm/)
{
print "Setting values for iOS... ";
- $CPU = "R";
- $CPUNAME = "ARM";
- $OUTPATH = "unxiosr";
- $GUI = "UNX";
- $OS = "IOS";
- $GUIBASE = "cocoatouch";
}
elsif ($platform =~ m/^powerpc/)
{
print "Setting values for Mac OS X/Darwin on PowerPC... ";
- $CPU = "P";
- $CPUNAME = "POWERPC";
- $OUTPATH = "unxmacxp";
- $OS = "MACOSX";
- $GUI = "UNX";
- $GUIBASE = "aqua";
$MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
$FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
}
else
{
print "Setting values for Mac OS X/Darwin on default x86... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
- $OUTPATH = "unxmacxi";
- $OS = "MACOSX";
- $GUI = "UNX";
- $GUIBASE = "aqua";
$MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
$FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
}
- $INPATH = $OUTPATH.$PROEXT;
- $PATH_SEPERATOR = $ps;
}
elsif ( $platform =~ m/dragonfly/ )
{
- if ($platform =~ m/^i386/)
- { print "Setting DragonFly i386 specific values... ";
- $CPU = "I";
- $CPUNAME = "INTEL";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- }
- elsif ($platform =~ m/^x86_64/)
- { print "Setting DragonFly x86-64 specific values... ";
- $CPU = "X";
- $CPUNAME = "X86_64";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
- }
- else
- { print "Unsupported DragonFly architecture: $platform \n";
- exit 1;
- }
+ if ($platform =~ m/^i386/)
+ {
+ print "Setting DragonFly i386 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^x86_64/)
+ {
+ print "Setting DragonFly x86-64 specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
+ else
+ {
+ print "Unsupported DragonFly architecture: $platform \n";
+ exit 1;
+ }
# General DragonFly settings:
- $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $OS = "DRAGONFLY";
- $PATH_SEPERATOR = $ps;
- $OUTPATH = "unxdfly";
- $INPATH = $OUTPATH.$PROEXT;
+ $COMPATH = '@COMPATH@';
}
elsif ( $platform =~ m/aix/ )
{
- print "Setting AIX PPC specific values... ";
- $CPU = "P";
- $CPUNAME = "POWERPC";
- $OUTPATH = "unxaigppc";
- $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
- $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
- $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
- $COM = "GCC";
- $COMPATH = '@COMPATH@';
- $GUI = "UNX";
- $GUIBASE = "unx";
- $INPATH = $OUTPATH.$PROEXT;
- $OS = "AIX";
- $PATH_SEPERATOR = $ps;
+ print "Setting AIX PPC specific values... ";
+ $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ $COMPATH = '@COMPATH@';
}
-else {
+else
+{
print "\nset_soenv: Cannot recognize the platform you are building for: $platform.\n";
exit 1;
}
@@ -751,7 +632,8 @@ $OOO_SHELL = '@BASH@';
# ml.exe assembler path for Windows users.
if ($platform =~ m/cygwin/)
-{ $ASM_PATH = PathFormat('@ASM_HOME@');
+{
+ $ASM_PATH = PathFormat('@ASM_HOME@');
}
# Check for prebuild mozab libraries if we don't build them # ourselves
@@ -988,7 +870,6 @@ if ($platform =~ m/cygwin/)
# The general environment path.
if ($platform =~ m/linux|netbsd|freebsd|aix|solaris|openbsd|dragonfly/)
{ $PATH = $cur_dir.
-# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
$ps.'$SOLARENV'.$BIN;
@@ -1018,7 +899,6 @@ elsif ($platform =~ m/cygwin/)
my ( $tmppath );
$PATH = $cur_dir.
-# $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
$ps.CygFormat($SOLARENV).$ds."bin".
$ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
@@ -1120,7 +1000,6 @@ elsif ($platform =~ m/mingw32/)
my ( $tmppath );
$PATH = $cur_dir.
-# $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
$ps.CygFormat($SOLARENV).$ds."bin".
$ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
@@ -1128,7 +1007,6 @@ elsif ($platform =~ m/mingw32/)
}
elsif ($platform =~ m/darwin/)
{ $PATH = $cur_dir.
-# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
$ps.'$SOLARENV'.$BIN;
@@ -1439,17 +1317,8 @@ ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@", "e" );
# (c = comment, e = environment variable, a = alias )
ToFile( "Platform dependent constant values.", $empty, "c" );
ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
-ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
-ToFile( "CPU", $CPU, "e" );
-ToFile( "CPUNAME", $CPUNAME, "e" );
-ToFile( "GUI", $GUI, "e" );
-ToFile( "GUIBASE", $GUIBASE, "e" );
-ToFile( "OS", $OS, "e" );
ToFile( "OSVERSION", $OSVERSION, "e" );
-ToFile( "OUTPATH", $OUTPATH, "e" );
-ToFile( "INPATH", $INPATH, "e" );
-ToFile( "PATH_SEPERATOR", $PATH_SEPERATOR, "e" );
ToFile( "COMEX", $COMEX, "e" );
ToFile( "DYNAMIC_CRT", $DYNAMIC_CRT, "e" );
ToFile( "use_shl_versions", $use_shl_versions, "e" );
@@ -1596,17 +1465,9 @@ ToFile( "BUILD_PLATFORM", "@build@", "e" );
ToFile( "HOST_PLATFORM", "@host@", "e" );
if ( '@CROSS_COMPILING@' eq 'YES' )
{
- ToFile( "COM_FOR_BUILD", "@COM_FOR_BUILD@", "e" );
- ToFile( "GUI_FOR_BUILD", "@GUI_FOR_BUILD@", "e" );
- ToFile( "GUIBASE_FOR_BUILD", "@GUIBASE_FOR_BUILD@", "e" );
- ToFile( "OS_FOR_BUILD", "@OS_FOR_BUILD@", "e" );
- ToFile( "CPU_FOR_BUILD", "@CPU_FOR_BUILD@", "e" );
- ToFile( "CPUNAME_FOR_BUILD", "@CPUNAME_FOR_BUILD@", "e" );
ToFile( "CC_FOR_BUILD", "@CC_FOR_BUILD@", "e" );
ToFile( "CXX_FOR_BUILD", "@CXX_FOR_BUILD@", "e" );
ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
- ToFile( "INPATH_FOR_BUILD", "@INPATH_FOR_BUILD@", "e" );
- ToFile( "OUTPATH_FOR_BUILD", "@OUTPATH_FOR_BUILD@", "e" );
ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
ToFile( "OUTDIR_FOR_BUILD", "@OUTDIR_FOR_BUILD@", "e");
@@ -1616,17 +1477,9 @@ if ( '@CROSS_COMPILING@' eq 'YES' )
}
else
{
- ToFile( "COM_FOR_BUILD", $COM, "e" );
- ToFile( "GUI_FOR_BUILD", $GUI, "e" );
- ToFile( "GUIBASE_FOR_BUILD", $GUIBASE, "e" );
- ToFile( "OS_FOR_BUILD", $OS, "e" );
- ToFile( "CPU_FOR_BUILD", $CPU, "e" );
- ToFile( "CPUNAME_FOR_BUILD", $CPUNAME, "e" );
ToFile( "CC_FOR_BUILD", $CC, "e" );
ToFile( "CXX_FOR_BUILD", $CXX, "e" );
ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
- ToFile( "INPATH_FOR_BUILD", $INPATH, "e" );
- ToFile( "OUTPATH_FOR_BUILD", $OUTPATH, "e" );
ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" );
ToFile( "OUTDIR_FOR_BUILD", $OUTDIR, "e" );
ToFile( "PATH_FOR_BUILD", $PATH, "e" );
commit ca9b239323aa29e2ca1f2281343a4e5fdbcd782c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Dec 30 16:31:53 2011 -0600
move MS stuff earlier in configure. pre-work for set_soenv.in migration
diff --git a/configure.in b/configure.in
index 27f5373..899ef51 100644
--- a/configure.in
+++ b/configure.in
@@ -2146,6 +2146,64 @@ AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
dnl ===================================================================
+dnl Windows specific tests and stuff
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+
+ dnl Include twain scanners
+ BUILD_TYPE="$BUILD_TYPE TWAIN"
+
+ dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
+ AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
+ if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
+ CL_X64=""
+ AC_MSG_RESULT([no])
+ else
+ CL_X64="TRUE"
+ AC_MSG_RESULT([yes])
+ fi
+ AC_SUBST(CL_X64)
+
+ AC_MSG_CHECKING([whether to use DirectX])
+ if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
+ ENABLE_DIRECTX="TRUE"
+ AC_MSG_RESULT([yes])
+ else
+ ENABLE_DIRECTX=""
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(ENABLE_DIRECTX)
+
+ AC_MSG_CHECKING([whether to use ActiveX])
+ if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
+ DISABLE_ACTIVEX=""
+ AC_MSG_RESULT([yes])
+ else
+ DISABLE_ACTIVEX="TRUE"
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(DISABLE_ACTIVEX)
+
+ AC_MSG_CHECKING([whether to use ATL])
+ if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE"; then
+ DISABLE_ATL=""
+ AC_MSG_RESULT([yes])
+ elif test "$enable_atl" = ""; then
+ if test "$WITH_MINGW" = "yes"; then
+ DISABLE_ATL="TRUE"
+ AC_MSG_RESULT([no])
+ else
+ DISABLE_ATL=""
+ AC_MSG_RESULT([yes])
+ fi
+ else
+ DISABLE_ATL="TRUE"
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(DISABLE_ATL)
+fi
+
+dnl ===================================================================
dnl Test the gcc version, 3 is OK
dnl ===================================================================
if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
@@ -2261,6 +2319,195 @@ AC_SUBST(PRODUCT)
AC_SUBST(PROEXT)
dnl ===================================================================
+dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
+dnl ===================================================================
+SHOWINCLUDES_PREFIX=
+if test "$_os" = "WINNT"; then
+ if test "$WITH_MINGW" != "yes"; then
+ AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path])
+ if test -z "$with_cl_home"; then
+ vctest=`./oowintool --msvc-productdir`;
+ if test "$CL_X64" = ""; then
+ if test -x "$vctest/bin/cl.exe"; then
+ with_cl_home=$vctest;
+ fi
+ else
+ if test -x "$vctest/bin/amd64/cl.exe"; then
+ with_cl_home=$vctest;
+ fi
+ fi
+ else
+ with_cl_home=`cygpath -u "$with_cl_home"`
+ fi
+ with_cl_home=`cygpath -d "$with_cl_home"`
+ with_cl_home=`cygpath -u "$with_cl_home"`
+ AC_MSG_RESULT([$with_cl_home])
+
+ dnl ===========================================================
+ dnl Check for mspdb80.dll/mspdb100.dll
+ dnl ===========================================================
+ dnl MSVS 2008/10 Compiler
+ if test -n "$with_mspdb_path";then
+ with_mspdb_path=`cygpath -u "$with_mspdb_path"`
+ fi
+ if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then
+ MSPDB_PATH="$with_mspdb_path"
+ fi
+ dnl MSVS 2008 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
+ MSPDB_PATH="$with_cl_home/../Common7/IDE"
+ fi
+ dnl Windows SDK 6.0 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
+ MSPDB_PATH="$with_cl_home/bin"
+ fi
+ dnl MSVS 2010 case
+ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then
+ MSPDB_PATH="$with_cl_home/../Common7/IDE"
+ fi
+
+ if test -z "$MSPDB_PATH";then
+ dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
+ AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
+ AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
+ MSPDB_PATH=`dirname "$MSPDB_PATH"`
+ fi
+
+ if test -z "$MSPDB_PATH"; then
+ AC_MSG_ERROR([You need a mspdb80.dllor mspdb100.dll, make sure it is in the path or use --with-mspdb-path])
+ fi
+ MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
+ MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
+ dnl The path needs to be added before cl is called
+ PATH="$MSPDB_PATH:$PATH"
+
+ AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
+ if test -z "$CC"; then
+ if test "$CL_X64" = ""; then
+ if test -x "$with_cl_home/bin/cl.exe"; then
+ CC="$with_cl_home/bin/cl.exe"
+ fi
+ else
+ if test -x "$with_cl_home/bin/amd64/cl.exe"; then
+ CC="$with_cl_home/bin/amd64/cl.exe"
+ fi
+ fi
+ if test -z "$CC"; then
+ AC_PATH_PROG(CC, cl.exe)
+ fi
+ # This gives us a posix path with 8.3 filename restrictions
+ CC=`cygpath -d "$CC"`
+ CC=`cygpath -u "$CC"`
+ fi
+
+ if test -n "$CC"; then
+ # Remove /cl.exe from CC case insensitive
+ AC_MSG_RESULT([found ($CC)])
+ if test "$CL_X64" = ""; then
+ COMPATH=`echo $CC | $SED -e 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
+ else
+ if test -n "$with_cl_home"; then
+ COMPATH=`echo $with_cl_home`
+ fi
+ fi
+ export INCLUDE=`cygpath -d "$COMPATH/Include"`
+ dnl Check which Microsoft C/C++ compiler is found
+ AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
+ # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
+ CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
+ x = match( \\\$0, /..\\...\\...../ )
+ CCversion = substr( \\\$0, RSTART, RLENGTH)
+ tokencount = split (CCversion,vertoken,\".\")
+ for ( i = 1 ; i <= tokencount ; i++ ) {
+ printf (\"%04d\",vertoken[[i]] )
+ }
+ }"`
+ if test "$CCNUMVER" -ge "001600000000"; then
+ COMEX=13
+ MSVSVER=2010
+ elif test "$CCNUMVER" -ge "001500000000"; then
+ COMEX=12
+ MSVSVER=2008
+ else
+ AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.])
+ fi
+ AC_MSG_RESULT([found compiler version $CCNUMVER (MSVS $MSVSVER).])
+ else
+ AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
+ fi
+
+ dnl We need to guess the prefix of the -showIncludes output, it can be
+ dnl localized
+ AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)])
+ echo "#include <stdlib.h>" > conftest.c
+ SHOWINCLUDES_PREFIX=`$CC -c -showIncludes conftest.c 2>/dev/null | \
+ grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
+ rm -f conftest.c conftest.obj
+ if test -z "$SHOWINCLUDES_PREFIX" ; then
+ AC_MSG_ERROR([cannot determine the -showIncludes prefix])
+ else
+ AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
+ fi
+
+ # Check for 64-bit (cross-)compiler to use to build the 64-bit
+ # version of the Explorer extension (and maybe other small
+ # bits, too) needed when installing a 32-bit LibreOffice on a
+ # 64-bit OS. The 64-bit Explorer extension is a feature that
+ # has been present since long in OOo. Don't confuse it with
+ # building LibreOffice itself as 64-bit code, which is
+ # unfished work and highly experimental.
+
+ BUILD_X64=
+ CC_X64_BINARY=
+ LINK_X64_BINARY=
+ LIBMGR_X64_BINARY=
+
+ AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component])
+ if test "$CL_X64" = "" -a -f "$with_cl_home/atlmfc/lib/amd64/atls.lib"; then
+ # Prefer native x64 compiler to cross-compiler, in case we are running
+ # the build on a 64-bit OS.
+ if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
+ elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
+ fi
+ fi
+ if test "$BUILD_X64" = TRUE; then
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
+ fi
+ AC_SUBST(BUILD_X64)
+
+ # These are passed to the environment through set_soenv.in as usual, and then
+ # used in set_wntx64.mk
+ AC_SUBST(CC_X64_BINARY)
+ AC_SUBST(CXX_X64_BINARY)
+ AC_SUBST(LINK_X64_BINARY)
+ AC_SUBST(LIBMGR_X64_BINARY)
+
+ else
+ AC_MSG_CHECKING([the compiler is MinGW])
+ MACHINE_PREFIX=`$CC -dumpmachine`
+ if echo $MACHINE_PREFIX | grep -q mingw32; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_ERROR([Compiler is not MinGW.])
+ fi
+ fi
+fi
+AC_SUBST(COMEX)
+AC_SUBST(MSPDB_PATH)
+AC_SUBST(SHOWINCLUDES_PREFIX)
dnl Set up a different compiler to produce tools to run on the build
dnl machine when doing cross-compilation
dnl ===================================================================
@@ -2385,63 +2632,6 @@ fi
AC_SUBST(ENABLE_CRASHDUMP)
-dnl ===================================================================
-dnl Windows specific tests and stuff
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-
- dnl Include twain scanners
- BUILD_TYPE="$BUILD_TYPE TWAIN"
-
- dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
- AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
- if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
- CL_X64=""
- AC_MSG_RESULT([no])
- else
- CL_X64="TRUE"
- AC_MSG_RESULT([yes])
- fi
- AC_SUBST(CL_X64)
-
- AC_MSG_CHECKING([whether to use DirectX])
- if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
- ENABLE_DIRECTX="TRUE"
- AC_MSG_RESULT([yes])
- else
- ENABLE_DIRECTX=""
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(ENABLE_DIRECTX)
-
- AC_MSG_CHECKING([whether to use ActiveX])
- if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
- DISABLE_ACTIVEX=""
- AC_MSG_RESULT([yes])
- else
- DISABLE_ACTIVEX="TRUE"
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(DISABLE_ACTIVEX)
-
- AC_MSG_CHECKING([whether to use ATL])
- if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE"; then
- DISABLE_ATL=""
- AC_MSG_RESULT([yes])
- elif test "$enable_atl" = ""; then
- if test "$WITH_MINGW" = "yes"; then
- DISABLE_ATL="TRUE"
- AC_MSG_RESULT([no])
- else
- DISABLE_ATL=""
- AC_MSG_RESULT([yes])
- fi
- else
- DISABLE_ATL="TRUE"
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(DISABLE_ATL)
-fi
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
@@ -2856,196 +3046,6 @@ else
AC_MSG_ERROR([Failed to find some modules])
fi
-dnl ===================================================================
-dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
-dnl ===================================================================
-SHOWINCLUDES_PREFIX=
-if test "$_os" = "WINNT"; then
- if test "$WITH_MINGW" != "yes"; then
- AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path])
- if test -z "$with_cl_home"; then
- vctest=`./oowintool --msvc-productdir`;
- if test "$CL_X64" = ""; then
- if test -x "$vctest/bin/cl.exe"; then
- with_cl_home=$vctest;
- fi
- else
- if test -x "$vctest/bin/amd64/cl.exe"; then
- with_cl_home=$vctest;
- fi
- fi
- else
- with_cl_home=`cygpath -u "$with_cl_home"`
- fi
- with_cl_home=`cygpath -d "$with_cl_home"`
- with_cl_home=`cygpath -u "$with_cl_home"`
- AC_MSG_RESULT([$with_cl_home])
-
- dnl ===========================================================
- dnl Check for mspdb80.dll/mspdb100.dll
- dnl ===========================================================
- dnl MSVS 2008/10 Compiler
- if test -n "$with_mspdb_path";then
- with_mspdb_path=`cygpath -u "$with_mspdb_path"`
- fi
- if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then
- MSPDB_PATH="$with_mspdb_path"
- fi
- dnl MSVS 2008 case
- if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
- MSPDB_PATH="$with_cl_home/../Common7/IDE"
- fi
- dnl Windows SDK 6.0 case
- if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
- MSPDB_PATH="$with_cl_home/bin"
- fi
- dnl MSVS 2010 case
- if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then
- MSPDB_PATH="$with_cl_home/../Common7/IDE"
- fi
-
- if test -z "$MSPDB_PATH";then
- dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
- AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
- AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
- MSPDB_PATH=`dirname "$MSPDB_PATH"`
- fi
-
- if test -z "$MSPDB_PATH"; then
- AC_MSG_ERROR([You need a mspdb80.dllor mspdb100.dll, make sure it is in the path or use --with-mspdb-path])
- fi
- MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
- MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
- dnl The path needs to be added before cl is called
- PATH="$MSPDB_PATH:$PATH"
-
- AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
- if test -z "$CC"; then
- if test "$CL_X64" = ""; then
- if test -x "$with_cl_home/bin/cl.exe"; then
- CC="$with_cl_home/bin/cl.exe"
- fi
- else
- if test -x "$with_cl_home/bin/amd64/cl.exe"; then
- CC="$with_cl_home/bin/amd64/cl.exe"
- fi
- fi
- if test -z "$CC"; then
- AC_PATH_PROG(CC, cl.exe)
- fi
- # This gives us a posix path with 8.3 filename restrictions
- CC=`cygpath -d "$CC"`
- CC=`cygpath -u "$CC"`
- fi
-
- if test -n "$CC"; then
- # Remove /cl.exe from CC case insensitive
- AC_MSG_RESULT([found ($CC)])
- if test "$CL_X64" = ""; then
- COMPATH=`echo $CC | $SED -e 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
- else
- if test -n "$with_cl_home"; then
- COMPATH=`echo $with_cl_home`
- fi
- fi
- export INCLUDE=`cygpath -d "$COMPATH/Include"`
- dnl Check which Microsoft C/C++ compiler is found
- AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
- # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
- CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
- x = match( \\\$0, /..\\...\\...../ )
- CCversion = substr( \\\$0, RSTART, RLENGTH)
- tokencount = split (CCversion,vertoken,\".\")
- for ( i = 1 ; i <= tokencount ; i++ ) {
- printf (\"%04d\",vertoken[[i]] )
- }
- }"`
- if test "$CCNUMVER" -ge "001600000000"; then
- COMEX=13
- MSVSVER=2010
- elif test "$CCNUMVER" -ge "001500000000"; then
- COMEX=12
- MSVSVER=2008
- else
- AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.])
- fi
- AC_MSG_RESULT([found compiler version $CCNUMVER (MSVS $MSVSVER).])
- else
- AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
- fi
-
- dnl We need to guess the prefix of the -showIncludes output, it can be
- dnl localized
- AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)])
- echo "#include <stdlib.h>" > conftest.c
- SHOWINCLUDES_PREFIX=`$CC -c -showIncludes conftest.c 2>/dev/null | \
- grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
- rm -f conftest.c conftest.obj
- if test -z "$SHOWINCLUDES_PREFIX" ; then
- AC_MSG_ERROR([cannot determine the -showIncludes prefix])
- else
- AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
- fi
-
- # Check for 64-bit (cross-)compiler to use to build the 64-bit
- # version of the Explorer extension (and maybe other small
- # bits, too) needed when installing a 32-bit LibreOffice on a
- # 64-bit OS. The 64-bit Explorer extension is a feature that
- # has been present since long in OOo. Don't confuse it with
- # building LibreOffice itself as 64-bit code, which is
- # unfished work and highly experimental.
-
- BUILD_X64=
- CC_X64_BINARY=
- LINK_X64_BINARY=
- LIBMGR_X64_BINARY=
-
- AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component])
- if test "$CL_X64" = "" -a -f "$with_cl_home/atlmfc/lib/amd64/atls.lib"; then
- # Prefer native x64 compiler to cross-compiler, in case we are running
- # the build on a 64-bit OS.
- if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
- BUILD_X64=TRUE
- CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
- CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
- LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
- LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
- elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
- BUILD_X64=TRUE
- CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
- CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
- LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
- LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
- fi
- fi
- if test "$BUILD_X64" = TRUE; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_RESULT([not found])
- AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
- fi
- AC_SUBST(BUILD_X64)
-
- # These are passed to the environment through set_soenv.in as usual, and then
- # used in set_wntx64.mk
- AC_SUBST(CC_X64_BINARY)
- AC_SUBST(CXX_X64_BINARY)
- AC_SUBST(LINK_X64_BINARY)
- AC_SUBST(LIBMGR_X64_BINARY)
-
- else
- AC_MSG_CHECKING([the compiler is MinGW])
- MACHINE_PREFIX=`$CC -dumpmachine`
- if echo $MACHINE_PREFIX | grep -q mingw32; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([Compiler is not MinGW.])
- fi
- fi
-fi
-AC_SUBST(COMEX)
-AC_SUBST(MSPDB_PATH)
-AC_SUBST(SHOWINCLUDES_PREFIX)
dnl ===================================================================
dnl Check for pkg-config
More information about the Libreoffice-commits
mailing list