diff options
author | Damjan Jovanovic <damjan@apache.org> | 2016-08-07 19:24:03 +0000 |
---|---|---|
committer | Damjan Jovanovic <damjan@apache.org> | 2016-08-07 19:24:03 +0000 |
commit | ca68acda60fa352d2a272a2a10d15a4cc209a681 (patch) | |
tree | 76d808631e0a71ea683c8d7852f9d60f9e49dd06 /reportdesign/prj | |
parent | 5b6c4bddf6134f377a61446d8bcf1be2f096aad1 (diff) |
Merge branches/gbuild-reintegration to trunk.
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'reportdesign/prj')
-rw-r--r-- | reportdesign/prj/build.lst | 18 | ||||
-rw-r--r-- | reportdesign/prj/d.lst | 24 | ||||
-rw-r--r-- | reportdesign/prj/makefile.mk | 36 |
3 files changed, 37 insertions, 41 deletions
diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index 4a5667d2090a..ebbef11ac401 100644 --- a/reportdesign/prj/build.lst +++ b/reportdesign/prj/build.lst @@ -1,18 +1,2 @@ rd reportdesign : L10N:l10n BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL -rd reportdesign usr1 - all rd_mkout NULL -rd reportdesign\inc nmake - all rd_inc NULL -rd reportdesign\source\core\api nmake - all rd_api rd_inc NULL -rd reportdesign\source\core\resource nmake - all rd_res rd_inc NULL -rd reportdesign\source\core\sdr nmake - all rd_sdr rd_inc NULL -rd reportdesign\source\core\misc nmake - all rd_misc rd_inc NULL -rd reportdesign\source\shared nmake - all rd_shared rd_inc NULL -rd reportdesign\source\ui\misc nmake - all rd_uimisc rd_inc NULL -rd reportdesign\source\ui\dlg nmake - all rd_uidlg rd_inc NULL -rd reportdesign\source\ui\report nmake - all rd_uireport rd_inc NULL -rd reportdesign\source\ui\inspection nmake - all rd_uiinspection rd_inc NULL -rd reportdesign\source\filter\xml nmake - all rd_filter_xml rd_inc NULL -rd reportdesign\util nmake - all rd_util rd_api rd_res rd_shared rd_uimisc rd_uidlg rd_uireport rd_uiinspection rd_sdr rd_misc rd_filter_xml NULL - -# has problems in m78, in m83 also -# rd reportdesign\qa\complex\reportdesign nmake - all rd_qa_complex NULL - +rd reportdesign\prj nmake - all rd_prj NULL diff --git a/reportdesign/prj/d.lst b/reportdesign/prj/d.lst index d7cc5fad6396..e69de29bb2d1 100644 --- a/reportdesign/prj/d.lst +++ b/reportdesign/prj/d.lst @@ -1,24 +0,0 @@ -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar -mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid - -dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" - -# Libraries -..\%__SRC%\bin\rpt*.dll %_DEST%\bin%_EXT%\rpt*.dll -..\%__SRC%\lib\librpt*.so %_DEST%\lib%_EXT%\librpt*.so -# ..\%__SRC%\lib\irpt*.lib %_DEST%\lib%_EXT%\irpt*.lib -..\%__SRC%\lib\librpt*.dylib %_DEST%\lib%_EXT%\librpt*.dylib - -# Resources -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res - -..\uiconfig\dbreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar\*.xml -..\uiconfig\dbreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar\*.xml -..\uiconfig\dbreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar\*.xml - -..\%__SRC%\misc\rpt.component %_DEST%\xml%_EXT%\rpt.component -..\%__SRC%\misc\rptui.component %_DEST%\xml%_EXT%\rptui.component -..\%__SRC%\misc\rptxml.component %_DEST%\xml%_EXT%\rptxml.component diff --git a/reportdesign/prj/makefile.mk b/reportdesign/prj/makefile.mk new file mode 100644 index 000000000000..19eb7c11eb7f --- /dev/null +++ b/reportdesign/prj/makefile.mk @@ -0,0 +1,36 @@ +############################################################### +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +############################################################### + + + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog |