Skip to content

C
core
Kaydet (Commit) 9bbb628e authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

oops use == not = in dmake conditional

üst 4f769af9
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 99 deletions
config_host.mk.in
Dosyayı görüntüle @ 9bbb628e
......@@ -17,7 +17,7 @@ export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@"
export BSH_JAR="@BSH_JAR@"
export BUILD_DMAKE="@BUILD_DMAKE@"
export BUILD_EPM="@BUILD_EPM@"
export BUILD_MOZAB="@BUILD_MOZAB@"
@x_MOZ@ export BUILD_MOZAB="@BUILD_MOZAB@"
export BUILD_NCPUS="@BUILD_NCPUS@"
export BUILD_POSTGRESQL_SDBC="@BUILD_POSTGRESQL_SDBC@"
export BUILD_STAX="@BUILD_STAX@"
......@@ -51,6 +51,7 @@ export DBUS_CFLAGS="@DBUS_CFLAGS@"
export DBUS_LIBS="@DBUS_LIBS@"
export DB_CPPLIB="@DB_CPPLIB@"
export DB_LIB="@DB_LIB@"
@x_MOZ@ export DEFAULT_MOZILLA_TOOLKIT="@MOZILLA_TOOLKIT@"
export DEFAULT_TO_ENGLISH_FOR_PACKING="yes"
export DIAGRAM_EXTENSION_PACK="@DIAGRAM_EXTENSION_PACK@"
export DICT_SYSTEM_DIR="@DICT_SYSTEM_DIR@"
......@@ -205,13 +206,14 @@ export MKDEPENDSOLVER="TRUE"
export ML_EXE="@ML_EXE@"
export MOC4="@MOC4@"
export MOC="@MOC@"
export MOZILLABUILD="@MOZILLABUILD@"
export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
export MOZ_FLAVOUR="@MOZ_FLAVOUR@"
export MOZ_INC="@MOZ_INC@"
export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
export MOZ_LIB="@MOZ_LIB@"
export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@"
@x_MOZ@ export MOZILLABUILD="@MOZILLABUILD@"
@x_MOZ@ export MOZILLA_HEADERS_CFLAGS="@MOZILLA_HEADERS_CFLAGS@"
@x_MOZ@ export MOZILLA_VERSION="@MOZILLA_VERSION@"
@x_MOZ@ export MOZ_FLAVOUR="@MOZ_FLAVOUR@"
@x_MOZ@ export MOZ_INC="@MOZ_INC@"
@x_MOZ@ export MOZ_LDAP_CFLAGS="@MOZ_LDAP_CFLAGS@"
@x_MOZ@ export MOZ_LIB="@MOZ_LIB@"
@x_MOZ@ export MOZ_LIB_XPCOM="@MOZ_LIB_XPCOM@"
export MYSQL_DEFINES="@MYSQL_DEFINES@"
export MYSQL_INC="@MYSQL_INC@"
export MYSQL_LIB="@MYSQL_LIB@"
......@@ -248,6 +250,7 @@ export POPPLER_CFLAGS="@POPPLER_CFLAGS@"
export POPPLER_LIBS="@POPPLER_LIBS@"
export POSTGRESQL_INC="@POSTGRESQL_INC@"
export POSTGRESQL_LIB="@POSTGRESQL_LIB@"
@x_MOZ@ export PREBUILD_MOZAB="@PREBUILD_MOZAB@"
export PREFIXDIR="@PREFIXDIR@"
export PRODUCT="@PRODUCT@"
export PRODUCTNAME="@PRODUCTNAME@"
......
configure.in
Dosyayı görüntüle @ 9bbb628e
......@@ -6308,6 +6308,7 @@ AC_SUBST(WITH_OPENLDAP)
dnl ===================================================================
dnl Check for system mozilla
dnl ===================================================================
AC_MSG_CHECKING([which Mozilla to use])
if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
AC_MSG_RESULT([external])
......@@ -6370,24 +6371,25 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.])
elif test "$enable_mozilla" = "no"; then
AC_MSG_RESULT([none])
x_MOZ=[\#]
WITH_MOZILLA=NO
else
AC_MSG_RESULT([internal])
SYSTEM_MOZILLA=NO
BUILD_TYPE="$BUILD_TYPE MOZ"
if test -z "$with_mozilla_version"; then
if test -z "$with_mozilla_version"; then
MOZILLA_VERSION=
else
else
AC_MSG_CHECKING([which Mozilla version to build])
MOZILLA_VERSION=$with_mozilla_version
enable_build_mozilla=1
AC_MSG_RESULT([$MOZILLA_VERSION])
fi
fi
AC_SUBST(MOZILLA_VERSION)
AC_SUBST(MOZILLA_VERSION)
AC_MSG_CHECKING([for toolkit Mozilla should use])
if test -z "$with_mozilla_toolkit"; then
AC_MSG_CHECKING([for toolkit Mozilla should use])
if test -z "$with_mozilla_toolkit"; then
if test "$_os" != "WINNT" ; then
if test "$_os" = "Darwin" ; then
MOZILLA_TOOLKIT=mac
......@@ -6397,31 +6399,31 @@ if test -z "$with_mozilla_toolkit"; then
AC_MSG_RESULT([gtk2])
fi
fi
else
else
MOZILLA_TOOLKIT=$with_mozilla_toolkit
enable_build_mozilla=1
AC_MSG_RESULT([$MOZILLA_TOOLKIT])
fi
fi
AC_SUBST(MOZILLA_TOOLKIT)
AC_SUBST(MOZILLA_TOOLKIT)
# default to enabling build mozilla
if test "$enable_build_mozilla" != "no"; then
# default to enabling build mozilla
if test "$enable_build_mozilla" != "no"; then
enable_build_mozilla=yes
else
else
enable_build_mozilla=
fi
fi
AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
if test -n "$enable_build_mozilla"; then
AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
if test -n "$enable_build_mozilla"; then
BUILD_MOZAB="TRUE"
AC_MSG_RESULT([yes])
else
else
BUILD_MOZAB=""
AC_MSG_RESULT([no])
fi
fi
if test "$BUILD_MOZAB" = "TRUE"; then
if test "$BUILD_MOZAB" = "TRUE"; then
if test "$_os" = "WINNT"; then
if test "$WITH_MINGW" != "yes"; then
# compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
......@@ -6497,11 +6499,46 @@ Use "./download" to download.])
fi
fi
fi
fi
AC_SUBST(BUILD_MOZAB)
else
AC_MSG_CHECKING([which pre-built Mozilla module in moz/zipped])
if test -e "$SRC_ROOT/moz/zipped/${OS}${COM}${CPU}inc.zip" -a \
-e "$SRC_ROOT/moz/zipped/${OS}${COM}${CPU}lib.zip" -a \
-e "$SRC_ROOT/moz/zipped/${OS}${COM}${CPU}runtime.zip" ; then
AC_MSG_RESULT([Found])
PREBUILD_MOZAB="YES"
if test "$_os" = "cygwin" ; then
AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt Mozilla])
if test -e "$SRC_ROOT/external/msvcp80/Microsoft.VC80.CRT.manifest" -a \
-e "$SRC_ROOT/external/msvcp80/msvcp80.dll" -a \
-e "$SRC_ROOT/external/msvcp80/msvcr80.dll" ; then
AC_MSG_RESULT([Found])
else
AC_MSG_RESULT([Not Found])
AC_MSG_ERROR([For the pre-built Mozilla libraries, you need MSVC 2005 runtime files
Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll
in external/msvcp80.
You can get them by installing:
<http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE>
and copying the abovementioned files from:
c:/windows/winsxs/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989/
and
c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989.manifest
])
fi
fi
else
AC_MSG_RESULT([Not Found])
AC_MSG_ERROR([If you don't use system mozilla and also disable the build of internal mozilla, you must provided the appropriate libraries yourself.
You need to copy $OS$COM$CPU{inc,lib,runtime}.zip into moz/zipped.
These files can be found at <http://dev-www.libreoffice.org/mozilla/>
])
fi
fi
fi
AC_SUBST(x_MOZ)
AC_SUBST(BUILD_MOZAB)
AC_SUBST(PREBUILT_MOZAB)
AC_SUBST(MOZILLABUILD)
AC_SUBST(SYSTEM_MOZILLA)
AC_SUBST(MOZ_FLAVOUR)
......
icu/icuversion.mk
Dosyayı görüntüle @ 9bbb628e
......@@ -25,14 +25,14 @@
#
#*************************************************************************
# major
.IF "$(ICU_MAJOR)" = ""
.IF "$(ICU_MAJOR)" == ""
ICU_MAJOR=4
.ENDIF
# minor
.IF "$(ICU_MINOR)" = ""
.IF "$(ICU_MINOR)" == ""
ICU_MINOR=4
.ENDIF
# micro
.IF "$(ICU_MICRO)" = ""
.IF "$(ICU_MICRO)" == ""
ICU_MICRO=2
.ENDIF
set_soenv.in
Dosyayı görüntüle @ 9bbb628e
......@@ -49,8 +49,8 @@ my ( $SOLAR_JAVA,
$CC, $CXX);
#
# Platform dependent constant values.
my ( $COM, $ARCH, $CPU,
$OS, $OSVERSION, $OUTPATH, $INPATH,
my ( $ARCH,
$OSVERSION, $OUTPATH, $INPATH,
$DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
$JRETOOLKITDIR, $JRETHREADDIR );
#
......@@ -76,7 +76,7 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$WIN_GNUCOPY, $WIN_TOUCH,
$PROEXT, $TARFILE_LOCATION, $GNUMAKE,
$PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS,
$MACOSX_SDK_PATH,
......@@ -89,9 +89,6 @@ 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@";
......@@ -125,8 +122,6 @@ $JAVAFLAGS = '@JAVAFLAGS@';
$MINGW = '@WITH_MINGW@'; # use MinGW for Windows build
$CC = '@CC@'; # C compiler
$CXX = '@CXX@'; # C++ compiler
$MOZILLA_VERSION = '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla
$MOZILLA_TOOLKIT = '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla
$PROEXT = "@PROEXT@";
$EPM_FLAGS = "";
$CL_X64 = '@CL_X64@';
......@@ -636,62 +631,6 @@ if ($platform =~ m/cygwin/)
$ASM_PATH = PathFormat('@ASM_HOME@');
}
# Check for prebuild mozab libraries if we don't build them # ourselves
# and we're also not using the external system mozilla installation.
#
# FIXME! This check should be done in configure and not here, but
# the $OS, $COM, $CPU variables are not yet present there.
#
if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILLA@" ne "YES" )
{
print("Checking for prebuilt Mozilla libraries ...");
my $mozbinfile = $SRC_ROOT."/moz/zipped/";
$mozbinfile .= $OS.$COM.$CPU;
if ( -e $mozbinfile."inc.zip"
and -e $mozbinfile."lib.zip"
and -e $mozbinfile."runtime.zip" )
{ print " found.\n";
$PREBUILD_MOZAB = "YES";
}
else
{ print " not found!\n\n";
print "If you don\'t use the system mozilla and also not build the needed\n";
print "mozilla libraries yourself you have to provide the needed files\n";
print "$OS$COM$CPU\{inc,lib,runtime\}.zip in moz/zipped/ .\n";
print "These files can be found here:\n";
print " <http://dev-www.libreoffice.org/mozilla/>.\n\n";
die;
}
if ( $OS eq 'WNT' ) {
my $ext_msvc = $SRC_ROOT."/external/msvcp80";
chomp( $ext_msvc = qx{cygpath -d "$ext_msvc"} );
print("Checking for MSVC 2005 runtime needed for the prebuilt Mozilla ...");
if ( -e $ext_msvc."/Microsoft.VC80.CRT.manifest" and
-e $ext_msvc."/msvcp80.dll" and
-e $ext_msvc."/msvcr80.dll" )
{
print " found.\n";
}
else
{ print " not found!\n\n";
print "For the pre-built Mozilla libraries, you need MSVC 2005 runtime\n";
print "files Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll\n";
print "in external/msvcp80.\n\n";
print "You can get them by installing:\n";
print " <http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE>.\n";
print "and copying the abovementioned files from:\n";
print " c:/windows/winsxs/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989/\n";
print "and\n";
print " c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989.manifest\n\n";
die;
}
}
}
else
{
$PREBUILD_MOZAB = "";
}
#
# E. Determining the envionment values based on the information
# that was gathered earlier on.
......@@ -1240,9 +1179,6 @@ if ("@ENABLE_WERROR@" eq "FALSE") {
ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" );
}
ToFile( "PROEXT", $PROEXT, "e" );
ToFile( "PREBUILD_MOZAB", $PREBUILD_MOZAB, "e" );
ToFile( "MOZILLA_VERSION", $MOZILLA_VERSION, "e" );
ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment