Repository.mk | 4 +
unodevtools/Executable_uno-skeletonmaker.mk | 63 ++++++++++++++++++++++++++++
unodevtools/Makefile | 32 ++++++++++++++
unodevtools/Module_unodevtools.mk | 32 ++------------
unodevtools/prj/build.lst | 6 --
unodevtools/prj/d.lst | 5 --
unodevtools/prj/makefile.mk | 38 +++++++---------
unodevtools/unodevtools.pmk | 61 ---------------------------
8 files changed, 122 insertions(+), 119 deletions(-)
New commits:
commit 6176f177905984d9a2de23714d700b19a427c175
Author: Damjan Jovanovic <dam...@apache.org>
Date: Tue Mar 27 00:31:06 2018 +0000
Port main/unodevtools to gbuild.
Patch by: me
diff --git a/Repository.mk b/Repository.mk
index 7c9f570f506c..a8b20661bc26 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(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_libraries,UNOVERLIBS, \
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
+ codemaker \
+ commoncpp \
+ commonjava \
ooopathutils \
salcpprt \
sldshw_s \
diff --git a/unodevtools/Executable_uno-skeletonmaker.mk
b/unodevtools/Executable_uno-skeletonmaker.mk
new file mode 100644
index 000000000000..298cca3f3a25
--- /dev/null
+++ b/unodevtools/Executable_uno-skeletonmaker.mk
@@ -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:
diff --git a/unodevtools/Makefile b/unodevtools/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/unodevtools/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/unodevtools/source/skeletonmaker/makefile.mk
b/unodevtools/Module_unodevtools.mk
similarity index 54%
rename from unodevtools/source/skeletonmaker/makefile.mk
rename to unodevtools/Module_unodevtools.mk
index 6d555302a3fd..7fbf45bfab25 100644
--- a/unodevtools/source/skeletonmaker/makefile.mk
+++ b/unodevtools/Module_unodevtools.mk
@@ -21,33 +21,11 @@
-PRJ := ..$/..
-PRJNAME := unodevtools
+$(eval $(call gb_Module_Module,unodevtools))
-TARGET := uno-skeletonmaker
-TARGETTYPE := CUI
-LIBTARGET := NO
+$(eval $(call gb_Module_add_targets,unodevtools,\
+ Executable_uno-skeletonmaker \
+))
-ENABLE_EXCEPTIONS := TRUE
-.INCLUDE: settings.mk
-.INCLUDE : $(PRJ)$/unodevtools.pmk
-
-APP1TARGET = $(TARGET)
-APP1RPATH=SDK
-
-APP1OBJS = $(OBJ)$/skeletonmaker.obj \
- $(OBJ)$/skeletoncommon.obj \
- $(OBJ)$/javatypemaker.obj \
- $(OBJ)$/cpptypemaker.obj \
- $(OBJ)$/javacompskeleton.obj \
- $(OBJ)$/cppcompskeleton.obj
-
-APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN)
$(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
- $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
-APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
- $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
-
-OBJFILES = $(APP1OBJS)
-
-.INCLUDE: target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/unodevtools/prj/build.lst b/unodevtools/prj/build.lst
index cc505eee00ba..cd188dc36ef7 100644
--- a/unodevtools/prj/build.lst
+++ b/unodevtools/prj/build.lst
@@ -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
diff --git a/unodevtools/prj/d.lst b/unodevtools/prj/d.lst
index 0060b6b9cc15..e69de29bb2d1 100644
--- a/unodevtools/prj/d.lst
+++ b/unodevtools/prj/d.lst
@@ -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
-
diff --git a/unodevtools/source/unodevtools/makefile.mk
b/unodevtools/prj/makefile.mk
similarity index 64%
rename from unodevtools/source/unodevtools/makefile.mk
rename to unodevtools/prj/makefile.mk
index 5e71bb6f50c4..c62c6a657d16 100644
--- a/unodevtools/source/unodevtools/makefile.mk
+++ b/unodevtools/prj/makefile.mk
@@ -20,29 +20,25 @@
#**************************************************************
-PRJ=..$/..
-PRJNAME=unodevtools
-TARGET=unodevtools
+PRJ=..
+TARGET=prj
+.INCLUDE : settings.mk
-ENABLE_EXCEPTIONS=TRUE
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
-# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/typemanager.obj \
- $(SLO)$/typeblob.obj \
- $(SLO)$/options.obj
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-# ------------------------------------------------------------------
-
-.INCLUDE : target.mk
+.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
diff --git a/unodevtools/unodevtools.pmk b/unodevtools/unodevtools.pmk
deleted file mode 100644
index 1808eccc52f8..000000000000
--- a/unodevtools/unodevtools.pmk
+++ /dev/null
@@ -1,61 +0,0 @@
-#**************************************************************
-#
-# 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.
-#
-#**************************************************************
-
-
-
-.IF "$(GUI)"=="WNT"
-UNODEVTOOLSLIBDEPN=unodevtools.lib
-CODEMAKERLIBDEPN=codemaker.lib
-COMMONCPPLIBDEPN=commoncpp.lib
-COMMONJAVALIBDEPN=commonjava.lib
-.IF "$(COM)"=="GCC"
-UNODEVTOOLSLIBST=-lunodevtools
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ELSE
-UNODEVTOOLSLIBST=unodevtools.lib
-CODEMAKERLIBST=codemaker.lib
-COMMONCPPLIBST=commoncpp.lib
-COMMONJAVALIBST=commonjava.lib
-.ENDIF
-
-.ELIF "$(GUI)"=="OS2"
-UNODEVTOOLSLIBDEPN=unodevtools.lib
-CODEMAKERLIBDEPN=codemaker.lib
-COMMONCPPLIBDEPN=commoncpp.lib
-COMMONJAVALIBDEPN=commonjava.lib
-UNODEVTOOLSLIBST=-lunodevtools
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ELSE
-
-UNODEVTOOLSLIBDEPN=libunodevtools.a
-CODEMAKERLIBDEPN=libcodemaker.a
-COMMONCPPLIBDEPN=libcommoncpp.a
-COMMONJAVALIBDEPN=libcommonjava.a
-UNODEVTOOLSLIBST=-lunodevtools
-CODEMAKERLIBST=-lcodemaker
-COMMONCPPLIBST=-lcommoncpp
-COMMONJAVALIBST=-lcommonjava
-.ENDIF
-
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
