[Libreoffice-commits] .: 4 commits - configure.in set_soenv.in solenv/gbuild
Tor Lillqvist
tml at kemper.freedesktop.org
Fri May 13 05:08:53 PDT 2011
configure.in | 44 +++++++++++++++++++-------------------
set_soenv.in | 8 +++---
solenv/gbuild/platform/windows.mk | 1
3 files changed, 26 insertions(+), 27 deletions(-)
New commits:
commit 4aa7a4cb6e0c4bbe55e440c1ec8b825df50fa43c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 13 15:06:33 2011 +0300
chmod -x
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/linux-ARM.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/linux-GODSON.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/linux-IA64.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-INTEL.mk b/solenv/gbuild/platform/linux-INTEL.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-POWERPC64.mk b/solenv/gbuild/platform/linux-POWERPC64.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-S390X.mk b/solenv/gbuild/platform/linux-S390X.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/linux-SPARC.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/linux-X86_64.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
old mode 100755
new mode 100644
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
old mode 100755
new mode 100644
commit c093e93eb056a9fb186da6d8ec5977c9dcf96c3a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 13 14:58:36 2011 +0300
Drop unneeded -subsystem:console option, fixes build of GUI executables
At least odbcconfig is a GUI executable.
Apparently MSVC is clever enough to guess that a program with a main()
is intended to be linked as a CUI ("console") executable, and
correspondingly a program with a WinMain() as a GUI ("Windows")
executable. And our code seems to follow that convention.
Note that all this indeed is just convention; the OS of course has no
idea whether an executable's source code had a main function called
main() or WinMain(), if either at all. That is just a convention for C
and C++ programs. Whether an executable is for the console or
"Windows" subsystem is determined by a single flag in the executable
header, and this can even be changed with editbin. Nothing prevents a
console executable from opening windows and have a GUI, and nothing
forces a GUI executable to actually have a GUI.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d92c9b0..a9043d4 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -187,7 +187,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-OPT:NOREF \
- -SUBSYSTEM:CONSOLE \
-safeseh \
-nxcompat \
-dynamicbase \
commit b685e8f857779a764fcca31d3291dbaaacc8a27e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 13 12:39:41 2011 +0300
Spell nss-module with a dash
diff --git a/configure.in b/configure.in
index a6461c5..7cbb1b2 100755
--- a/configure.in
+++ b/configure.in
@@ -325,7 +325,7 @@ AC_ARG_ENABLE(build-mozilla,
the mozilla source code but take precompiled zips.]),
,)
-AC_ARG_ENABLE(nss_module,
+AC_ARG_ENABLE(nss-module,
AS_HELP_STRING([--disable-nss-module],
[Whether to use provided NSS module.]),
,enable_nss_module=yes)
commit becad8718aee51035673c3e7aac2d76538862421
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 13 12:16:12 2011 +0300
Use more meaningful option name
It's called the .NET Framework, so don't talk about "frame".
Also align Usage help printout better.
diff --git a/configure.in b/configure.in
index 3d3b774..a6461c5 100755
--- a/configure.in
+++ b/configure.in
@@ -1029,7 +1029,7 @@ AC_ARG_WITH(jvm-path,
AS_HELP_STRING([--with-jvm-path],
[Use a specific JVM search path at runtime.])
[
- Usage: --with-jvm-path=<absolute path to parent of jvm home>
+ Usage: --with-jvm-path=<absolute path to parent of jvm home>
e. g.: --with-jvm-path=/usr/lib/
to find JRE/JDK in /usr/lib/jvm/
@@ -1114,8 +1114,8 @@ AC_ARG_WITH(nsis-path,
],
,)
-AC_ARG_WITH(frame-home,
- AS_HELP_STRING([--with-frame-home],
+AC_ARG_WITH(dotnet-framework-home,
+ AS_HELP_STRING([--with-dotnet-framework-home],
[For Microsoft compiler users, please supply the path pointing to
lib/mscoree.lib, usually something like:
"/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"])
@@ -1123,8 +1123,8 @@ AC_ARG_WITH(frame-home,
Note that in most cases it will be automatically
found, though.
- Usage: --with-frame-home=<absolute path to .NET
- Framework>
+ Usage: --with-dotnet-framework-home=<absolute path to .NET
+ Framework>
],
,)
@@ -1148,10 +1148,10 @@ AC_ARG_WITH(directx-home,
AC_ARG_WITH(mozilla-build,
AS_HELP_STRING([--with-mozilla-build],
- [For Windows users, please supply the path to the mozilla build tools.])
+ [For Windows users, please supply the path to the Mozilla build tools.])
[
Usage: --with-mozilla-build=<absolute path to
- mozilla build tools>
+ Mozilla build tools>
At the moment of this writing, an installer for the
mozilla build tools can be obtained from http://ftp.
@@ -1191,14 +1191,14 @@ AC_ARG_WITH(intro-bitmap,
[ --with-intro-bitmap Prefer the specified intro bitmap over the
the default one.
- Usage: --with-intro-bitmap=/path/my_ooo_intro.png
+ Usage: --with-intro-bitmap=/path/my_ooo_intro.png
],,)
AC_ARG_WITH(about-bitmap,
[ --with-about-bitmap Similarly to --with-intro-bitmap, this allows
specification of bitmap for the About box.
- Usage: --with-about-bitmap=/path/my_ooo_about.png
+ Usage: --with-about-bitmap=/path/my_ooo_about.png
],,)
AC_ARG_WITH(vendor,
@@ -2360,34 +2360,34 @@ if test "$WITH_MINGW" = "yes" || test "$COMEX" -ge "10"; then
dnl Check mscoree.lib / .NET Framework dir
AC_MSG_CHECKING(.NET Framework)
- if test -n "$with_frame_home"; then
- with_frame_home=`cygpath -u "$with_frame_home"`
+ if test -n "$with_dotnet_framework_home"; then
+ with_dotnet_framework_home=`cygpath -u "$with_dotnet_framework_home"`
fi
- if test -f "$with_frame_home/lib/mscoree.lib"; then
- FRAME_HOME="$with_frame_home"
+ if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then
+ DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home"
fi
- if test -z "$FRAME_HOME" ; then
+ if test -z "$DOTNET_FRAMEWORK_HOME" ; then
frametest=`./oowintool --dotnetsdk-dir`
if test -f "$frametest/lib/mscoree.lib"; then
- FRAME_HOME="$frametest"
+ DOTNET_FRAMEWORK_HOME="$frametest"
else
frametest=`./oowintool --psdk-home`
if test -f "$frametest/lib/mscoree.lib"; then
- FRAME_HOME="$frametest"
+ DOTNET_FRAMEWORK_HOME="$frametest"
fi
fi
fi
- if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
- AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
+ if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib"; then
+ AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-dotnet-framework-home])
fi
AC_MSG_RESULT(found)
# Convert to posix path with 8.3 filename restrictions ( No spaces )
- FRAME_HOME=`cygpath -d "$FRAME_HOME"`
- FRAME_HOME=`cygpath -u "$FRAME_HOME"`
+ DOTNET_FRAMEWORK_HOME=`cygpath -d "$DOTNET_FRAMEWORK_HOME"`
+ DOTNET_FRAMEWORK_HOME=`cygpath -u "$DOTNET_FRAMEWORK_HOME"`
fi
AC_SUBST(MIDL_PATH)
AC_SUBST(CSC_PATH)
-AC_SUBST(FRAME_HOME)
+AC_SUBST(DOTNET_FRAMEWORK_HOME)
fi
dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index a517aeb..45414af 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -82,7 +82,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
- $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
+ $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $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,
@@ -649,7 +649,7 @@ elsif ( $platform =~ m/cygwin/ )
$PSDK_HOME = PathFormat('@PSDK_HOME@');
$DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
$USE_DIRECTX5 = "";
- $FRAME_HOME = PathFormat('@FRAME_HOME@');
+ $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
$USE_NEW_SDK = "TRUE";
$CPUNAME = "INTEL";
$CPUNAME = "X86_64" if $CL_X64;
@@ -1061,7 +1061,7 @@ if ($platform =~ m/cygwin/)
$ILIB .= $wps.$COMPATH.$LIB.$ds."amd64".
$wps.$PSDK_HOME.$LIB64;
}
- $ILIB .= $wps.$FRAME_HOME.$LIB;
+ $ILIB .= $wps.$DOTNET_FRAMEWORK_HOME.$LIB;
if ( '@ENABLE_DIRECTX@' ne "" ) {
$ILIB .= $wps.$DIRECTXSDK_LIB;
}
@@ -1208,7 +1208,7 @@ elsif ($platform =~ m/cygwin/)
$PATH .= $ps.$tmppath;
}
# path to sn.exe (signing) for Windows users.
- my $sn_path = PathFormat('@FRAME_HOME@/bin');
+ my $sn_path = PathFormat('@DOTNET_FRAMEWORK_HOME@/bin');
$tmppath = CygFormat($sn_path);
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
$PATH .= $ps.$tmppath;
More information about the Libreoffice-commits
mailing list