openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1827793 - in /openoffice/trunk/main: ./ unodevtools/ unodevtools/prj/ unodevtools/source/skeletonmaker/ unodevtools/source/unodevtools/
Date Tue, 27 Mar 2018 00:31:06 GMT
Author: damjan
Date: Tue Mar 27 00:31:06 2018
New Revision: 1827793

URL: http://svn.apache.org/viewvc?rev=1827793&view=rev
Log:
Port main/unodevtools to gbuild.

Patch by: me


Added:
    openoffice/trunk/main/unodevtools/Executable_uno-skeletonmaker.mk
    openoffice/trunk/main/unodevtools/Makefile
    openoffice/trunk/main/unodevtools/Module_unodevtools.mk
    openoffice/trunk/main/unodevtools/prj/makefile.mk
Removed:
    openoffice/trunk/main/unodevtools/source/skeletonmaker/makefile.mk
    openoffice/trunk/main/unodevtools/source/unodevtools/makefile.mk
    openoffice/trunk/main/unodevtools/unodevtools.pmk
Modified:
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/unodevtools/prj/build.lst
    openoffice/trunk/main/unodevtools/prj/d.lst

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1827793&r1=1827792&r2=1827793&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Tue Mar 27 00:31:06 2018
@@ -46,6 +46,7 @@ $(eval $(call gb_Helper_register_executa
 
 $(eval $(call gb_Helper_register_executables,SDK, \
 	regcompare \
+	uno-skeletonmaker \
 ))
 
 $(eval $(call gb_Helper_register_executables,UREBIN, \
@@ -249,6 +250,9 @@ $(eval $(call gb_Helper_register_librari
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	basegfx_s \
+	codemaker \
+	commoncpp \
+	commonjava \
 	ooopathutils \
 	salcpprt \
 	sldshw_s \

Added: openoffice/trunk/main/unodevtools/Executable_uno-skeletonmaker.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unodevtools/Executable_uno-skeletonmaker.mk?rev=1827793&view=auto
==============================================================================
--- openoffice/trunk/main/unodevtools/Executable_uno-skeletonmaker.mk (added)
+++ openoffice/trunk/main/unodevtools/Executable_uno-skeletonmaker.mk Tue Mar 27 00:31:06
2018
@@ -0,0 +1,63 @@
+###############################################################
+#  
+#  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_Executable_Executable,uno-skeletonmaker))
+
+$(eval $(call gb_Executable_add_api,uno-skeletonmaker,\
+	udkapi \
+))
+
+$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
+	-I$(SRCDIR)/unodevtools/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,uno-skeletonmaker,\
+	cppu \
+	cppuhelper \
+	reg \
+	sal \
+	salhelper \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,uno-skeletonmaker,\
+	codemaker \
+	commoncpp \
+	commonjava \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\
+	unodevtools/source/unodevtools/options \
+	unodevtools/source/unodevtools/typeblob \
+	unodevtools/source/unodevtools/typemanager \
+	unodevtools/source/skeletonmaker/cppcompskeleton \
+	unodevtools/source/skeletonmaker/cpptypemaker \
+	unodevtools/source/skeletonmaker/javacompskeleton \
+	unodevtools/source/skeletonmaker/javatypemaker \
+	unodevtools/source/skeletonmaker/skeletoncommon \
+	unodevtools/source/skeletonmaker/skeletonmaker \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/unodevtools/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unodevtools/Makefile?rev=1827793&view=auto
==============================================================================
--- openoffice/trunk/main/unodevtools/Makefile (added)
+++ openoffice/trunk/main/unodevtools/Makefile Tue Mar 27 00:31:06 2018
@@ -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:

Added: openoffice/trunk/main/unodevtools/Module_unodevtools.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unodevtools/Module_unodevtools.mk?rev=1827793&view=auto
==============================================================================
--- openoffice/trunk/main/unodevtools/Module_unodevtools.mk (added)
+++ openoffice/trunk/main/unodevtools/Module_unodevtools.mk Tue Mar 27 00:31:06 2018
@@ -0,0 +1,31 @@
+#**************************************************************
+#  
+#  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,unodevtools))
+
+$(eval $(call gb_Module_add_targets,unodevtools,\
+	Executable_uno-skeletonmaker \
+))
+
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/unodevtools/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unodevtools/prj/build.lst?rev=1827793&r1=1827792&r2=1827793&view=diff
==============================================================================
--- openoffice/trunk/main/unodevtools/prj/build.lst (original)
+++ openoffice/trunk/main/unodevtools/prj/build.lst Tue Mar 27 00:31:06 2018
@@ -1,8 +1,4 @@
 udt	unodevtools	:	codemaker cppuhelper NULL
-udt	unodevtools							usr1	-	all	udt_mkout NULL
-udt	unodevtools\inc						get		-	all	udt_inc NULL
-udt	unodevtools\prj						get		-	all	udt_prj NULL
-udt	unodevtools\source\unodevtools		nmake	-	all	udt_unodevtools NULL
-udt	unodevtools\source\skeletonmaker	nmake	-	all	udt_skeletonmaker udt_unodevtools NULL
+udt	unodevtools\prj						nmake	-	all	udt_prj NULL
 
 

Modified: openoffice/trunk/main/unodevtools/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unodevtools/prj/d.lst?rev=1827793&r1=1827792&r2=1827793&view=diff
==============================================================================
--- openoffice/trunk/main/unodevtools/prj/d.lst (original)
+++ openoffice/trunk/main/unodevtools/prj/d.lst Tue Mar 27 00:31:06 2018
@@ -1,5 +0,0 @@
-..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin%_EXT%\uno-skeletonmaker.exe
-..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin%_EXT%\uno-skeletonmaker.pdb
-
-..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin%_EXT%\uno-skeletonmaker
-

Added: openoffice/trunk/main/unodevtools/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unodevtools/prj/makefile.mk?rev=1827793&view=auto
==============================================================================
--- openoffice/trunk/main/unodevtools/prj/makefile.mk (added)
+++ openoffice/trunk/main/unodevtools/prj/makefile.mk Tue Mar 27 00:31:06 2018
@@ -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



Mime
View raw message