summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--GNUmakefile.mk (renamed from GNUmakefile)0
-rw-r--r--Makefile.in46
-rw-r--r--Module_ooo.mk8
-rw-r--r--Repository.mk4
-rwxr-xr-xconfigure.in2
-rwxr-xr-xgit-hooks/pre-commit7
-rwxr-xr-xsolenv/bin/build.pl72
-rwxr-xr-xsolenv/bin/linkoo21
-rw-r--r--solenv/bin/modules/RepositoryHelper.pm9
-rwxr-xr-xsolenv/bin/modules/SourceConfig.pm18
-rw-r--r--solenv/gbuild/Deliver.mk2
-rw-r--r--solenv/gbuild/Helper.mk1
-rw-r--r--solenv/inc/unxgcc.mk9
-rw-r--r--soltools/mkdepend/def.h5
-rw-r--r--stlport/prj/d.lst1
16 files changed, 130 insertions, 76 deletions
diff --git a/.gitignore b/.gitignore
index 904eac38c..a62a77324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@
/bean
/beanshell
/berkeleydb
+/binaryurp
/binfilter
/boost
/bridges
diff --git a/GNUmakefile b/GNUmakefile.mk
index 018b21e3f..018b21e3f 100644
--- a/GNUmakefile
+++ b/GNUmakefile.mk
diff --git a/Makefile.in b/Makefile.in
index 14e762ec3..54e93cfae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,40 +2,48 @@
SHELL=/usr/bin/env bash
+ifeq ($(USE_GMAKE),)
+GBUILD_OPT:=
+else
+GBUILD_OPT:=--gmake
+endif
+
all: Makefile dmake/dmake@EXEEXT@ src.downloaded
- . ./*[Ee]nv.[Ss]et.sh && \
+
+ @. ./*[Ee]nv.[Ss]et.sh && \
cd instsetoo_native && \
- build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
install:
- @echo "Installing in $${prefix:-/usr/local}..."
- . ./*[Ee]nv.[Ss]et.sh && \
- ooinstall "$${prefix:-@prefix@}"
- @echo && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
+ echo "Installing in $${prefix:-@prefix@}..." && \
+ ooinstall "$${prefix:-@prefix@}" && \
+ echo "" && \
echo "Installation finished, you can now execute:" && \
echo "$${prefix:-@prefix@}/program/soffice"
dev-install:
- . ./*[Ee]nv.[Ss]et.sh && \
- ooinstall -l @abs_builddir@/install
- @echo && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
+ ooinstall -l @abs_builddir@/install && \
+ echo "" && \
echo "Developer installation finished, you can now execute:" && \
echo "@abs_builddir@/install/program/soffice"
distclean: dmake/dmake@EXEEXT@
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
dmake distclean
clean: dmake/dmake@EXEEXT@
- . ./*[Ee]nv.[Ss]et.sh && \
- dmake clean
+ @. ./*[Ee]nv.[Ss]et.sh && \
+ dmake clean && \
+ if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi
dmake/dmake@EXEEXT@:
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
./bootstrap
src.downloaded: ooo.lst download
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
fetch: src.downloaded
@@ -44,19 +52,19 @@ Makefile: configure.in set_soenv.in Makefile.in
./autogen.sh
check: Makefile dmake/dmake@EXEEXT@ fetch
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
cd smoketestoo_native && \
export SAL_USE_VCLPLUGIN="svp" && \
- build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
id:
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
create-ids
tags:
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
create-tags
docs:
- . ./*[Ee]nv.[Ss]et.sh && \
+ @. ./*[Ee]nv.[Ss]et.sh && \
mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
diff --git a/Module_ooo.mk b/Module_ooo.mk
index a60bbb636..f364cd800 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -14,12 +14,12 @@
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
comphelper \
- editeng \
+ editeng \
framework \
padmin \
sfx2 \
diff --git a/Repository.mk b/Repository.mk
index 87bbafa59..80e03cf55 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cui \
drawinglayer \
editeng \
- eggtray \
fwe \
fwi \
fwk \
@@ -58,6 +57,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lng \
msfilter \
msword \
+ oox \
qstart_gtk \
sax \
sb \
@@ -97,7 +97,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
i18nisolang1 \
i18nutil \
ucbhelper \
- vos3 \
))
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
@@ -131,7 +130,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
salcpprt \
vclmain \
zlib \
- vclmain \
))
# vim: set noet sw=4 ts=4:
diff --git a/configure.in b/configure.in
index 3bf84755f..2b5ddbd36 100755
--- a/configure.in
+++ b/configure.in
@@ -1984,7 +1984,7 @@ AC_MSG_CHECKING([the GNU make version])
_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
if test "$_make_longver" -ge "038100" ; then
- AC_MSG_RESULT([$GNUMAKE $_make_version])
+ AC_MSG_RESULT([$GNUMAKE $_make_version])
else
AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
fi
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index 8192e5840..6817990ee 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -20,8 +20,8 @@ sub fix_whitespace($$) {
# usually we have nothing to do ;-)
return if ( keys( %{$lines} ) == 0 ||
- $file eq "" ||
- !( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pl|pm|pmk|py|sdi|sh|src|tab)/ ) );
+ $file eq "" || $file eq "GNUmakefile" ||
+ !( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pl|pm|pmk|py|sdi|sh|src|tab)/ ) );
open( IN, "$file" ) || die "Cannot open $file for reading";
my ( $out, $tmpfile ) = mkstemp( "/tmp/whitespace-fixing-XXXXXX" );
@@ -157,7 +157,8 @@ my $err_ext = "";
open( FILES, "git diff-index --cached --name-only $against |" ) || die "Cannot run git diff-index.";
while ( my $file = <FILES> ) {
chomp( $file );
- if ( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml)$/) {
+ if ( $file ne "GNUmakefile" &&
+ $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml)$/) {
open( F, "git diff-index -p --cached $against -- '$file' |" );
while ( my $line = <F> ) {
if ( $line =~ /^\+ *\t/ ) {
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 121d63bdb..b1ca5264d 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -4,7 +4,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -141,7 +141,7 @@
my %platforms = (); # platforms available or being working with
my %platforms_to_copy = (); # copy output trees for the platforms when --prepare
my $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
- my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
+ my @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
my %build_list_paths = (); # build lists names
my %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object)
my $pre_job = 'announce'; # job to add for not-single module build
@@ -176,15 +176,15 @@
my $html_socket_obj = undef; # socket object for server
my %clients_jobs = ();
my %clients_times = ();
- my $client_timeout = 0; # time for client to build (in sec)...
+ my $client_timeout = 0; # time for client to build (in sec)...
# The longest time period after that
- # the server considered as an error/client crash
+ # the server considered as an error/client crash
my %lost_client_jobs = (); # hash containing lost jobs
my %job_jobdir = (); # hash containing job-dir pairs
my $reschedule_queue = 0;
my %module_build_queue = ();
my %reversed_dependencies = ();
- my %module_paths = (); # hash with absolute module paths
+ my %module_paths = (); # hash with absolute module paths
my %active_modules = ();
my $generate_config = 0;
my %add_to_config = ();
@@ -199,6 +199,8 @@
my $zenity_in = '';
my $zenity_out = '';
my $zenity_err = '';
+ my $allow_gbuild = 0;
+ my %is_gbuild = ();
my $verbose = 0;
my @modules_built = ();
@@ -540,10 +542,17 @@ sub get_build_list_path {
my $possible_dir_path = $module_paths{$_}.'/prj/';
if (-d $possible_dir_path) {
foreach my $build_list (@possible_build_lists) {
- my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
- if (-f $possible_build_list_path) {
- $build_list_paths{$module} = $possible_build_list_path;
- return $possible_build_list_path;
+ # if gbuild are allow we favor gbuild.lst as the build instruction
+ if($build_list ne "gbuild.lst" || $allow_gbuild) {
+ my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
+ if (-f $possible_build_list_path) {
+ $build_list_paths{$module} = $possible_build_list_path;
+ if ($build_list eq "gbuild.lst") {
+# print "Using gmake for module $module\n";
+ $is_gbuild{$module} = 1;
+ };
+ return $possible_build_list_path;
+ };
};
}
print_error("There's no build list for $module");
@@ -603,7 +612,7 @@ sub store_weights {
#
# This procedure builds comlete dependency for each module, ie if the deps look like:
-# mod1 -> mod2 -> mod3 -> mod4,mod5,
+# mod1 -> mod2 -> mod3 -> mod4,mod5,
# than mod1 get mod3,mod4,mod5 as eplicit list of deps, not only mod2 as earlier
#
sub expand_dependencies {
@@ -632,7 +641,7 @@ sub reverse_dependencies {
} else {
my %single_module_dep_hash = ($module => 1);
$$reversed{$_} = \%single_module_dep_hash;
- };
+ };
};
};
};
@@ -876,7 +885,7 @@ sub get_prj_platform {
s/\r\n//;
$line++;
if ($_ =~ /\snmake\s/) {
- if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) {
+ if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) { #'
my $platform = $1;
my $alias = $2;
print_error ("There is no correct alias set in the line $line!") if ($alias eq 'NULL');
@@ -968,7 +977,7 @@ sub get_deps_hash {
$platform = $1;
$dependencies = $';
while ($dependencies =~ /,(\w+)/o) {
- $dependencies = $';
+ $dependencies = $'; #'
};
$dependencies =~ /\s+(\S+)\s+/o;
$dir_alias = $1;
@@ -980,7 +989,7 @@ sub get_deps_hash {
delete $dead_dependencies{$dir_alias} if (defined $dead_dependencies{$dir_alias});
print_error("Directory alias $dir_alias is defined at least twice!! Please, correct build.lst in module $module_to_build") if (defined $$dependencies_hash{$dir_alias});
$platform_hash{$dir_alias}++;
- $dependencies = $';
+ $dependencies = $'; #'
print_error("$module_to_build/prj/build.lst has wrongly written dependencies string:\n$_\n") if (!$dependencies);
$deps_hash{$_}++ foreach (get_dependency_array($dependencies));
$$dependencies_hash{$dir_alias} = \%deps_hash;
@@ -1347,7 +1356,7 @@ sub get_dependency_array {
print_error("Project $prj has wrongly written dependencies string:\n $string") if (!$dep_string);
$dep_string =~ /(\S+)\s*/o;
$parent_prj = $1;
- $dep_string = $';
+ $dep_string = $'; #'
if ($parent_prj =~ /\.(\w+)$/o) {
$parent_prj = $`;
if (($prj_platform{$parent_prj} ne $1) &&
@@ -1467,9 +1476,10 @@ sub get_options {
$arg =~ /^--checkmodules$/ and $checkparents = 1 and $ignore = 1 and next;
$arg =~ /^-s$/ and $show = 1 and next;
$arg =~ /^--deliver$/ and $deliver = 1 and next;
+ $arg =~ /^--gmake$/ and $allow_gbuild = 1 and print "ALLOW GBUILD" and next;
$arg =~ /^(--job=)/ and $custom_job = $' and next;
$arg =~ /^(--pre_job=)/ and $pre_custom_job = $' and next;
- $arg =~ /^(--post_job=)/ and $post_custom_job = $' and next;
+ $arg =~ /^(--post_job=)/ and $post_custom_job = $' and next; #'
$arg =~ /^-d$/ and $deliver = 1 and next;
$arg =~ /^--dlv_switch$/ and $dlv_switch = shift @ARGV and next;
$arg =~ /^--file$/ and $cmd_file = shift @ARGV and next;
@@ -1618,11 +1628,12 @@ sub get_module_and_buildlist_paths {
$source_config_file = $source_config->get_config_file_path();
$active_modules{$_}++ foreach ($source_config->get_active_modules());
my %active_modules_copy = %active_modules;
- foreach ($source_config->get_all_modules()) {
- delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
- next if ($_ eq $initial_module);
- $module_paths{$_} = $source_config->get_module_path($_);
- $build_list_paths{$_} = $source_config->get_module_build_list($_)
+ foreach my $module ($source_config->get_all_modules()) {
+ delete $active_modules_copy{$module} if defined($active_modules_copy{$module});
+ next if ($module eq $initial_module);
+ $module_paths{$module} = $source_config->get_module_path($module);
+ $build_list_paths{$module} = $source_config->get_module_build_list($module);
+ $is_gbuild{$module} = $source_config->{GBUILD};
}
$dead_parents{$_}++ foreach (keys %active_modules_copy);
};
@@ -2026,7 +2037,7 @@ sub do_custom_job {
my ($module_job, $dependencies_hash) = @_;
$module_job =~ /(\s)/o;
my $module = $`;
- my $job = $';
+ my $job = $'; #'
html_store_job_info($dependencies_hash, $module_job);
my $error_code = 0;
if ($job eq $pre_job) {
@@ -2461,7 +2472,7 @@ sub get_modules_passed {
if ($option =~ /(:)/) {
$option = $`;
print_error("\'--from\' switch collision") if ($build_all_cont);
- $build_all_cont = $';
+ $build_all_cont = $'; #'
};
$$hash_ref{$option}++;
};
@@ -3270,7 +3281,7 @@ sub accept_connection {
sub check_client_jobs {
foreach (keys %clients_times) {
if (time - $clients_times{$_} > $client_timeout) {
- print "Client's $_ Job: \"$clients_jobs{$_}\" apparently got lost...\n";
+ print "Client's $_ Job: \"$clients_jobs{$_}\" apparently got lost...\n";
print "Scheduling for rebuild...\n";
print "You might need to check the $_\n";
$lost_client_jobs{$clients_jobs{$_}}++;
@@ -3325,7 +3336,7 @@ sub run_server {
my %client_hash = ();
foreach (@client_data) {
/(=)/;
- $client_hash{$`} = $';
+ $client_hash{$`} = $'; #'
}
my $pid = $client_hash{pid} . '@' . $client_host;
if (defined $client_hash{platform}) {
@@ -3432,8 +3443,15 @@ sub get_job_string {
my $log_file = $jobs_hash{$job_dir}->{LONG_LOG_PATH};
my $full_job_dir = $job_dir;
if ($job_dir =~ /(\s)/o) {
- $job = $';
- $job = $deliver_command if ($job eq $post_job);
+ $job = $'; #'
+ print $echo . "determine if we need to deliver $job_dir\n";
+ if ($job eq $post_job) {
+ if( $is_gbuild{$job_dir} ) {
+ print "Skip deliver for gmake-built module $job_dir\n";
+ return'';
+ };
+ $job = $deliver_command
+ };
$full_job_dir = $module_paths{$`};
}
my $log_dir = File::Basename::dirname($log_file);
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3b09dcf82..3732f2b8c 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -55,7 +55,6 @@ export SAL_ALLOW_LINKOO_SYMLINKS=1
my $dry_run = 0;
my $usage = 0;
-
my $LANG;
my $TARGET;
my $LIBVER;
@@ -67,14 +66,13 @@ my $brand_program_dir = 'program';
my $ure_misc_dir = 'basis-link/ure-link/share/misc';
my $ure_java_dir = 'basis-link/ure-link/share/java';
my $ure_lib_dir = 'basis-link/ure-link/lib';
+
$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
my %replaceable = (
$program_dir => '\.so',
- $ure_lib_dir => '\.so',
- $ure_java_dir => '\.jar$',
$program_dir . '/resource' => '\.res$',
$program_dir . '/classes' => '\.jar$',
'basis-link/share/config' => '\.zip$',
@@ -332,6 +330,22 @@ sub link_pagein_files()
print "\n";
}
+# link installed files back into src tree:
+sub link_soffice_bin_files()
+{
+ my $dest;
+ my $src = "$OOO_INSTALL/" . $brand_program_dir;
+
+ print "soffice files";
+ $dest = "$OOO_BUILD/desktop/$TARGET/bin";
+ do_link ($src, $dest, 'soffice', 'soffice.bin', 1);
+ do_link ($src, $dest, 'bootstraprc', 'bootstraprc', 1);
+ do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1);
+ do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
+
+ print "\n";
+}
+
for my $a (@ARGV) {
# options
@@ -379,6 +393,7 @@ link_iso_res();
link_types_rdb();
link_oovbaapi_rdb();
link_pagein_files();
+link_soffice_bin_files();
if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
my $ooenv;
diff --git a/solenv/bin/modules/RepositoryHelper.pm b/solenv/bin/modules/RepositoryHelper.pm
index dc3417e0e..8aa45f29e 100644
--- a/solenv/bin/modules/RepositoryHelper.pm
+++ b/solenv/bin/modules/RepositoryHelper.pm
@@ -87,10 +87,10 @@ sub get_initial_directory
return $self->{INITIAL_DIRECTORY};
}
-sub get_scm_name
+sub get_scm_name
{
my $self = shift;
- return$self->{SCM_NAME};
+ return$self->{SCM_NAME};
}
##### private methods #####
@@ -118,8 +118,7 @@ sub search_for_hg {
sub search_via_build_lst {
my $self = shift;
-# my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
- my @possible_build_lists = ('build.lst'); # build lists names
+ my @possible_build_lists = ('gbuild.lst', 'build.lst'); # build lists names
my $previous_dir = '';
my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
do {
@@ -172,7 +171,7 @@ RepositoryHelper - Perl module for working with repositories and underlying SCM
# Get repositories for the actual workspace:
$a->get_repository_root();
-
+
=head1 DESCRIPTION
RepositoryHelper is a perlPerl module for working with repositories and underlying SCM
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 6357cb210..ba6090344 100755
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -78,6 +78,14 @@ sub new {
} else {
$source_root = $ENV{SOURCE_ROOT_DIR};
};
+ if ( defined $ENV{USE_GBUILD} and "$ENV{USE_GBUILD}" ne "" )
+ {
+ $self->{POSSIBLE_BUILD_LIST} = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
+ }
+ else
+ {
+ $self->{POSSIBLE_BUILD_LIST} = ('build.lst', 'build.xlist'); # build lists names
+ }
$source_root = Cwd::realpath($source_root);
$self->{SOURCE_ROOT} = $source_root;
$self->{DEBUG} = 0;
@@ -94,6 +102,7 @@ sub new {
$self->{REMOVE_REPOSITORIES} = {};
$self->{NEW_REPOSITORIES} = [];
$self->{WARNINGS} = [];
+ $self->{GBUILD} = 0;
$self->{REPORT_MESSAGES} = [];
$self->{CONFIG_FILE_CONTENT} = [];
if (defined $self->{USER_SOURCE_ROOT}) {
@@ -173,11 +182,14 @@ sub get_module_build_list {
if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) {
return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module};
} else {
- my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
- foreach (@possible_build_lists) {
- my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
+ my @possible_build_lists = $self->{POSSIBLE_BUILD_LIST}; # build lists names
+ foreach my $build_list (@possible_build_lists) {
+ my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$build_list";
if (-e $possible_path) {
${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path;
+ if ( $build_list eq "gbuild.lst" ) {
+ $self->{GBUILD} = 1;
+ };
return $possible_path;
};
};
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 60772894f..31d25999c 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -39,7 +39,7 @@ endef
define gb_Deliver_add_deliverable
gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
-$(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1))
+$(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index c62825dcb..4cdcb809e 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -1,3 +1,4 @@
+# -*- Mode: GNUmakefile; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 8c5bbb405..e5cd92055 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -158,6 +158,9 @@ LINK*=$(CXX)
LINKC*=$(CC)
# default linker flags
+.IF "$(SYSBASE)"!=""
+LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
#
# The DT RPATH value is used first, before any other path, specifically before
# the path defined in the LD_LIBRARY_PATH environment variable. This is
@@ -180,16 +183,16 @@ LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
LINKFLAGSAPPCUI= -Wl,-export-dynamic \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 17bfdadd2..472eb6000 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -61,9 +61,8 @@ in this Software without prior written authorization from the X Consortium.
#endif
#define MAXDEFINES 512
-#define MAXFILES ( 1<<16 ) /* Increased from 512. -mcafee */
- /* Increased from 1024. -mh */
- /* Increased from 2048. -b_michaelsen */
+#define MAXFILES 65536
+
#define MAXDIRS 64
#define SYMHASHSEED 131 /* 131 1313 13131 ... */
#define SYMHASHMEMBERS 64 /* must be 2^x to work right */
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index 9f9c08788..fe7c6f3aa 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -1,4 +1,3 @@
-..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 18:15:26 +0000