diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-28 13:04:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-04-29 03:50:46 +0200 |
| commit | b1c3e8ae28fcd84c7182f4898c3250e18ed92f1a (patch) | |
| tree | 5c0460d2c5016572dd11b8510e7d56b89f97bd2c /solenv | |
| parent | 6963de9536cfca1145685a611a6c88c5160d9a1c (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/SourceConfig.pm | 2 | ||||
| -rw-r--r-- | solenv/inc/gbuildbridge.mk | 45 | ||||
| -rw-r--r-- | solenv/prj/dmake | 0 |
3 files changed, 1 insertions, 46 deletions
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index b96cde9fa9b4..ac63f3935a17 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -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; diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk deleted file mode 100644 index 88b8dbcab5f5..000000000000 --- a/solenv/inc/gbuildbridge.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# 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 diff --git a/solenv/prj/dmake b/solenv/prj/dmake new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/solenv/prj/dmake |