[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - basctl/AllLangResTarget_basctl.mk basctl/inc basctl/Library_basctl.mk basctl/Makefile basctl/Module_basctl.mk basctl/Package_uiconfig.mk basctl/Package_xml.mk basctl/prj basctl/sdi basctl/source basctl/util Module_ooo.mk postprocess/packcomponents Repository.mk solenv/gbuild UnoControls/Library_ctl.mk UnoControls/Makefile UnoControls/Module_UnoControls.mk UnoControls/prj UnoControls/source UnoControls/util xml2cmp/Executable_srvdepy.mk xml2cmp/Executable_xml2cmp.mk xml2cmp/Makefile xml2cmp/Module_xml2cmp.mk xml2cmp/prj xml2cmp/source xml2cmp/util
Damjan Jovanovic
damjan at apache.org
Wed Dec 28 22:09:29 UTC 2016
Module_ooo.mk | 3
Repository.mk | 4
UnoControls/Library_ctl.mk | 62 ++++++++++++
UnoControls/Makefile | 32 ++++++
UnoControls/Module_UnoControls.mk | 30 ++++++
UnoControls/prj/build.lst | 5 -
UnoControls/prj/d.lst | 6 -
UnoControls/prj/makefile.mk | 44 ++++++++
UnoControls/source/base/makefile.mk | 65 -------------
UnoControls/source/base/registercontrols.cxx | 4
UnoControls/source/controls/makefile.mk | 45 ---------
UnoControls/util/makefile.mk | 65 -------------
UnoControls/util/makefile.pmk | 23 ----
UnoControls/util/target.pmk | 31 ------
basctl/AllLangResTarget_basctl.mk | 49 +++++++++
basctl/Library_basctl.mk | 133 +++++++++++++++++++++++++++
basctl/Makefile | 32 ++++++
basctl/Module_basctl.mk | 33 ++++++
basctl/Package_uiconfig.mk | 33 ++++++
basctl/Package_xml.mk | 26 +++++
basctl/inc/makefile.mk | 44 --------
basctl/prj/build.lst | 9 -
basctl/prj/d.lst | 24 ----
basctl/prj/makefile.mk | 44 ++++++++
basctl/sdi/makefile.mk | 50 ----------
basctl/source/accessibility/makefile.mk | 44 --------
basctl/source/basicide/basidesh.src | 2
basctl/source/basicide/brkdlg.src | 2
basctl/source/basicide/macrodlg.src | 2
basctl/source/basicide/makefile.mk | 96 -------------------
basctl/source/basicide/moduldlg.src | 2
basctl/source/basicide/moptions.src | 2
basctl/source/basicide/objdlg.src | 2
basctl/source/dlged/makefile.mk | 59 -----------
basctl/util/basctl.map | 30 ------
basctl/util/makefile.mk | 108 ---------------------
basctl/util/makefile.pmk | 22 ----
postprocess/packcomponents/makefile.mk | 4
solenv/gbuild/platform/freebsd.mk | 2
solenv/gbuild/platform/linux.mk | 2
solenv/gbuild/platform/os2.mk | 2
solenv/gbuild/platform/solaris.mk | 2
xml2cmp/Executable_srvdepy.mk | 59 +++++++++++
xml2cmp/Executable_xml2cmp.mk | 58 +++++++++++
xml2cmp/Makefile | 32 ++++++
xml2cmp/Module_xml2cmp.mk | 31 ++++++
xml2cmp/prj/build.lst | 7 -
xml2cmp/prj/d.lst | 4
xml2cmp/prj/makefile.mk | 44 ++++++++
xml2cmp/source/finder/makefile.mk | 65 -------------
xml2cmp/source/support/makefile.mk | 57 -----------
xml2cmp/source/xcd/makefile.mk | 75 ---------------
xml2cmp/util/makefile.mk | 54 ----------
53 files changed, 766 insertions(+), 999 deletions(-)
New commits:
commit 5d868a712b4657369e74dbeb26b8f6de49614ab9
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 28 15:28:18 2016 +0000
Add some more files to the xml2cmp gbuild module that were missed in the
last commit.
Patch by: me
diff --git a/xml2cmp/Executable_srvdepy.mk b/xml2cmp/Executable_srvdepy.mk
new file mode 100644
index 0000000..151764d
--- /dev/null
+++ b/xml2cmp/Executable_srvdepy.mk
@@ -0,0 +1,59 @@
+###############################################################
+#
+# 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,srvdepy))
+
+$(eval $(call gb_Executable_set_targettype_gui,srvdepy,NO))
+
+#$(eval $(call gb_Executable_add_api,srvdepy,\
+# udkapi \
+# offapi \
+#))
+
+$(eval $(call gb_Executable_set_include,srvdepy,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/xml2cmp/source/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,srvdepy,\
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,srvdepy,\
+ xml2cmp/source/finder/dependy \
+ xml2cmp/source/finder/dep_main \
+ xml2cmp/source/xcd/cr_html \
+ xml2cmp/source/xcd/cr_index \
+ xml2cmp/source/xcd/cr_metho \
+ xml2cmp/source/xcd/filebuff \
+ xml2cmp/source/xcd/parse \
+ xml2cmp/source/xcd/xmlelem \
+ xml2cmp/source/xcd/xmltree \
+ xml2cmp/source/support/cmdline \
+ xml2cmp/source/support/heap \
+ xml2cmp/source/support/sistr \
+ xml2cmp/source/support/syshelp \
+ xml2cmp/source/support/badcast \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk
new file mode 100644
index 0000000..7bd53b6
--- /dev/null
+++ b/xml2cmp/Executable_xml2cmp.mk
@@ -0,0 +1,58 @@
+###############################################################
+#
+# 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,xml2cmp))
+
+$(eval $(call gb_Executable_set_targettype_gui,xml2cmp,NO))
+
+#$(eval $(call gb_Executable_add_api,xml2cmp,\
+# udkapi \
+# offapi \
+#))
+
+$(eval $(call gb_Executable_set_include,xml2cmp,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/xml2cmp/source/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
+ xml2cmp/source/xcd/cr_html \
+ xml2cmp/source/xcd/cr_index \
+ xml2cmp/source/xcd/cr_metho \
+ xml2cmp/source/xcd/filebuff \
+ xml2cmp/source/xcd/parse \
+ xml2cmp/source/xcd/xmlelem \
+ xml2cmp/source/xcd/xmltree \
+ xml2cmp/source/xcd/main \
+ xml2cmp/source/support/cmdline \
+ xml2cmp/source/support/heap \
+ xml2cmp/source/support/sistr \
+ xml2cmp/source/support/syshelp \
+ xml2cmp/source/support/badcast \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile
new file mode 100644
index 0000000..c1d144c
--- /dev/null
+++ b/xml2cmp/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/xml2cmp/Module_xml2cmp.mk b/xml2cmp/Module_xml2cmp.mk
new file mode 100644
index 0000000..7d37331
--- /dev/null
+++ b/xml2cmp/Module_xml2cmp.mk
@@ -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,xml2cmp))
+
+$(eval $(call gb_Module_add_targets,xml2cmp,\
+ Executable_xml2cmp \
+ Executable_srvdepy \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xml2cmp/prj/makefile.mk b/xml2cmp/prj/makefile.mk
new file mode 100644
index 0000000..c62c6a6
--- /dev/null
+++ b/xml2cmp/prj/makefile.mk
@@ -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
commit 3c8757d12382d2f9800c3e26861be8d31c327ad1
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 28 15:26:49 2016 +0000
Port main/xml2cmp to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index c95ca8de..8f2318f 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
wizards \
writerfilter \
x11_extensions \
+ xml2cmp \
xmloff \
xmlreader \
xmlscript \
diff --git a/Repository.mk b/Repository.mk
index 58086fa..9a7e6f0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -31,8 +31,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \
mkunroll \
rscdep \
so_checksum \
+ srvdepy \
svidl \
sspretty \
+ xml2cmp \
))
$(eval $(call gb_Helper_register_executables,OOO, \
diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst
index e9f2979..83baf03 100644
--- a/xml2cmp/prj/build.lst
+++ b/xml2cmp/prj/build.lst
@@ -1,7 +1,2 @@
xc xml2cmp : soltools stlport NULL
-xc xml2cmp usr1 - all xc_mkout NULL
-xc xml2cmp\prj get - all xc_prj NULL
-xc xml2cmp\source\support nmake - all xc_supp NULL
-xc xml2cmp\source\xcd nmake - all xc_xcd NULL
-xc xml2cmp\util nmake - all xc_util xc_supp xc_xcd NULL
-xc xml2cmp\source\finder nmake - all xc_sfi xc_supp xc_xcd NULL
+xc xml2cmp\prj nmake - all xc_prj NULL
diff --git a/xml2cmp/prj/d.lst b/xml2cmp/prj/d.lst
index 51c51b4..e69de29 100644
--- a/xml2cmp/prj/d.lst
+++ b/xml2cmp/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\xml2cmp.exe %_DEST%\bin%_EXT%\xml2cmp.exe
-..\%__SRC%\bin\xml2cmp %_DEST%\bin%_EXT%\xml2cmp
-..\%__SRC%\bin\srvdepy.exe %_DEST%\bin%_EXT%\srvdepy.exe
-..\%__SRC%\bin\srvdepy %_DEST%\bin%_EXT%\srvdepy
diff --git a/xml2cmp/source/finder/makefile.mk b/xml2cmp/source/finder/makefile.mk
deleted file mode 100644
index 6b8765a..0000000
--- a/xml2cmp/source/finder/makefile.mk
+++ /dev/null
@@ -1,65 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=xml2cmp
-TARGET=srvdepy
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/dependy.obj \
- $(OBJ)$/dep_main.obj
-
-
-# --- Targets ------------------------------------------------------
-
-APP1TARGET= $(TARGET)
-.IF "$(GUI)"!="OS2"
-APP1STACK= 1000000
-.ENDIF
-
-LIBSALCPPRT=$(0)
-
-.IF "$(GUI)"=="WNT"
-UWINAPILIB=$(0)
-.ENDIF
-
-
-APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
-APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
-
-
-.INCLUDE : target.mk
-
-
diff --git a/xml2cmp/source/support/makefile.mk b/xml2cmp/source/support/makefile.mk
deleted file mode 100644
index e2df374..0000000
--- a/xml2cmp/source/support/makefile.mk
+++ /dev/null
@@ -1,57 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=xml2cmp
-TARGET=x2c_support
-TARGETTYPE=CUI
-
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
- $(OBJ)$/cmdline.obj \
- $(OBJ)$/heap.obj \
- $(OBJ)$/sistr.obj \
- $(OBJ)$/syshelp.obj \
- $(OBJ)$/badcast.obj
-
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/xml2cmp/source/xcd/makefile.mk b/xml2cmp/source/xcd/makefile.mk
deleted file mode 100644
index e417dcc1..0000000
--- a/xml2cmp/source/xcd/makefile.mk
+++ /dev/null
@@ -1,75 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=xml2cmp
-TARGET=x2c_xcd
-TARGETTYPE=CUI
-
-LIBTARGET=NO
-
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-
-
-# --- Files --------------------------------------------------------
-
-
-LIBONLYFILES=\
- $(OBJ)$/cr_html.obj \
- $(OBJ)$/cr_index.obj \
- $(OBJ)$/cr_metho.obj \
- $(OBJ)$/filebuff.obj \
- $(OBJ)$/parse.obj \
- $(OBJ)$/xmlelem.obj \
- $(OBJ)$/xmltree.obj
-
-
-OBJFILES=\
- $(OBJ)$/main.obj \
- $(LIBONLYFILES)
-
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1OBJFILES=\
- $(OBJFILES)
-
-
-LIB2TARGET=$(LB)$/$(TARGET)l.lib
-LIB2OBJFILES=\
- $(LIBONLYFILES)
-
-
-
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE : target.mk
diff --git a/xml2cmp/util/makefile.mk b/xml2cmp/util/makefile.mk
deleted file mode 100644
index ccede37..0000000
--- a/xml2cmp/util/makefile.mk
+++ /dev/null
@@ -1,54 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=xml2cmp
-TARGET=xml2cmp
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-
-# --- Targets ------------------------------------------------------
-
-APP1TARGET= $(TARGET)
-.IF "$(GUI)"!="OS2"
-APP1STACK= 1000000
-.ENDIF
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-APP1LIBS= $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
-APP1DEPN= $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
-APP1RPATH= NONE
-
-.INCLUDE : target.mk
-
-
commit fa6537af8650a0996e13e3352a47c0beb42b62b1
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 28 14:54:00 2016 +0000
Port main/UnoControls to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 9a1bf43..c95ca8de 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
+ UnoControls \
animations \
automation \
avmedia \
diff --git a/Repository.mk b/Repository.mk
index f064535..58086fa 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
canvastools \
communi \
cppcanvas \
+ ctl \
cui \
dba \
dbaxml \
diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
new file mode 100644
index 0000000..e575dfa
--- /dev/null
+++ b/UnoControls/Library_ctl.mk
@@ -0,0 +1,62 @@
+#**************************************************************
+#
+# 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_Library_Library,ctl))
+
+$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))
+
+$(eval $(call gb_Library_set_include,ctl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/UnoControls/inc \
+ -I$(SRCDIR)/UnoControls/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,ctl,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ctl,\
+ cppuhelper \
+ cppu \
+ sal \
+ stl \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,ctl,\
+ UnoControls/source/base/multiplexer \
+ UnoControls/source/base/basecontrol \
+ UnoControls/source/base/basecontainercontrol \
+ UnoControls/source/base/registercontrols \
+ UnoControls/source/controls/progressbar \
+ UnoControls/source/controls/framecontrol \
+ UnoControls/source/controls/progressmonitor \
+ UnoControls/source/controls/OConnectionPointHelper \
+ UnoControls/source/controls/OConnectionPointContainerHelper \
+ UnoControls/source/controls/statusindicator \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/UnoControls/util/makefile.pmk b/UnoControls/Makefile
similarity index 76%
rename from UnoControls/util/makefile.pmk
rename to UnoControls/Makefile
index 8f88a44..c1d144c 100644
--- a/UnoControls/util/makefile.pmk
+++ b/UnoControls/Makefile
@@ -19,5 +19,14 @@
#
#**************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-.INCLUDE : settings.mk
+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/UnoControls/util/target.pmk b/UnoControls/Module_UnoControls.mk
similarity index 87%
rename from UnoControls/util/target.pmk
rename to UnoControls/Module_UnoControls.mk
index 511cf39..7b02289 100644
--- a/UnoControls/util/target.pmk
+++ b/UnoControls/Module_UnoControls.mk
@@ -20,12 +20,11 @@
#**************************************************************
-ALLSLO: $(SLOFILES)
-SOSHL: $(SHL1TARGETN)
+$(eval $(call gb_Module_Module,UnoControls))
-WHOLEPRJ:
- cd $(PRJ)$/prj
- make debug linkinc prjpch compinc
- @echo "READY"
+$(eval $(call gb_Module_add_targets,UnoControls,\
+ Library_ctl \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst
index 473776f..50d6b1b 100644
--- a/UnoControls/prj/build.lst
+++ b/UnoControls/prj/build.lst
@@ -1,5 +1,2 @@
us UnoControls : LIBXSLT:libxslt cppuhelper offapi tools NULL
-us UnoControls usr1 - all us_mkout NULL
-us UnoControls\source\base nmake - all us_base NULL
-us UnoControls\source\controls nmake - all us_ctrls NULL
-us UnoControls\util nmake - all us_util us_base us_ctrls NULL
+us UnoControls\prj nmake - all us_prj NULL
diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst
index 370fc0c..e69de29 100644
--- a/UnoControls/prj/d.lst
+++ b/UnoControls/prj/d.lst
@@ -1,6 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component
diff --git a/UnoControls/source/controls/makefile.mk b/UnoControls/prj/makefile.mk
similarity index 58%
rename from UnoControls/source/controls/makefile.mk
rename to UnoControls/prj/makefile.mk
index bbc2ca1..c62c6a6 100644
--- a/UnoControls/source/controls/makefile.mk
+++ b/UnoControls/prj/makefile.mk
@@ -20,26 +20,25 @@
#**************************************************************
-PRJ=..$/..
-PRJNAME=UnoControls
-TARGET=controls
-ENABLE_EXCEPTIONS=TRUE
-.IF "$(L10N_framework)"==""
+PRJ=..
+TARGET=prj
-# --- Settings -----------------------------------------------------
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.INCLUDE : settings.mk
-# --- Files --------------------------------------------------------
-SLOFILES=\
- $(SLO)$/progressbar.obj \
- $(SLO)$/framecontrol.obj \
- $(SLO)$/progressmonitor.obj \
- $(SLO)$/OConnectionPointHelper.obj \
- $(SLO)$/OConnectionPointContainerHelper.obj \
- $(SLO)$/statusindicator.obj
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
-.INCLUDE : target.mk
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
deleted file mode 100644
index 27c4220..0000000
--- a/UnoControls/source/base/makefile.mk
+++ /dev/null
@@ -1,65 +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.
-#
-#**************************************************************
-
-
-PRJ=..$/..
-
-PRJNAME=UnoControls
-TARGET=base
-ENABLE_EXCEPTIONS=TRUE
-#LIBTARGET=NO
-#USE_LDUMP2=TRUE
-#USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-
-# --- Files --------------------------------------------------------
-SLOFILES= $(SLO)$/multiplexer.obj \
- $(SLO)$/basecontrol.obj \
- $(SLO)$/basecontainercontrol.obj \
- $(SLO)$/registercontrols.obj
-
-#LIB1TARGET= $(SLB)$/$(TARGET).lib
-#LIB1OBJFILES= $(SLOFILES)
-
-#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-#SHL1STDLIBS=\
-# $(ONELIB) \
-# $(USRLIB) \
-# $(UNOLIB) \
-# $(VOSLIB) \
-# $(OSLLIB) \
-# $(TOOLSLIB) \
-# $(RTLLIB)
-
-#SHL1DEPN= makefile.mk
-#SHL1LIBS= $(LIB1TARGET)
-#SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-#DEF1NAME= $(SHL1TARGET)
-#DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-#.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 2eded75..dc82625 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -154,7 +154,7 @@ CREATEINSTANCE ( StatusIndicator )
// return environment
//______________________________________________________________________________________________________________
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
@@ -164,7 +164,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_
// create right component factory
//______________________________________________________________________________________________________________
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
void* pServiceManager ,
void* /*pRegistryKey*/ )
{
diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk
deleted file mode 100644
index a9577b0..0000000
--- a/UnoControls/util/makefile.mk
+++ /dev/null
@@ -1,65 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=UnoControls
-TARGET=ctl
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES= $(SLB)$/base.lib \
- $(SLB)$/controls.lib
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1DEPN= makefile.mk
-SHL1LIBS= $(LIB1TARGET)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/ctl.component
-
-$(MISC)/ctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ctl.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ctl.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 10c5684..d693667 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -55,6 +55,7 @@ my_components = \
chartmodel \
charttools \
chartview \
+ component/UnoControls/util/ctl \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
component/basctl/util/basctl \
@@ -128,7 +129,6 @@ my_components = \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
component/xmlscript/util/xcr \
- ctl \
date \
dbase \
dbp \
commit 2ab507937f07bcb53121281cce1798a464fe0754
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 28 14:53:22 2016 +0000
I've heard rumours it's a POSIX feature, but so far the problem only
appears on Linux, not FreeBSD.
Linking is one-pass, using symbols exported by libraries to resolve
missing symbols in previous, but *NOT* subsequent, objects (including
libraries). This means the order libraries are given to the linker
does matter, because symbols missing in latter objects cannot be
satisfied by former objects.
Static libraries should be therefore be linked to before dynamic
libraries, as static libraries cannot specify dependencies on dynamic
libraries, yet might need symbols from them.
This should fix the main/slideshow build problem on Linux.
Only Linux has been tested. The other platforms are guessed.
Patch by: me
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 225bdbb..9c39e27 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -256,12 +256,12 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
+ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
- -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(LIBS) \
-o $(1))
endef
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index d0a621b..e50c986 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -237,9 +237,9 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
- -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(LIBS) \
-lc \
-o $(1))
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index f5df15a..9cec835 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -322,9 +322,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
@$${RESPONSEFILE} \
$(if $(DLLTARGET), $(DLLDEF)) \
$(NATIVERES) \
+ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
$(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
- $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
$(if $(DLLTARGET),-o $(DLLTARGET), -o $(1) ); \
RC=$$?; rm $${RESPONSEFILE} \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index b313018..1a6409a 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -207,12 +207,12 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
+ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
- $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
-o $(1))
endef
commit 4ed106a5cd9e3e4a12b99dc403df73e149eca0e9
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 28 10:56:17 2016 +0000
Port main/basctl to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 1e600b5..9a1bf43 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
animations \
automation \
avmedia \
+ basctl \
basebmp \
basegfx \
binaryurp \
diff --git a/Repository.mk b/Repository.mk
index eb25fd6..f064535 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
avmediaMacAVF \
avmediaQuickTime \
avmediawin \
+ basctl \
basebmp \
basegfx \
canvastools \
diff --git a/basctl/sdi/makefile.mk b/basctl/AllLangResTarget_basctl.mk
similarity index 54%
rename from basctl/sdi/makefile.mk
rename to basctl/AllLangResTarget_basctl.mk
index 2c3e8d4..b5d9af2 100644
--- a/basctl/sdi/makefile.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -21,30 +21,29 @@
-
-PRJ=..
-
-PRJNAME=basctl
-TARGET=basslots
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-SDI1NAME=$(TARGET)
-SDI1EXPORT=basctl
-
-# --- Files --------------------------------------------------------
-
-SVSDI1DEPEND= \
- $(SOLARINCXDIR)$/sfx2/sfx.sdi \
- $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
- $(SOLARINCXDIR)$/svx/svx.sdi \
- $(SOLARINCXDIR)$/svx/svxitems.sdi \
- $(SOLARINCXDIR)$/svx/xoitems.sdi \
- baside.sdi
-
-# --- Targets -------------------------------------------------------
-.ENDIF
-.INCLUDE : target.mk
-
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,basctl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,basctl,basctl/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,basctl/res))
+
+$(eval $(call gb_SrsTarget_set_include,basctl/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/basctl/inc \
+ -I$(SRCDIR)/basctl/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,basctl/res,\
+ basctl/source/basicide/basidesh.src \
+ basctl/source/basicide/macrodlg.src \
+ basctl/source/basicide/moptions.src \
+ basctl/source/basicide/moduldlg.src \
+ basctl/source/basicide/objdlg.src \
+ basctl/source/basicide/brkdlg.src \
+ basctl/source/basicide/basicprint.src \
+ basctl/source/dlged/dlgresid.src \
+ basctl/source/dlged/managelang.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
new file mode 100644
index 0000000..e7448bfd
--- /dev/null
+++ b/basctl/Library_basctl.mk
@@ -0,0 +1,133 @@
+#**************************************************************
+#
+# 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_Library_Library,basctl))
+
+$(eval $(call gb_Library_add_precompiled_header,basctl,$(SRCDIR)/basctl/inc/pch/precompiled_basctl))
+
+$(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
+
+$(eval $(call gb_Library_set_componentfile,basctl,basctl/util/basctl))
+
+$(eval $(call gb_Library_set_include,basctl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/basctl/inc \
+ -I$(SRCDIR)/basctl/inc/pch \
+ -I$(SRCDIR)/basctl/source/inc \
+ -I$(WORKDIR)/SdiTarget/basctl/sdi \
+))
+
+$(eval $(call gb_Library_add_api,basctl,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,basctl,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ fwe \
+ ootk \
+ sal \
+ sb \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ xcr \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,basctl,\
+ shell \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,basctl,\
+ basctl/source/accessibility/accessibledialogwindow \
+ basctl/source/accessibility/accessibledialogcontrolshape \
+ basctl/source/basicide/basicrenderable \
+ basctl/source/basicide/scriptdocument \
+ basctl/source/basicide/basicbox \
+ basctl/source/basicide/basidesh \
+ basctl/source/basicide/basides1 \
+ basctl/source/basicide/basides2 \
+ basctl/source/basicide/basides3 \
+ basctl/source/basicide/baside2 \
+ basctl/source/basicide/baside3 \
+ basctl/source/basicide/basobj2 \
+ basctl/source/basicide/basobj3 \
+ basctl/source/basicide/bastypes \
+ basctl/source/basicide/bastype2 \
+ basctl/source/basicide/bastype3 \
+ basctl/source/basicide/iderdll \
+ basctl/source/basicide/macrodlg \
+ basctl/source/basicide/moduldlg \
+ basctl/source/basicide/moduldl2 \
+ basctl/source/basicide/unomodel \
+ basctl/source/basicide/register \
+ basctl/source/basicide/basdoc \
+ basctl/source/basicide/tbxctl \
+ basctl/source/basicide/basidectrlr \
+ basctl/source/basicide/localizationmgr \
+ basctl/source/basicide/doceventnotifier \
+ basctl/source/basicide/docsignature \
+ basctl/source/basicide/documentenumeration \
+ basctl/source/dlged/dlged \
+ basctl/source/dlged/dlgedobj \
+ basctl/source/dlged/dlgedfac \
+ basctl/source/dlged/dlgedlist \
+ basctl/source/dlged/dlgedclip \
+ basctl/source/dlged/propbrw \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,basctl,\
+ basctl/source/basicide/baside2b \
+ basctl/source/basicide/brkdlg \
+ basctl/source/basicide/objdlg \
+ basctl/source/dlged/dlgedfunc \
+ basctl/source/dlged/dlgedmod \
+ basctl/source/dlged/dlgedpage \
+ basctl/source/dlged/dlgedview \
+ basctl/source/dlged/managelang \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
+
+$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
+ -I$(SRCDIR)/basctl/inc \
+ -I$(SRCDIR)/basctl/sdi \
+ $$(INCLUDE) \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/source/accessibility/makefile.mk b/basctl/Makefile
similarity index 67%
rename from basctl/source/accessibility/makefile.mk
rename to basctl/Makefile
index c78266d..c1d144c 100644
--- a/basctl/source/accessibility/makefile.mk
+++ b/basctl/Makefile
@@ -19,26 +19,14 @@
#
#**************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-PRJ=..$/..
-
-PRJNAME=basctl
-TARGET=accessibility
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/accessibledialogwindow.obj \
- $(SLO)$/accessibledialogcontrolshape.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.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/basctl/util/makefile.pmk b/basctl/Module_basctl.mk
similarity index 82%
rename from basctl/util/makefile.pmk
rename to basctl/Module_basctl.mk
index 332218b..2bfddbc 100644
--- a/basctl/util/makefile.pmk
+++ b/basctl/Module_basctl.mk
@@ -20,3 +20,14 @@
#**************************************************************
+
+$(eval $(call gb_Module_Module,basctl))
+
+$(eval $(call gb_Module_add_targets,basctl,\
+ AllLangResTarget_basctl \
+ Library_basctl \
+ Package_uiconfig \
+ Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/Package_uiconfig.mk b/basctl/Package_uiconfig.mk
new file mode 100644
index 0000000..34ffdca
--- /dev/null
+++ b/basctl/Package_uiconfig.mk
@@ -0,0 +1,33 @@
+###############################################################
+#
+# 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,basctl_uiconfig,$(SRCDIR)/basctl/uiconfig))
+
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,basicide/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,basicide/toolbar/dialogbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,basicide/toolbar/translationbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,basicide/toolbar/macrobar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,basicide/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,basicide/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,basicide/toolbar/insertcontrolsbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,basicide/statusbar/statusbar.xml))
diff --git a/basctl/util/basctl.map b/basctl/Package_xml.mk
similarity index 79%
rename from basctl/util/basctl.map
rename to basctl/Package_xml.mk
index e88a790..8c55c67 100644
--- a/basctl/util/basctl.map
+++ b/basctl/Package_xml.mk
@@ -1,5 +1,5 @@
###############################################################
-#
+#
# 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
@@ -7,24 +7,20 @@
# 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.
-#
+#
###############################################################
-UDK_3_0_0 {
- global:
- basicide_choose_macro;
- basicide_macro_organizer;
- basicide_handle_basic_error;
- component_getImplementationEnvironment;
- component_getFactory;
- local:
- *;
-};
+
+
+
+$(eval $(call gb_Package_Package,basctl_xml,$(SRCDIR)/basctl))
+
+$(eval $(call gb_Package_add_file,basctl_xml,xml/basctl.xml,util/basctl.xml))
diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst
index 1f92577..d4f7be0 100644
--- a/basctl/prj/build.lst
+++ b/basctl/prj/build.lst
@@ -1,9 +1,2 @@
bc basctl : LIBXSLT:libxslt L10N:l10n svx NULL
-bc basctl usr1 - all bc_mkout NULL
-bc basctl\inc nmake - all bc_inc NULL
-bc basctl\source\inc get - all bc_sinc NULL
-bc basctl\sdi nmake - all bc_sdi NULL
-bc basctl\source\dlged nmake - all bc_dlg bc_inc NULL
-bc basctl\source\basicide nmake - all bc_bide bc_sdi bc_inc NULL
-bc basctl\source\accessibility nmake - all bc_acc bc_inc NULL
-bc basctl\util nmake - all bc_util bc_bide bc_dlg bc_acc NULL
+bc basctl\prj nmake - all bc_prj NULL
diff --git a/basctl/prj/d.lst b/basctl/prj/d.lst
index b3ded50..e69de29 100644
--- a/basctl/prj/d.lst
+++ b/basctl/prj/d.lst
@@ -1,24 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\inc\basslots.ilb %_DEST%\inc%_EXT%\basslots.ilb
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\bin\basctl*.dll %_DEST%\bin%_EXT%\basctl*.dll
-..\%__SRC%\bin\basctl*.res %_DEST%\bin%_EXT%\basctl*.res
-..\%__SRC%\misc\basctl*.map %_DEST%\bin%_EXT%\basctl*.map
-..\%__SRC%\misc\basctl.csv %_DEST%\inc%_EXT%\basctl.csv
-
-mkdir: %_DEST%\inc%_EXT%\basctl
-
-..\util\basctl.xml %_DEST%\xml%_EXT%\basctl.xml
-
-..\uiconfig\basicide\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar\*.xml
-..\uiconfig\basicide\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar\*.xml
-..\uiconfig\basicide\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar\*.xml
-..\%__SRC%\misc\basctl.component %_DEST%\xml%_EXT%\basctl.component
diff --git a/basctl/inc/makefile.mk b/basctl/prj/makefile.mk
similarity index 67%
rename from basctl/inc/makefile.mk
rename to basctl/prj/makefile.mk
index e82717c..c62c6a6 100644
--- a/basctl/inc/makefile.mk
+++ b/basctl/prj/makefile.mk
@@ -20,25 +20,25 @@
#**************************************************************
-PRJ=..
-
-PRJNAME=basctl
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+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
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 91b6c2d..865d485 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -21,7 +21,7 @@
-#include <baside2.hrc>
+#include "baside2.hrc"
#include <helpid.hrc>
#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 8f0fcbb..2fd0674 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -22,7 +22,7 @@
#include "helpid.hrc"
-#include <brkdlg.hrc>
+#include "brkdlg.hrc"
ModalDialog RID_BASICIDE_BREAKPOINTDLG
{
HelpId = "basctl:RID_BASICIDE_BREAKPOINTDLG" ;
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 78bcf7c..7faf15c 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -22,7 +22,7 @@
#include <sfx2/sfx.hrc>
-#include <macrodlg.hrc>
+#include "macrodlg.hrc"
#include <basidesh.hrc>
#include <helpid.hrc>
ModalDialog RID_MACROCHOOSER
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
deleted file mode 100644
index 94742c1..0000000
--- a/basctl/source/basicide/makefile.mk
+++ /dev/null
@@ -1,96 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=basctl
-TARGET=basicide
-VISIBILITY_HIDDEN=TRUE
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=ide_pch
-PROJECTPCHSOURCE=ide_pch
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(basicdebug)" != "" || "$(BASICDEBUG)" != ""
-CDEFS+=-DBASICDEBUG
-.ENDIF
-
-
-# --- Allgemein ----------------------------------------------------------
-
-EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj \
- $(SLO)$/scriptdocument.obj \
- $(SLO)$/basicbox.obj \
- $(SLO)$/basidesh.obj \
- $(SLO)$/basides1.obj \
- $(SLO)$/basides2.obj \
- $(SLO)$/basides3.obj \
- $(SLO)$/baside2.obj \
- $(SLO)$/baside3.obj \
- $(SLO)$/basobj2.obj \
- $(SLO)$/basobj3.obj \
- $(SLO)$/bastypes.obj \
- $(SLO)$/bastype2.obj \
- $(SLO)$/bastype3.obj \
- $(SLO)$/iderdll.obj \
- $(SLO)$/macrodlg.obj \
- $(SLO)$/moduldlg.obj \
- $(SLO)$/moduldl2.obj \
- $(SLO)$/unomodel.obj \
- $(SLO)$/register.obj \
- $(SLO)$/basdoc.obj \
- $(SLO)$/tbxctl.obj \
- $(SLO)$/basidectrlr.obj \
- $(SLO)$/localizationmgr.obj \
- $(SLO)$/doceventnotifier.obj \
- $(SLO)$/docsignature.obj \
- $(SLO)$/documentenumeration.obj
-
-SLOFILES = $(EXCEPTIONSFILES) \
- $(SLO)$/baside2b.obj \
- $(SLO)$/brkdlg.obj \
- $(SLO)$/objdlg.obj \
-
-SRS1NAME=$(TARGET)
-SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src basicprint.src
-
-.INCLUDE : target.mk
-
-$(INCCOM)$/dllname.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
- $(RM) $@
- echo \#define DLL_NAME \"libbasctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
- echo \#define DLL_NAME \"basctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ENDIF
-
-$(SLO)$/basiclib.obj : $(INCCOM)$/dllname.hxx
-
-$(INCCOM)$/basicide.hrc: basidesh.hrc
- @-$(COPY) basidesh.hrc $@
-
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index 554f54f1..eabe113 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -22,7 +22,7 @@
#include "helpid.hrc"
-#include <moduldlg.hrc>
+#include "moduldlg.hrc"
#include <basidesh.hrc>
TabDialog RID_TD_ORGANIZE
{
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index dd0b436..cda7d7f 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -22,7 +22,7 @@
#include "helpid.hrc"
-#include <moptions.hrc>
+#include "moptions.hrc"
ModalDialog RID_MACROOPTIONS
{
HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ;
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index 98e6470..e0da336 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -21,7 +21,7 @@
-#include <objdlg.hrc>
+#include "objdlg.hrc"
#include <helpid.hrc>
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
diff --git a/basctl/source/dlged/makefile.mk b/basctl/source/dlged/makefile.mk
deleted file mode 100644
index 6fba33c..0000000
--- a/basctl/source/dlged/makefile.mk
+++ /dev/null
@@ -1,59 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=basctl
-TARGET=dlged
-AUTOSEG=true
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=$(SLO)$/dlged.obj \
- $(SLO)$/dlgedobj.obj \
- $(SLO)$/dlgedfac.obj \
- $(SLO)$/dlgedlist.obj \
- $(SLO)$/dlgedclip.obj \
- $(SLO)$/propbrw.obj
-
-SLOFILES= $(EXCEPTIONSFILES) \
- $(SLO)$/dlgedfunc.obj \
- $(SLO)$/dlgedmod.obj \
- $(SLO)$/dlgedpage.obj \
- $(SLO)$/dlgedview.obj \
- $(SLO)$/managelang.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= dlgresid.src \
- managelang.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
deleted file mode 100644
index bf71380..0000000
--- a/basctl/util/makefile.mk
+++ /dev/null
@@ -1,108 +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.
-#
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=basctl
-TARGET=basctl
-#svx.hid generieren
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ----------------------------------------------------
-
-# --- Basctl - DLL ----------
-
-.IF "$(header)" == ""
-
-HELPIDFILES= ..$/inc$/helpid.hrc
-
-SHL1TARGET= basctl$(DLLPOSTFIX)
-SHL1IMPLIB= basctl
-SHL1BASE = 0x1d800000
-SHL1STDLIBS= \
- $(EDITENGLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(SFX2LIB) \
- $(FWELIB) \
- $(BASICLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SOTLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(XMLSCRIPTLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= $(SHELLLIB)
-.ENDIF # WNT
-
-
-SHL1LIBS= $(SLB)$/basctl.lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=basctl.map
-
-DEF1NAME =$(SHL1TARGET)
-
-LIB1TARGET =$(SLB)$/basctl.lib
-LIB1FILES = \
- $(LIBPRE) $(SLB)$/basicide.lib \
- $(LIBPRE) $(SLB)$/dlged.lib \
- $(LIBPRE) $(SLB)$/accessibility.lib
-
-SRSFILELIST=\
- $(SRS)$/basicide.srs \
- $(SRS)$/dlged.srs
-
-RESLIB1NAME=basctl
-RESLIB1IMAGES =$(PRJ)$/res
-RESLIB1SRSFILES= $(SRSFILELIST)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF # "$(header)" == ""
-
-
-ALLTAR : $(MISC)/basctl.component
-
-$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- basctl.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt basctl.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a1451fe..10c5684 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -47,7 +47,6 @@ my_components = \
stocservices \
abp \
analysis \
- basctl \
basprov \
bib \
cached1 \
@@ -58,6 +57,7 @@ my_components = \
chartview \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
+ component/basctl/util/basctl \
component/binaryurp/source/binaryurp \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
More information about the Libreoffice-commits
mailing list