Author: damjan
Date: Sat Feb 9 07:54:55 2019
New Revision: 1853245
URL: http://svn.apache.org/viewvc?rev=1853245&view=rev
Log:
Port main/solenv to gbuild.
Patch by: me
Added:
openoffice/trunk/main/solenv/Makefile (with props)
openoffice/trunk/main/solenv/Module_solenv.mk
openoffice/trunk/main/solenv/Package_version.mk
openoffice/trunk/main/solenv/Package_versionlist.mk
openoffice/trunk/main/solenv/prj/makefile.mk
Removed:
openoffice/trunk/main/solenv/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/solenv/prj/build.lst
openoffice/trunk/main/solenv/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1853245&r1=1853244&r2=1853245&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sat Feb 9 07:54:55 2019
@@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,o
sd \
sfx2 \
slideshow \
+ solenv \
sot \
starmath \
store \
Added: openoffice/trunk/main/solenv/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/Makefile?rev=1853245&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/Makefile (added)
+++ openoffice/trunk/main/solenv/Makefile Sat Feb 9 07:54:55 2019
@@ -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:
Propchange: openoffice/trunk/main/solenv/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/solenv/Module_solenv.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/Module_solenv.mk?rev=1853245&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/Module_solenv.mk (added)
+++ openoffice/trunk/main/solenv/Module_solenv.mk Sat Feb 9 07:54:55 2019
@@ -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:
Added: openoffice/trunk/main/solenv/Package_version.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/Package_version.mk?rev=1853245&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/Package_version.mk (added)
+++ openoffice/trunk/main/solenv/Package_version.mk Sat Feb 9 07:54:55 2019
@@ -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))
Added: openoffice/trunk/main/solenv/Package_versionlist.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/Package_versionlist.mk?rev=1853245&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/Package_versionlist.mk (added)
+++ openoffice/trunk/main/solenv/Package_versionlist.mk Sat Feb 9 07:54:55 2019
@@ -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)" >> $@
+
Modified: openoffice/trunk/main/solenv/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/prj/build.lst?rev=1853245&r1=1853244&r2=1853245&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/prj/build.lst (original)
+++ openoffice/trunk/main/solenv/prj/build.lst Sat Feb 9 07:54:55 2019
@@ -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
Modified: openoffice/trunk/main/solenv/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/prj/d.lst?rev=1853245&r1=1853244&r2=1853245&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/prj/d.lst (original)
+++ openoffice/trunk/main/solenv/prj/d.lst Sat Feb 9 07:54:55 2019
@@ -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
Added: openoffice/trunk/main/solenv/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/prj/makefile.mk?rev=1853245&view=auto
==============================================================================
--- openoffice/trunk/main/solenv/prj/makefile.mk (added)
+++ openoffice/trunk/main/solenv/prj/makefile.mk Sat Feb 9 07:54:55 2019
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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
+
+.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
