[Libreoffice-commits] .: 2 commits - configure.in set_soenv.in
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Wed Nov 10 05:19:52 PST 2010
configure.in | 22 +++-------------------
set_soenv.in | 36 +++++++-----------------------------
2 files changed, 10 insertions(+), 48 deletions(-)
New commits:
commit 623fd12f17b97dd598b1f01075f26f9cf45aaaaa
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Wed Nov 10 14:18:12 2010 +0100
set_soenv: remove leftovers from tcsh and .bat file support
This silences the new "Unknown type!" error messages at the end of a
./configure run.
This should not make any functional difference, as the support for
those in ToFile was already missing.
diff --git a/set_soenv.in b/set_soenv.in
index c1bcb90..9be1f52 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2062,7 +2062,6 @@ ToFile( "ZIPDEP", $perlpre."zipdep.pl", "e" );
# Writing the aliases to file.
ToFile( "Aliases.", $empty, "c" );
ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
-ToFile( 'if ( ! ${?_ISBOOTSTRAP_} ) then', $empty, "y");
ToFile( "if test -z \"\$_ISBOOTSTRAP_\"; then", $empty, "z");
ToFile( "alias mkout", $mkout, "a" );
@@ -2077,7 +2076,6 @@ if ( $platform =~ m/os2/ )
{ ToFile( "alias gunzip", "gzip -d", "a" );
}
-ToFile( "endif", $empty, "y");
ToFile( "fi", $empty, "z");
# Check if the right dmake version is used. (W32 only)
@@ -2085,8 +2083,6 @@ if ( $platform =~ m/cygwin/ ) {
ToFile( "Check if the right dmake version is used.", $empty, "c" );
# Invalidate build environment.
ToFile( "WORK_STAMP", "_invalid_", "e" );
- # Don't test the dmake version if this file is sourced by bootstrap
- ToFile( "bash -c 'if test -n \"\$_ISBOOTSTRAP_\" || (dmake.exe -V | grep -e \"-cygwin\\|OS := cygwin\" > /dev/null ); then true; else echo -e \"\\n\\nERROR: Not a cygwin build dmake or dmake missing, please check!\\n\\n\" ; sleep 5; false ; fi' || exit 1", $empty, "y");
# Restore valid environment if test was successful.
ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
ToFile( "", $empty, "n");
@@ -2267,7 +2263,6 @@ sub CreateFileHeader
# a - alias
# c - comment
# n - newline
-# x - raw, write as is to OUT_BAT
# z - raw, write as is to OUT
# Return value: void
#---------------------------------------------------------
commit 4a0e6b51c73a1d4d49d008f3addad3f55d0e948b
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Wed Nov 10 14:10:40 2010 +0100
Make the configure run less verbose (without losing information)
diff --git a/configure.in b/configure.in
index 1caf430..e477d2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1465,25 +1465,9 @@ dnl ===================================================================
dnl Message.
dnl ===================================================================
echo "********************************************************************"
-echo "* *"
-echo "* LibreOffice build configuration. *"
-echo "* *"
-echo "* The configure process checks your platform to see whether *"
-echo "* you can build LibreOffice on it. *"
-echo "* This process checks all pre-requisites and generates a file *"
-echo "* containing the necessary environment variables. *"
-echo "* Source this file after configure has ended successfully. *"
-echo "* *"
-echo "* Any warning that is generated during the configure process *"
-echo "* must be taken into account since it can be a reason for *"
-echo "* an unsuccessful build of LibreOffice. *"
-echo "* *"
-echo "********************************************************************"
-echo ""
-echo "********************************************************************"
-echo "* *"
-echo "* Checking the platform pre-requisites. *"
-echo "* *"
+echo "*"
+echo "* Running ${PACKAGE_NAME} build configuration."
+echo "*"
echo "********************************************************************"
echo ""
dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index bc74a3f..c1bcb90 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -174,7 +174,6 @@ chomp( $oldPATH ); # cut off new line
# C. Setting the constant values.
#
# Setting platform independent constant values.
-print "Setting platform independent values... ";
# NB: Language options now set at 'ToFile' stage.
$BMP_WRITES_FLAG = "TRUE";
$BUILD_SOSL_RELEASE = "TRUE";
@@ -922,8 +921,7 @@ else
#
# E. Determining the envionment values based on the information
# that was gathered earlier on.
-#
-print "Setting the environment variables... ";
+
$USR = $ds."usr";
$ETC = $ds."etc";
$BIN = $ds."bin";
@@ -1551,13 +1549,10 @@ else
{ AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
}
-#
-print "done\n";
#
# F. Setting the different aliases.
#
-print "Setting the aliases... ";
# 1. alias for a full product make.
$mkout = '"perl $SOLARENV/bin/mkout.pl"';
$deliver = '"perl $SOLARENV/bin/deliver.pl"';
@@ -1566,7 +1561,7 @@ print "Setting the aliases... ";
$zipdep = '"perl $SOLARENV/bin/zipdep.pl"';
# 3. alias for a full product make
$nmake = '"dmake"';
-print "done\n";
+
#
#--------------------------
# VI. Open the output file.
@@ -2120,7 +2115,6 @@ ToFile( "ENV_SCRIPT", "$outfile", "e" );
print OUT "export $exportvars$newline";
print OUT "unset $unsetvars$newline";
-
#
#---------------------------
# VIII. Closing output file.
@@ -2154,28 +2148,18 @@ if (rename( $outfile, $tmp ) ne 1)
#
print "$newline";
print "*********************************************************".
- "******************* $newline"."*"."$newline";
-print "* LibreOffice $UPD configuration. $newline";
-for ( $tmp = 0; $tmp < 2; $tmp++ )
-{ print "* $newline";
-}
-print "* Configuration part of LibreOffice $UPD build is finished. $newline* $newline";
-print "* NB! Be aware that you might not be able to build LibreOffice if you $newline".
- "* ignore any warning message that were generated during this configuration $newline".
- "* process. $newline* $newline";
+ "*******************$newline*$newline";
+print "* LibreOffice $UPD configuration finished. $newline*$newline";
if ( $Warning ne "" )
-{ print "$Warning*";
- print "$newline";
+{ print "$Warning*$newline";
}
print "*********************************************************".
"******************* $newline";
-print "\nTo build, do:\n";
-print " \$ make\n\n";
-print "Developer installation (after you have built):\n";
-print " \$ make dev-install\n\n";
+print "\nTo build, issue:\nmake\n\n";
+print "For the developer installation, issue:\nmake dev-install\n\n";
$bootfile = "bootstrap";
open( OUT, ">$bootfile" ) ||
@@ -2198,7 +2182,6 @@ if (rename( $bootfile, $tmp ) ne 1)
{ `mv -f $bootfile $tmp`;
}
-print "Configure completed\n";
if ( $Warning ne "" ) {
print "***** WARNINGS ISSUED *****\n";
}
More information about the Libreoffice-commits
mailing list