Skip to content

C
core
Kaydet (Commit) b1c3e8ae authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

make gbuild the default assumption of build.pl 

this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
üst 6963de95
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 170 deletions
Makefile
Dosyayı görüntüle @ b1c3e8ae
......@@ -415,7 +415,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
endif
cd packimages && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
make
build: build-packimages
ifeq ($(OS_FOR_BUILD),WNT)
......
packimages/prj/build.lst
Dosyayı görüntüle @ b1c3e8ae
pim packimages :: postprocess NULL
pim packimages\prj nmake - all pim_prj NULL
solenv/bin/modules/SourceConfig.pm
Dosyayı görüntüle @ b1c3e8ae
......@@ -147,7 +147,7 @@ sub get_module_build_list {
{
${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $module_path . "/prj/build.lst";
if (-e $module_path . "/prj/makefile.mk" )
if (!-e $module_path . "/prj/dmake" )
{
# print "module $module -> gbuild\n";
${$self->{MODULE_GBUILDIFIED}}{$module} = 1;
......
solenv/inc/gbuildbridge.mk deleted 100644 → 0
Dosyayı görüntüle @ 6963de95
#*************************************************************************
#
# 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
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# 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
# 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
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
PRJ=..
TARGET=prj
.INCLUDE : settings.mk
.IF "$(GBUILDTARGET)" == ""
GBUILDTARGET=all slowcheck
.END
.IF "$(depend)" != ""
all:
.ELIF "$(VERBOSE)"!=""
all:
cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(GBUILDTARGET)
.ELSE
all:
@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(GBUILDTARGET)
.END
tail_build/prj/makefile.mk deleted 100644 → 0
Dosyayı görüntüle @ 6963de95
GMAKE_MODULE_PARALLELISM := $(GMAKE_PARALLELISM) # tail_build is special!
.IF "$(gb_TAILBUILDTARGET)" != ""
GBUILDTARGET=$(gb_TAILBUILDTARGET)
.END
.INCLUDE : gbuildbridge.mk
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