[Libreoffice-commits] .: Branch 'feature/gnumake4' - 5 commits - idl/Executable_svidl.mk idl/inc sfx2/qa xmlscript/inc xmlscript/Library_xcr.mk xmlscript/Makefile xmlscript/Module_xmlscript.mk xmlscript/Package_dtd.mk xmlscript/Package_inc.mk xmlscript/prj xmlscript/source xmlscript/util
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jun 16 17:07:57 PDT 2011
idl/Executable_svidl.mk | 3
idl/inc/makefile.mk | 47 -------------
sfx2/qa/complex/sfx2/makefile.mk | 84 ------------------------
xmlscript/Library_xcr.mk | 72 ++++++++++++++++++++
xmlscript/Makefile | 38 ++++++++++
xmlscript/Module_xmlscript.mk | 36 ++++++++++
xmlscript/Package_dtd.mk | 34 +++++++++
xmlscript/Package_inc.mk | 37 ++++++++++
xmlscript/inc/makefile.mk | 47 -------------
xmlscript/inc/xmlscript/xcrdllapi.h | 43 ++++++++++++
xmlscript/inc/xmlscript/xml_helper.hxx | 7 +-
xmlscript/inc/xmlscript/xml_import.hxx | 66 ------------------
xmlscript/inc/xmlscript/xmldlg_imexp.hxx | 10 +-
xmlscript/inc/xmlscript/xmllib_imexp.hxx | 14 ++--
xmlscript/inc/xmlscript/xmlmod_imexp.hxx | 8 +-
xmlscript/prj/build.lst | 11 ---
xmlscript/prj/d.lst | 14 ----
xmlscript/prj/makefile.mk | 40 +++++++++++
xmlscript/source/inc/xml_import.hxx | 65 ++++++++++++++++++
xmlscript/source/misc/makefile.mk | 48 -------------
xmlscript/source/misc/unoservices.cxx | 4 -
xmlscript/source/xml_helper/makefile.mk | 50 --------------
xmlscript/source/xml_helper/xml_impctx.cxx | 2
xmlscript/source/xmldlg_imexp/makefile.mk | 52 --------------
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2
xmlscript/source/xmlflat_imexp/makefile.mk | 50 --------------
xmlscript/source/xmllib_imexp/makefile.mk | 50 --------------
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 2
xmlscript/source/xmlmod_imexp/makefile.mk | 49 --------------
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 2
xmlscript/util/makefile.mk | 84 ------------------------
xmlscript/util/target.pmk | 35 ----------
xmlscript/util/xcr.flt | 13 ---
33 files changed, 395 insertions(+), 724 deletions(-)
New commits:
commit 7891ba81ac2150dcc55791925ec14a9f1f8acb32
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Mar 24 17:55:44 2011 +0000
gnumake4: sfx2: remove obsolete dmakefile [hg:4650ee5afca0]
diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk
deleted file mode 100644
index 20b170f..0000000
--- a/sfx2/qa/complex/sfx2/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_JUNIT_JAR)" == ""
-nothing .PHONY:
- @echo -----------------------------------------------------
- @echo - JUnit not available, not building anything
- @echo -----------------------------------------------------
-.ELSE # IF "$(OOO_JUNIT_JAR)" != ""
-
-PRJ = ../../..
-PRJNAME = sfx2
-TARGET = qa_complex
-PACKAGE = complex/sfx2
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = OOoRunnerLight.jar ridl.jar test.jar test-tools.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-JAVAFILES = $(shell @$(FIND) . -name "*.java") \
-
-#----- create a jar from compiled files ----------------------------
-
-JARTARGET = $(TARGET).jar
-
-#----- JUnit tests class -------------------------------------------
-
-JAVATESTFILES = \
- DocumentInfo.java \
- DocumentProperties.java \
- StandaloneDocumentInfo.java \
- DocumentMetadataAccess.java \
- UndoManager.java \
-
-# disabled: #i115674#
-# GlobalEventBroadcaster.java \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE: target.mk
-
-ALL : ALLTAR
-
-# --- subsequent tests ---------------------------------------------
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
-
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
- # Sample how to debug
- # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END # "$(OOO_SUBSEQUENT_TESTS)" == ""
-
-.END # ELSE "$(OOO_JUNIT_JAR)" != ""
commit b14511b876e1f2b91a9ff6e86df01873b6ddae21
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Mar 14 18:03:45 2011 +0100
gnumake4: idl: remove dmakefile [hg:75af818ad801]
diff --git a/idl/inc/makefile.mk b/idl/inc/makefile.mk
deleted file mode 100644
index 66b944a..0000000
--- a/idl/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=idl
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
commit db3581913cdd63617a2898dfcf6ed43fceaf43a8
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Mar 14 15:09:15 2011 +0100
gnumake4: idl: link stl [hg:8682dc501634]
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index 961f9c1..6f4b830 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -41,8 +41,9 @@ $(eval $(call gb_Executable_set_cxxflags,svidl,\
))
$(eval $(call gb_Executable_add_linked_libs,svidl,\
- sal \
tl \
+ sal \
+ stl \
$(gb_STDLIBS) \
))
commit 31e114ad2ca66b8bce792c9701976cd5c1d67255
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 2 14:38:51 2011 +0100
CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e]
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index 6933013..06bd76d 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,xcr,\
sal \
cppu \
cppuhelper \
+ stl \
$(gb_STDLIBS) \
))
commit c84f8f3aa61e32f3f4f344b95f0a7ea1d51188ad
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Mar 2 11:54:18 2011 +0100
CWS gnumake4: convert xmlscript to new build system [hg:d4df54d61f2a]
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
new file mode 100644
index 0000000..6933013
--- /dev/null
+++ b/xmlscript/Library_xcr.mk
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,xcr))
+
+$(eval $(call gb_Library_add_package_headers,xcr,xmlscript_inc))
+
+$(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr))
+
+$(eval $(call gb_Library_set_include,xcr,\
+ -I$(SRCDIR)/xmlscript/source/inc \
+ -I$(SRCDIR)/xmlscript/inc/pch \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,xcr,\
+ $$(DEFS) \
+ -DXCR_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xcr,\
+ sal \
+ cppu \
+ cppuhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xcr,\
+ xmlscript/source/xmldlg_imexp/xmldlg_impmodels \
+ xmlscript/source/xmldlg_imexp/xmldlg_import \
+ xmlscript/source/xmldlg_imexp/xmldlg_addfunc \
+ xmlscript/source/xmldlg_imexp/xmldlg_export \
+ xmlscript/source/xmldlg_imexp/xmldlg_expmodels \
+ xmlscript/source/misc/unoservices \
+ xmlscript/source/xml_helper/xml_byteseq \
+ xmlscript/source/xml_helper/xml_impctx \
+ xmlscript/source/xml_helper/xml_element \
+ xmlscript/source/xmlflat_imexp/xmlbas_import \
+ xmlscript/source/xmlflat_imexp/xmlbas_export \
+ xmlscript/source/xmllib_imexp/xmllib_import \
+ xmlscript/source/xmllib_imexp/xmllib_export \
+ xmlscript/source/xmlmod_imexp/xmlmod_import \
+ xmlscript/source/xmlmod_imexp/xmlmod_export \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Makefile b/xmlscript/Makefile
new file mode 100644
index 0000000..90947b2
--- /dev/null
+++ b/xmlscript/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 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/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
new file mode 100644
index 0000000..30fa314
--- /dev/null
+++ b/xmlscript/Module_xmlscript.mk
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,xmlscript))
+
+$(eval $(call gb_Module_add_targets,xmlscript,\
+ Library_xcr \
+ Package_inc \
+ Package_dtd \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
new file mode 100644
index 0000000..cab5ddd
--- /dev/null
+++ b/xmlscript/Package_dtd.mk
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/dtd))
+$(eval $(call gb_Package_add_file,xmlscript_inc,bin/dialog.dtd,dialog.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_inc,bin/libraries.dtd,libraries.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_inc,bin/library.dtd,library.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_inc,bin/module.dtd,module.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
new file mode 100644
index 0000000..649dde7
--- /dev/null
+++ b/xmlscript/Package_inc.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript/inc))
+
+$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,xmlscript/xmldlg_imexp.hxx))
+$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,xmlscript/xml_helper.hxx))
+$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,xmlscript/xmllib_imexp.hxx))
+$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,xmlscript/xmlmod_imexp.hxx))
+$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,xmlscript/xmlns.h))
+$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xcrdllapi.h,xmlscript/xcrdllapi.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/inc/makefile.mk b/xmlscript/inc/makefile.mk
deleted file mode 100644
index 4141e88..0000000
--- a/xmlscript/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=xmlscript
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/xmlscript/inc/xmlscript/xcrdllapi.h b/xmlscript/inc/xmlscript/xcrdllapi.h
new file mode 100644
index 0000000..a0994d5
--- /dev/null
+++ b/xmlscript/inc/xmlscript/xcrdllapi.h
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XCRdllapi.h,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_XCRDLLAPI_H
+#define INCLUDED_XCRDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(XCR_DLLIMPLEMENTATION)
+#define XCR_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define XCR_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define XCR_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index 2a4e48b..a7a985d 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
@@ -34,6 +34,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -45,7 +46,7 @@ namespace xmlscript
##################################################################################################*/
//==================================================================================================
-class XMLElement
+class XCR_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList >
{
public:
@@ -130,13 +131,13 @@ protected:
##################################################################################################*/
//==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
SAL_CALL createInputStream(
::rtl::ByteSequence const & rInData )
SAL_THROW( () );
//==================================================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
SAL_CALL createOutputStream(
::rtl::ByteSequence * pOutData )
SAL_THROW( () );
diff --git a/xmlscript/inc/xmlscript/xml_import.hxx b/xmlscript/inc/xmlscript/xml_import.hxx
deleted file mode 100644
index 59107cc..0000000
--- a/xmlscript/inc/xmlscript/xml_import.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#if ! defined _XMLSCRIPT_XML_IMPORT_HXX_
-#define _XMLSCRIPT_XML_IMPORT_HXX_
-
-#include "com/sun/star/xml/input/XRoot.hpp"
-#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"
-
-
-namespace xmlscript
-{
-
-/*##############################################################################
-
- IMPORTING
-
-##############################################################################*/
-
-/** Creates a document handler to be used for SAX1 parser that can handle
- namespaces. Namespace URI are mapped to integer ids for performance.
- Implementing the XImporter interface, you will get a startRootElement()
- for the root element of your XML document and subsequent
- startChildElement() callbacks for each sub element.
- Namespaces of tags are identified by their integer value.
-
- @param xRoot
- initial object being called for root context
- @param bSingleThreadedUse
- flag whether context management is synchronized.
- @return
- document handler for parser
-*/
-::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
-SAL_CALL createDocumentHandler(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::input::XRoot > const & xRoot,
- bool bSingleThreadedUse = true )
- SAL_THROW( () );
-
-}
-
-#endif
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 2fe6f35..58560e1 100644
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -41,13 +41,13 @@
#endif
#include "xmlscript/xmlns.h"
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
//==============================================================================
-void SAL_CALL exportDialogModel(
+XCR_DLLPUBLIC void SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
::com::sun::star::uno::Reference<
@@ -55,7 +55,7 @@ void SAL_CALL exportDialogModel(
SAL_THROW( (::com::sun::star::uno::Exception) );
//==============================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel,
@@ -66,7 +66,7 @@ SAL_CALL importDialogModel(
// additional functions for convenience
//==============================================================================
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >
SAL_CALL exportDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::container::XNameContainer > const & xDialogModel,
@@ -75,7 +75,7 @@ SAL_CALL exportDialogModel(
SAL_THROW( (::com::sun::star::uno::Exception) );
//==============================================================================
-void SAL_CALL importDialogModel(
+XCR_DLLPUBLIC void SAL_CALL importDialogModel(
::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > xInput,
::com::sun::star::uno::Reference<
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index 463e986..da4de2e 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "xmlscript/xmlns.h"
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -41,7 +41,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML
// functionality from xmlscript
-struct LibDescriptor
+struct XCR_DLLPUBLIC LibDescriptor
{
::rtl::OUString aName;
::rtl::OUString aStorageURL;
@@ -52,7 +52,7 @@ struct LibDescriptor
sal_Bool bPreload;
};
-struct LibDescriptorArray
+struct XCR_DLLPUBLIC LibDescriptorArray
{
LibDescriptor* mpLibs;
sal_Int32 mnLibCount;
@@ -64,27 +64,27 @@ struct LibDescriptorArray
};
-void
+XCR_DLLPUBLIC void
SAL_CALL exportLibraryContainer(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) );
-::com::sun::star::uno::Reference<
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
SAL_THROW( (::com::sun::star::uno::Exception) );
-void
+XCR_DLLPUBLIC void
SAL_CALL exportLibrary(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) );
-::com::sun::star::uno::Reference<
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importLibrary( LibDescriptor& rLib )
SAL_THROW( (::com::sun::star::uno::Exception) );
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index 5bea5cb..fc4fe79 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <xmlscript/xmlns.h>
-
+#include "xmlscript/xcrdllapi.h"
namespace xmlscript
{
@@ -40,7 +40,7 @@ namespace xmlscript
// HACK C++ struct to transport info. Later the container
// itself should do the export/import and use exportet XML
// functionality from xmlscript
-struct ModuleDescriptor
+struct XCR_DLLPUBLIC ModuleDescriptor
{
::rtl::OUString aName;
::rtl::OUString aLanguage;
@@ -48,14 +48,14 @@ struct ModuleDescriptor
::rtl::OUString aModuleType; // VBA
};
-void
+XCR_DLLPUBLIC void
SAL_CALL exportScriptModule(
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
const ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) );
-::com::sun::star::uno::Reference<
+XCR_DLLPUBLIC ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >
SAL_CALL importScriptModule( ModuleDescriptor& rMod )
SAL_THROW( (::com::sun::star::uno::Exception) );
diff --git a/xmlscript/prj/build.lst b/xmlscript/prj/build.lst
index 388a59f..ea87780 100644
--- a/xmlscript/prj/build.lst
+++ b/xmlscript/prj/build.lst
@@ -1,10 +1,3 @@
xt xmlscript : comphelper tools offapi LIBXSLT:libxslt NULL
-xt xmlscript usr1 - all xt_mkout NULL
-xt xmlscript\inc nmake - all xt_inc NULL
-xt xmlscript\source\xml_helper nmake - all xt_xml_helper xt_inc NULL
-xt xmlscript\source\xmldlg_imexp nmake - all xt_xmldlg_imexp xt_inc NULL
-xt xmlscript\source\xmllib_imexp nmake - all xt_xmllib_imexp xt_inc NULL
-xt xmlscript\source\xmlmod_imexp nmake - all xt_xmlmod_imexp xt_inc NULL
-xt xmlscript\source\xmlflat_imexp nmake - all xt_xmlflat_imexp xt_inc NULL
-xt xmlscript\source\misc nmake - all xt_misc xt_inc NULL
-xt xmlscript\util nmake - all xt_util xt_xml_helper xt_xmldlg_imexp xt_xmllib_imexp xt_xmlmod_imexp xt_xmlflat_imexp xt_misc NULL
+xt xmlscript\prj nmake - all xt_prj NULL
+
diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst
index 2f1ff7e..e69de29 100644
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@ -1,14 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlscript
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx
-..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmldlg_imexp.hxx
-..\inc\xmlscript\xmllib_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmllib_imexp.hxx
-..\inc\xmlscript\xmlmod_imexp.hxx %_DEST%\inc%_EXT%\xmlscript\xmlmod_imexp.hxx
-..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h
-
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd
-..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component
diff --git a/xmlscript/prj/makefile.mk b/xmlscript/prj/makefile.mk
new file mode 100644
index 0000000..88cd9df
--- /dev/null
+++ b/xmlscript/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx
new file mode 100644
index 0000000..f0e7387
--- /dev/null
+++ b/xmlscript/source/inc/xml_import.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#if ! defined _XMLSCRIPT_XML_IMPORT_HXX_
+#define _XMLSCRIPT_XML_IMPORT_HXX_
+
+#include "com/sun/star/xml/input/XRoot.hpp"
+#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"
+
+namespace xmlscript
+{
+
+/*##############################################################################
+
+ IMPORTING
+
+##############################################################################*/
+
+/** Creates a document handler to be used for SAX1 parser that can handle
+ namespaces. Namespace URI are mapped to integer ids for performance.
+ Implementing the XImporter interface, you will get a startRootElement()
+ for the root element of your XML document and subsequent
+ startChildElement() callbacks for each sub element.
+ Namespaces of tags are identified by their integer value.
+
+ @param xRoot
+ initial object being called for root context
+ @param bSingleThreadedUse
+ flag whether context management is synchronized.
+ @return
+ document handler for parser
+*/
+::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
+SAL_CALL createDocumentHandler(
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::xml::input::XRoot > const & xRoot,
+ bool bSingleThreadedUse = true )
+ SAL_THROW( () );
+
+}
+
+#endif
diff --git a/xmlscript/source/misc/makefile.mk b/xmlscript/source/misc/makefile.mk
deleted file mode 100644
index dfac81b..0000000
--- a/xmlscript/source/misc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmlscript
-TARGET=misc
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/unoservices.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.ENDIF # L10N_framework
-.INCLUDE : target.mk
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 155fcc2..72febfd 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -107,7 +107,7 @@ namespace xmlscript
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment(
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -115,7 +115,7 @@ extern "C"
// -----------------------------------------------------------------------------
- void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/xmlscript/source/xml_helper/makefile.mk b/xmlscript/source/xml_helper/makefile.mk
deleted file mode 100644
index 7b48695..0000000
--- a/xmlscript/source/xml_helper/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=xmlscript
-TARGET=xml_helper
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/xml_impctx.obj \
- $(SLO)$/xml_element.obj \
- $(SLO)$/xml_byteseq.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index b381852..6224778 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -35,7 +35,7 @@
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase3.hxx"
-#include "xmlscript/xml_import.hxx"
+#include "xml_import.hxx"
#include "com/sun/star/xml/input/XAttributes.hpp"
#include "com/sun/star/lang/XInitialization.hpp"
diff --git a/xmlscript/source/xmldlg_imexp/makefile.mk b/xmlscript/source/xmldlg_imexp/makefile.mk
deleted file mode 100644
index e0583aa..0000000
--- a/xmlscript/source/xmldlg_imexp/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=xmlscript
-TARGET=xmldlg_imexp
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/xmldlg_import.obj \
- $(SLO)$/xmldlg_impmodels.obj \
- $(SLO)$/xmldlg_export.obj \
- $(SLO)$/xmldlg_expmodels.obj \
- $(SLO)$/xmldlg_addfunc.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index f3c0e55..5f702c4 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -35,7 +35,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/awt/CharSet.hpp>
diff --git a/xmlscript/source/xmlflat_imexp/makefile.mk b/xmlscript/source/xmlflat_imexp/makefile.mk
deleted file mode 100644
index ed4d434..0000000
--- a/xmlscript/source/xmlflat_imexp/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmlscript
-TARGET=xmlflat_imexp
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/xmlbas_export.obj \
- $(SLO)$/xmlbas_import.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
diff --git a/xmlscript/source/xmllib_imexp/makefile.mk b/xmlscript/source/xmllib_imexp/makefile.mk
deleted file mode 100644
index c6ef65a..0000000
--- a/xmlscript/source/xmllib_imexp/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=xmlscript
-TARGET=xmllib_imexp
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/xmllib_import.obj \
- $(SLO)$/xmllib_export.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 3c18da1..4c45938 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -33,7 +33,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/xmlscript/source/xmlmod_imexp/makefile.mk b/xmlscript/source/xmlmod_imexp/makefile.mk
deleted file mode 100644
index 174bf94..0000000
--- a/xmlscript/source/xmlmod_imexp/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=xmlscript
-TARGET=xmlmod_imexp
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-#-----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/xmlmod_import.obj \
- $(SLO)$/xmlmod_export.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-.ENDIF # L10N_framework
-.INCLUDE : target.mk
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 6cb14ec..4811ec0 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -33,7 +33,7 @@
#include <rtl/ustrbuf.hxx>
-#include <xmlscript/xml_import.hxx>
+#include <xml_import.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
deleted file mode 100644
index ba73147..0000000
--- a/xmlscript/util/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=xmlscript
-TARGET=xcr
-NO_BSYMBOLIC=TRUE
-#USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-#-------------------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1FILES= \
- $(SLB)$/xml_helper.lib \
- $(SLB)$/xmldlg_imexp.lib \
- $(SLB)$/xmllib_imexp.lib \
- $(SLB)$/xmlmod_imexp.lib \
- $(SLB)$/xmlflat_imexp.lib \
- $(SLB)$/misc.lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1LIBS= \
- $(LIB1TARGET)
-
-SHL1STDLIBS= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEFLIB1NAME= $(TARGET)
-DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt
- @echo ------------------------------
- @echo Making: $@
- $(TYPE) xcr.flt > $@
-
-ALLTAR : $(MISC)/xcr.component
-
-$(MISC)/xcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- xcr.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt xcr.component
diff --git a/xmlscript/util/target.pmk b/xmlscript/util/target.pmk
deleted file mode 100644
index 907ec41..0000000
--- a/xmlscript/util/target.pmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-.IF "$(debug)" != ""
-
-# msvc++: no inlining
-.IF "$(COM)" == "MSC"
-CFLAGS += /Ob0
-.ENDIF
-
-.ENDIF
-
diff --git a/xmlscript/util/xcr.flt b/xmlscript/util/xcr.flt
deleted file mode 100644
index e9a7f03..0000000
--- a/xmlscript/util/xcr.flt
+++ /dev/null
@@ -1,13 +0,0 @@
-??_7
-??_8
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-0Imp
-Impl@@
-Imp@@
-__CT
-_STL
More information about the Libreoffice-commits
mailing list