[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk solenv/Makefile solenv/makefile.mk solenv/Module_solenv.mk solenv/Package_versionlist.mk solenv/Package_version.mk solenv/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 9 09:08:01 UTC 2019
Module_ooo.mk | 1 +
solenv/Makefile | 32 ++++++++++++++++++++++++++++++++
solenv/Module_solenv.mk | 32 ++++++++++++++++++++++++++++++++
solenv/Package_version.mk | 26 ++++++++++++++++++++++++++
solenv/Package_versionlist.mk | 36 ++++++++++++++++++++++++++++++++++++
solenv/prj/build.lst | 3 +--
solenv/prj/d.lst | 4 ----
solenv/prj/makefile.mk | 31 +++++++++++++++++--------------
8 files changed, 145 insertions(+), 20 deletions(-)
New commits:
commit a9f27c27dff0d328daec768572376f0e32aa1049
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Feb 9 07:54:55 2019 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Feb 9 07:54:55 2019 +0000
Port main/solenv to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index a098c6cfe6f2..e46e15024625 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sd \
sfx2 \
slideshow \
+ solenv \
sot \
starmath \
store \
diff --git a/solenv/Makefile b/solenv/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/solenv/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
new file mode 100644
index 000000000000..fb16e5e7a431
--- /dev/null
+++ b/solenv/Module_solenv.mk
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,solenv))
+
+
+$(eval $(call gb_Module_add_targets,solenv,\
+ Package_version \
+ Package_versionlist \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/Package_version.mk b/solenv/Package_version.mk
new file mode 100644
index 000000000000..33508796792b
--- /dev/null
+++ b/solenv/Package_version.mk
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,solenv_version,$(SRCDIR)/solenv/inc))
+
+$(eval $(call gb_Package_add_file,solenv_version,bin/version.lst,version.lst))
diff --git a/solenv/Package_versionlist.mk b/solenv/Package_versionlist.mk
new file mode 100644
index 000000000000..7ccedc8de528
--- /dev/null
+++ b/solenv/Package_versionlist.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.
+#
+#**************************************************************
+
+include $(SRCDIR)/solenv/inc/version.lst
+
+$(eval $(call gb_Package_Package,solenv_versionlist,$(WORKDIR)/CustomTarget/solenv/inc))
+
+$(eval $(call gb_Package_add_file,solenv_versionlist,inc/versionlist.hrc,versionlist.hrc))
+
+$(WORKDIR)/CustomTarget/solenv/inc/versionlist.hrc : $(SRCDIR)/solenv/inc/version.lst
+ mkdir -p $(dir $@)
+ @echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@
+ @echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@
+ @echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@
+ @echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@
+ @echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@
+ @echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@
+
diff --git a/solenv/prj/build.lst b/solenv/prj/build.lst
index d7a7f36b19fe..5dea713f936e 100644
--- a/solenv/prj/build.lst
+++ b/solenv/prj/build.lst
@@ -1,3 +1,2 @@
sn solenv : NULL
-sn solenv usr1 - all sn_mkout NULL
-sn solenv nmake - all sn_init NULL
+sn solenv/prj nmake - all sn_prj NULL
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index 05ceea226515..e69de29bb2d1 100755
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,4 +0,0 @@
-mkdir: %_DEST%\bin%_EXT%
-mkdir: %_DEST%\inc%_EXT%
-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
-..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc
diff --git a/solenv/makefile.mk b/solenv/prj/makefile.mk
old mode 100755
new mode 100644
similarity index 60%
rename from solenv/makefile.mk
rename to solenv/prj/makefile.mk
index 136929a6beea..c62c6a657d16
--- a/solenv/makefile.mk
+++ b/solenv/prj/makefile.mk
@@ -21,21 +21,24 @@
-PRJ=.
-PRJNAME=solenv
-TARGET=init
+PRJ=..
+TARGET=prj
-# --- Settings ----------------------------------
.INCLUDE : settings.mk
-.INCLUDE : target.mk
-.INCLUDE : versionlist.mk
-ALLTAR : $(INCCOM)/versionlist.hrc
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
-$(INCCOM)/versionlist.hrc : ./inc/version.lst
- $(COMMAND_ECHO)echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@
- $(COMMAND_ECHO)echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@
- $(COMMAND_ECHO)echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@
- $(COMMAND_ECHO)echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@
- $(COMMAND_ECHO)echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@
- $(COMMAND_ECHO)echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
More information about the Libreoffice-commits
mailing list