You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/15 02:31:48 UTC
svn commit: r1735006 - in /openoffice/branches/gbuild-reintegration: ./
main/ main/oox/ main/solenv/gbuild/platform/ main/sw/
Author: damjan
Date: Tue Mar 15 01:31:47 2016
New Revision: 1735006
URL: http://svn.apache.org/viewvc?rev=1735006&view=rev
Log:
Merge from branches/gbuild:
* r1409597 : gnumake4: set_soenv.in: do not generate tcsh environment file
* r1409596 : gnumake4: #i117687#: source the right *Env.Set.sh in bootstrap:
add source_soenv.sh: detects the platform and sources the right *Env.Set.sh.
* r1409595 : gnumake4: #i117687#: do not source *Env.Set.sh in bootstrap
* r1409594 : gnumake4: linux.mk: in product builds, link with -O1
* r1409593 : gnumake4: #i117610#: move openssl to RepositoryExternal.mk
Also fixed FreeBSD detection in source_soenv.sh.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/source_soenv.sh
- copied, changed from r1409597, incubator/ooo/branches/gbuild/main/source_soenv.sh
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/GNUmakefile
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
openoffice/branches/gbuild-reintegration/main/bootstrap.1
openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk
openoffice/branches/gbuild-reintegration/main/set_soenv.in
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 01:31:47 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409592,1409598-1409600,1409602,1409604-1409605
+/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409600,1409602,1409604-1409605
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/GNUmakefile
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/GNUmakefile?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/GNUmakefile (original)
+++ openoffice/branches/gbuild-reintegration/main/GNUmakefile Tue Mar 15 01:31:47 2016
@@ -19,13 +19,21 @@
#
#**************************************************************
+# if no environment is set, try to find one, source it and re-exec
ifeq ($(strip $(SOLARENV)),)
-$(error No environment set!)
-endif
+
+all:
+ if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi && \
+ if test -z "$${SOLARENV}"; then echo "No environment set!"; exit 1; fi && \
+ $(MAKE)
+
+else # SOLARENV
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
+endif # SOLARENV
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Tue Mar 15 01:31:47 2016
@@ -173,23 +173,4 @@ $(eval $(call gb_Helper_register_static_
vclmain \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- crypto \
- ssl \
-))
-else
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- crypto \
- ssl \
-))
-endif
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
- crypto \
- ssl \
-))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryExternal.mk Tue Mar 15 01:31:47 2016
@@ -318,4 +318,52 @@ endef
endif # SYSTEM_ICU
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+
+define gb_LinkTarget__use_openssl
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(OPENSSL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+endef
+
+else # !SYSTEM_OPENSSL
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ crypto \
+ ssl \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ crypto \
+ ssl \
+))
+endif
+
+define gb_LinkTarget__use_openssl
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ crypto \
+ ssl \
+)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ crypto \
+ ssl \
+)
+ifeq ($(OS),SOLARIS)
+$(call gb_LinkTarget_add_libs,$(1),\
+ -lnsl \
+ -lsocket \
+)
+endif
+endif
+endef
+
+endif # SYSTEM_OPENSSL
+
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk Tue Mar 15 01:31:47 2016
@@ -227,13 +227,6 @@ endif
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_StaticLibrary_TARGETS := $(filter-out crypto,$(gb_StaticLibrary_TARGETS))
-gb_StaticLibrary_TARGETS := $(filter-out ssl,$(gb_StaticLibrary_TARGETS))
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
ifeq ($(SYSTEM_EXPAT),YES)
gb_Library_TARGETS := $(filter-out expat,$(gb_Library_TARGETS))
endif
Modified: openoffice/branches/gbuild-reintegration/main/bootstrap.1
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/bootstrap.1?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/bootstrap.1 (original)
+++ openoffice/branches/gbuild-reintegration/main/bootstrap.1 Tue Mar 15 01:31:47 2016
@@ -19,6 +19,23 @@
#
# *************************************************************
+if test -z "${SOLARENV}"; then
+ if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi
+fi
+if test -z "${SOLARENV}"; then
+ echo "bootstrap: No environment set!"
+ exit 1
+fi
+
+# remove aliases set by *Env.Set.sh
+unalias mkout
+unalias deliver
+unalias build
+unalias build_client
+unalias zipdep
+unalias nmake
+unalias gunzip
+
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
if test "$GUI" = "WNT"; then
Modified: openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/oox/Library_oox.mk Tue Mar 15 01:31:47 2016
@@ -61,33 +61,7 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Library_add_linked_libs,oox,\
- crypto \
- ssl \
-))
-else
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,oox,\
- crypto \
- ssl \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,oox,\
- crypto \
- ssl \
-))
-endif
-endif
-
-# this is for openssl
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_linked_libs,oox,\
- nsl \
- socket \
-))
-endif
-#probably not necessary: dl \
+$(call gb_Library_use_external,oox,openssl)
# object files ----------------------------------------------------------------
Modified: openoffice/branches/gbuild-reintegration/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/set_soenv.in?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/set_soenv.in (original)
+++ openoffice/branches/gbuild-reintegration/main/set_soenv.in Tue Mar 15 01:31:47 2016
@@ -707,7 +707,7 @@ elsif ( $platform =~ m/cygwin/ )
$use_shl_versions = "TRUE";
$wps = ';'; # Windows style path seperator
if ( $MINGW eq "yes" )
- { # At the moment this implies the use of tcsh
+ {
print "Setting Windows NT cygwin MinGW specific values... ";
$FLIPCMD = "slfl.pl";
$PATH_SEPERATOR = ';';
@@ -1524,8 +1524,6 @@ print "done\n";
# VI. Open the output file.
#--------------------------
#
-open( OUT, ">$outfile" ) ||
- die "Cannot open $outfile: $!\n";
# Create sh environment file
open( OUT_SH, ">$outfile_sh" ) ||
@@ -1543,7 +1541,6 @@ if(defined($outfile_bat))
#------------------------------------------
#
# Write file header.
-CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
@@ -2051,9 +2048,6 @@ ToFile( "ZIPDEP", $perlpre."zipde
#
# 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" );
ToFile( "alias deliver", $deliver, "a" );
@@ -2067,20 +2061,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)
-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");
-}
# on Solaris, MacOSX and FreeBSD (and Windows) set GNUPATCH and GPERF
if ($platform =~ m/solaris|darwin|freebsd|cygwin/)
@@ -2100,8 +2080,6 @@ ToFile( "SAL_ENABLE_FILE_LOCKING", "1",
#
# Writing unset variables you might not need to file.
#
-print OUT $unsetvars;
-
print OUT_SH "export $exportvars$newline";
print OUT_SH "unset $unsetvarssh$newline";
@@ -2114,8 +2092,6 @@ if(defined($outfile_bat))
# VIII. Closing output file.
#---------------------------
#
-close( OUT ) || print "Can't close $outfile: $!";
-
close( OUT_SH ) || print "Can't close $outfile_sh: $!";
if( defined($outfile_bat))
@@ -2176,8 +2152,7 @@ if ( $Warning ne "" )
}
print "*$newline* USAGE: $newline";
-print "* Source $outfile (in tcsh)";
-print " or $outfile.sh (in sh)";
+print "* Source $outfile.sh (in sh)";
print "$newline";
print "* in order to set up the build-environment variables.$newline";
for ( $tmp = 0; $tmp < 2; $tmp++ )
@@ -2190,8 +2165,6 @@ $bootfile = "bootstrap";
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile.sh\n";
-print OUT "unset _ISBOOTSTRAP_; export _ISBOOTSTRAP_\n";
if ( $MINGW eq "yes" )
{ print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; }
close( OUT ) || print "Can't close $bootfile: $!";
@@ -2294,8 +2267,6 @@ sub CreateFileHeader
# a - alias
# c - comment
# n - newline
-# x - raw, write as is to OUT_BAT
-# y - raw, write as is to OUT
# z - raw, write as is to OUT_SH
# Return value: void
#---------------------------------------------------------
@@ -2337,7 +2308,6 @@ sub ToFile {
}
printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar);
- print OUT "$setenv $_[ 0 ] \"$envvar\"$newline"; # to tcsh file
print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline"; # to sh file
$exportvars .= " $_[ 0 ]"; # add to export list for sh file
@@ -2358,7 +2328,6 @@ sub ToFile {
elsif ( $_[ 2 ] eq "a" )
{ # Write an alias to file.
print "The $_[ 0 ] is set to: $_[ 1 ]\n"; # to stdout
- print OUT "$_[ 0 ] $_[ 1 ]$newline"; # to tcsh file
print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file
if(defined($outfile_bat)) # create the correct 4nt alias format
{ my $aliastmp = $_[ 1 ];
@@ -2374,10 +2343,6 @@ sub ToFile {
print "$comment$newline";
print "$comment $_[ 0 ]$newline";
print "$comment$newline";
- print OUT "$newline";
- print OUT "$comment$newline";
- print OUT "$comment $_[ 0 ]$newline";
- print OUT "$comment$newline";
print OUT_SH "$newline";
print OUT_SH "$comment$newline";
print OUT_SH "$comment $_[ 0 ]$newline";
@@ -2391,15 +2356,9 @@ sub ToFile {
}
elsif ( $_[ 2 ] eq "n" )
{ #Write a newline to a file
- print OUT "$newline";
print OUT_SH "$newline";
print OUT_BAT "$newline" if defined($outfile_bat);
}
- elsif ( $_[ 2 ] eq "y" )
- {
- #Write first argument as is, and nothing else
- print OUT "$_[ 0 ]$newline";
- }
elsif ( $_[ 2 ] eq "z" )
{
#Write first argument as is, and nothing else
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk Tue Mar 15 01:31:47 2016
@@ -137,6 +137,10 @@ gb_LinkTarget_LDFLAGS += \
endif
+ifeq ($(gb_DEBUGLEVEL),0)
+gb_LinkTarget_LDFLAGS += -Wl,-O1
+endif
+
gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
ifeq ($(gb_DEBUGLEVEL),2)
Copied: openoffice/branches/gbuild-reintegration/main/source_soenv.sh (from r1409597, incubator/ooo/branches/gbuild/main/source_soenv.sh)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/source_soenv.sh?p2=openoffice/branches/gbuild-reintegration/main/source_soenv.sh&p1=incubator/ooo/branches/gbuild/main/source_soenv.sh&r1=1409597&r2=1735006&rev=1735006&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/source_soenv.sh (original)
+++ openoffice/branches/gbuild-reintegration/main/source_soenv.sh Tue Mar 15 01:31:47 2016
@@ -101,6 +101,9 @@ else
amd64-*-freebsd*)
. ./FreeBSDAMDEnv.Set.sh
;;
+ x86_64-*-freebsd*)
+ . ./FreeBSDAMDEnv.Set.sh
+ ;;
i[3456]86-*-darwin*)
. ./MacOSXX86Env.Set.sh
;;
Modified: openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk?rev=1735006&r1=1735005&r2=1735006&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sw/Library_vbaswobj.mk Tue Mar 15 01:31:47 2016
@@ -114,10 +114,4 @@ $(eval $(call gb_Library_add_exception_o
sw/source/ui/vba/wordvbahelper \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_ldflags,vbaswobj,\
- -Wl$(COMMA)-O1 \
-))
-endif
-
# vim: set noet sw=4 ts=4: