[Libreoffice-commits] .: 10 commits - .gitattributes offapi/com offapi/prj udkapi/prj xmlreader/inc xmlreader/Library_xmlreader.mk xmlreader/Makefile xmlreader/Module_xmlreader.mk xmlreader/Package_inc.mk xmlreader/prj xmlreader/source

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:50:34 PDT 2011 

 .gitattributes                                         |    1 
 offapi/com/sun/star/document/XVbaMethodParameter.idl   |   18 ++---
 offapi/com/sun/star/drawing/Shape.idl                  |    6 -
 offapi/com/sun/star/script/XLibraryQueryExecutable.idl |    2 
 offapi/prj/build.lst                                   |    2 
 udkapi/prj/build.lst                                   |    1 
 xmlreader/Library_xmlreader.mk                         |   52 +++++++++++++++
 xmlreader/Makefile                                     |   38 +++++++++++
 xmlreader/Module_xmlreader.mk                          |   35 ++++++++++
 xmlreader/Package_inc.mk                               |   34 ++++++++++
 xmlreader/inc/makefile.mk                              |   40 -----------
 xmlreader/inc/pch/precompiled_xmlreader.cxx            |   28 --------
 xmlreader/inc/pch/precompiled_xmlreader.hxx            |   32 ---------
 xmlreader/prj/build.lst                                |    3 
 xmlreader/prj/d.lst                                    |   10 --
 xmlreader/prj/makefile.mk                              |   40 +++++++++++
 xmlreader/source/makefile.mk                           |   57 -----------------
 xmlreader/source/pad.cxx                               |    2 
 xmlreader/source/span.cxx                              |    2 
 xmlreader/source/xmlreader.cxx                         |    1 
 20 files changed, 215 insertions(+), 189 deletions(-)

New commits:
commit 6187261ae9124974858bb5c2b82516361cb98b39
Merge: f10464a... 753831c...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jul 24 20:47:16 2011 +0200

    Merge branch 'feature/gnumake4'

commit 753831cf9dada6b7cd57effd784ae3dcbfe4e14e
Merge: a0b0b12... 1bc4f34...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jul 24 19:23:00 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit a0b0b120a588509b5c90f7fafbb13ed2a007a2c0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 21:05:27 2011 +0200

    postmerge fixes for gnumake4

diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 6a8001b..22cd4e5 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,2 +1,2 @@
 oa	offapi	:	udkapi DESKTOP:idlc solenv NULL
-oa	offapi/prj									nmake	-	all	oa_mkout NULL
+oa	offapi/prj									nmake	-	all	oa_prj NULL
diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst
index b51f2a2..5b76313 100644
--- a/udkapi/prj/build.lst
+++ b/udkapi/prj/build.lst
@@ -1,3 +1,2 @@
 ua	udkapi	:	DESKTOP:idlc DESKTOP:codemaker NULL
-ua	udkapi									usr1	-	all	ua_mkout NULL
 ua	udkapi\prj	nmake	-	all	ua_prj NULL
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 6d2de94..807af42 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_Library_Library,xmlreader))
 
 $(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,xmlreader,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
 $(eval $(call gb_Library_add_defs,xmlreader,\
 	-DOOO_DLLIMPLEMENTATION_XMLREADER \
 ))
@@ -50,4 +44,9 @@ $(eval $(call gb_Library_add_exception_objects,xmlreader,\
 	xmlreader/source/xmlreader \
 ))
 
+$(eval $(call gb_Library_add_api,xmlreader,\
+    offapi \
+    udkapi \
+))
+
 # vim: set noet sw=4 ts=4:
commit 5b5501f54ec560bf7a5e3ac1b1257b6072a69057
Merge: c523533... a6ba297...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:59:03 2011 +0200

    resyncing to master

diff --cc xmlreader/prj/build.lst
index 7c37df8,ab60846..59b71b8
--- a/xmlreader/prj/build.lst
+++ b/xmlreader/prj/build.lst
@@@ -1,2 -1,3 +1,2 @@@
- xr xmlreader : BOOST:boost cppu offuh sal stlport NULL
+ xr xmlreader : BOOST:boost cppu offapi sal stlport NULL
 -xr xmlreader\inc nmake - all xr_inc NULL
 -xr xmlreader\source nmake - all xr_source xr_inc NULL
 +xr xmlreader\prj nmake - all xr_prj NULL
diff --cc xmlreader/prj/d.lst
index e69de29,f850331..a4c0608
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@@ -1,0 -1,11 +1,1 @@@
+ ..\%__SRC%\lib\libxmlreader.dll.a %_DEST%\lib\libxmlreader.dll.a
 -mkdir: %_DEST%\inc\xmlreader
 -mkdir: %_DEST%\inc\xmlreader\detail
 -..\%__SRC%\bin\xmlreader.dll %_DEST%\bin\xmlreader.dll
 -..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib\ixmlreader.lib
 -..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib\libxmlreader.dylib
 -..\%__SRC%\lib\libxmlreader.so %_DEST%\lib\libxmlreader.so
 -..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc\xmlreader\detail\xmlreaderdllapi.hxx
 -..\inc\xmlreader\pad.hxx %_DEST%\inc\xmlreader\pad.hxx
 -..\inc\xmlreader\span.hxx %_DEST%\inc\xmlreader\span.hxx
 -..\inc\xmlreader\xmlreader.hxx %_DEST%\inc\xmlreader\xmlreader.hxx
commit c5235330a83081e6b744d93996f37b3abd6ac30a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jun 20 13:24:15 2011 +0200

    gnumake4: fix buildbreakers from merge

diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 96ac403..6d2de94 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,xmlreader,\
 
 $(eval $(call gb_Library_add_linked_libs,xmlreader,\
 	sal \
-	stl \
     $(gb_STDLIBS) \
 ))
 
commit fd0649408ac52ec0c6a443c5716d50c9243bca7e
Merge: ea3da31... 1247c8b...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jun 19 11:57:43 2011 +0200

    Merge branch 'master' into feature/gnumake4
    
    Conflicts:
    	xmlreader/prj/d.lst

diff --cc offapi/com/sun/star/document/XVbaMethodParameter.idl
index 0000000,6240b37..64fca05
mode 000000,100644..100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@@ -1,0 -1,63 +1,63 @@@
+ /*************************************************************************
+  *
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  * 
+  * Copyright IBM Corporation 2009
+  * Copyright 2009 by Sun Microsystems, Inc.
+  *
+  * 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.
+  *
+  ************************************************************************/
+ 
+ #ifndef __org_openoffice_vba_XVbaMethodParameter_idl__
+ #define __org_openoffice_vba_XVbaMethodParameter_idl__
+ 
+ #include <com/sun/star/uno/XInterface.idl>
+ 
+ //============================================================================= 
+ 
+ module com {  module sun {  module star {  module document {
+ 
+ //============================================================================= 
+ //gives access to VBA method input/output parameters
+ //
+ //some OO objects need to implement this interface to support the passing of input/output parameters
+ //for certain VBA events
+ 
+ interface XVbaMethodParameter : com::sun::star::uno::XInterface
+ {
 -	//------------------------------------------------------------------------- 
 -	 
 -	/** sets the value of the parameter with the specified name.
 -	 */
 -	void setVbaMethodParameter( [in] string PropertyName, 
 -			 [in] any Value ); 
++    //------------------------------------------------------------------------- 
++     
++    /** sets the value of the parameter with the specified name.
++     */
++    void setVbaMethodParameter( [in] string PropertyName, 
++             [in] any Value ); 
+  
 -	//------------------------------------------------------------------------- 
++    //------------------------------------------------------------------------- 
+ 
 -	/** returns the value of the parameter with the specified name.
++    /** returns the value of the parameter with the specified name.
+      */
 -	any getVbaMethodParameter( [in] string PropertyName ); 
++    any getVbaMethodParameter( [in] string PropertyName ); 
+ };
+ 
+ //============================================================================= 
+ 
+ }; }; }; };
+ #endif
diff --cc offapi/com/sun/star/drawing/Shape.idl
index 360352a,c54305b..b194811
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@@ -200,6 -177,10 +177,10 @@@ published service Shap
          the z-order.
      */
      [optional, property] long NavigationOrder;
+ 
 -	/** this property lets you get and set a hyperlink for this shape.
 -	 */
 -	[optional, property] string Hyperlink;
++    /** this property lets you get and set a hyperlink for this shape.
++     */
++    [optional, property] string Hyperlink;
  };
  
  //=============================================================================
diff --cc offapi/com/sun/star/script/XLibraryQueryExecutable.idl
index 0000000,276001c..e7c1b02
mode 000000,100644..100644
--- a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
+++ b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
@@@ -1,0 -1,46 +1,46 @@@
+ /*************************************************************************
+  *
+  * 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
+  *
+  * 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 __com_sun_star_script_XLibraryQueryExecutable_idl__ 
+ #define __com_sun_star_script_XLibraryQueryExecutable_idl__ 
+  
+ #include <com/sun/star/uno/XInterface.idl> 
+  
+ //============================================================================= 
+  
+ module com {  module sun {  module star {  module script {  
+  
+ interface XLibraryQueryExecutable: com::sun::star::uno::XInterface
+ { 
 -	boolean HasExecutableCode( [in] string name );
++    boolean HasExecutableCode( [in] string name );
+ };
+ 
+ //============================================================================= 
+  
+  
+ }; }; }; };  
+  
+ #endif 
diff --cc xmlreader/prj/d.lst
index e69de29,37abb60..e69de29
mode 100755,100644..100644
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
commit ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 18 14:12:17 2011 +0200

    fixing rebase errors

diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
commit 247bf82a4fc458bbe43a803fb2c8a0561d67af2e
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:41 2011 +0000

    gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]

diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index f7ad243..96ac403 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,xmlreader,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,xmlreader,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,xmlreader,\
 	-DOOO_DLLIMPLEMENTATION_XMLREADER \
 ))
 
commit dc6d93349f751a1e3805be2fd9c9e6289fffdbbf
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Mar 14 15:09:15 2011 +0100

    gnumake4: xmlreader: fix build.lst [hg:ab8134c0d177]

diff --git a/xmlreader/prj/build.lst b/xmlreader/prj/build.lst
index 5408a52..7c37df8 100644
--- a/xmlreader/prj/build.lst
+++ b/xmlreader/prj/build.lst
@@ -1,3 +1,2 @@
 xr xmlreader : BOOST:boost cppu offuh sal stlport NULL
-xr xmlreader\inc nmake - all xr_inc NULL
-xr xmlreader\source nmake - all xr_source xr_inc NULL
+xr xmlreader\prj nmake - all xr_prj NULL
commit 9fee4241abc62a2a5924698ecaf4fa77e90a57b5
Author: Mathias Bauer <mba at openoffice.org>
Date:   Wed Mar 2 18:41:59 2011 +0100

    CWS gnumake4: convert xmlreader to new build system [hg:751b4a1bff7b]

diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
new file mode 100644
index 0000000..f7ad243
--- /dev/null
+++ b/xmlreader/Library_xmlreader.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# 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,xmlreader))
+
+$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
+
+# add any additional include paths for this library here
+$(eval $(call gb_Library_set_include,xmlreader,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,xmlreader,\
+	$$(DEFS) \
+	-DOOO_DLLIMPLEMENTATION_XMLREADER \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xmlreader,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xmlreader,\
+	xmlreader/source/pad \
+	xmlreader/source/span \
+	xmlreader/source/xmlreader \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Makefile b/xmlreader/Makefile
new file mode 100644
index 0000000..90947b2
--- /dev/null
+++ b/xmlreader/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/xmlreader/Module_xmlreader.mk b/xmlreader/Module_xmlreader.mk
new file mode 100644
index 0000000..096001e
--- /dev/null
+++ b/xmlreader/Module_xmlreader.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# 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,xmlreader))
+
+$(eval $(call gb_Module_add_targets,xmlreader,\
+	Library_xmlreader \
+	Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Package_inc.mk b/xmlreader/Package_inc.mk
new file mode 100644
index 0000000..54a4a69
--- /dev/null
+++ b/xmlreader/Package_inc.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,xmlreader_inc,$(SRCDIR)/xmlreader/inc))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/pad.hxx,xmlreader/pad.hxx))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/span.hxx,xmlreader/span.hxx))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/xmlreader.hxx,xmlreader/xmlreader.hxx))
+$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/detail/xmlreaderdllapi.hxx,xmlreader/detail/xmlreaderdllapi.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/inc/makefile.mk b/xmlreader/inc/makefile.mk
deleted file mode 100644
index 9f84434..0000000
--- a/xmlreader/inc/makefile.mk
+++ /dev/null
@@ -1,40 +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 = xmlreader
-TARGET = inc
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
-.ENDIF
diff --git a/xmlreader/inc/pch/precompiled_xmlreader.cxx b/xmlreader/inc/pch/precompiled_xmlreader.cxx
deleted file mode 100644
index e5d5848..0000000
--- a/xmlreader/inc/pch/precompiled_xmlreader.cxx
+++ /dev/null
@@ -1,28 +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.
-*
-************************************************************************/
-
-#include "precompiled_xmlreader.hxx"
diff --git a/xmlreader/inc/pch/precompiled_xmlreader.hxx b/xmlreader/inc/pch/precompiled_xmlreader.hxx
deleted file mode 100644
index 7561fe8..0000000
--- a/xmlreader/inc/pch/precompiled_xmlreader.hxx
+++ /dev/null
@@ -1,32 +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 PRECOMPILED_HEADERS
-
-#include "sal/config.h"
-
-#endif
diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index fcb99bd..e69de29 100755
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@ -1,10 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlreader
-mkdir: %_DEST%\inc%_EXT%\xmlreader\detail
-..\%__SRC%\bin\xmlreader.dll %_DEST%\bin%_EXT%\xmlreader.dll
-..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib
-..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib%_EXT%\libxmlreader.dylib
-..\%__SRC%\lib\libxmlreader.so %_DEST%\lib%_EXT%\libxmlreader.so
-..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc%_EXT%\xmlreader\detail\xmlreaderdllapi.hxx
-..\inc\xmlreader\pad.hxx %_DEST%\inc%_EXT%\xmlreader\pad.hxx
-..\inc\xmlreader\span.hxx %_DEST%\inc%_EXT%\xmlreader\span.hxx
-..\inc\xmlreader\xmlreader.hxx %_DEST%\inc%_EXT%\xmlreader\xmlreader.hxx
diff --git a/xmlreader/prj/makefile.mk b/xmlreader/prj/makefile.mk
new file mode 100644
index 0000000..88cd9df
--- /dev/null
+++ b/xmlreader/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/xmlreader/source/makefile.mk b/xmlreader/source/makefile.mk
deleted file mode 100644
index cb71e21..0000000
--- a/xmlreader/source/makefile.mk
+++ /dev/null
@@ -1,53 +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 = xmlreader
-TARGET = xmlreader
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DOOO_DLLIMPLEMENTATION_XMLREADER
-
-SLOFILES = \
-    $(SLO)/pad.obj \
-    $(SLO)/span.obj \
-    $(SLO)/xmlreader.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = URELIB
-SHL1STDLIBS = \
-    $(SALLIB)
-SHL1TARGET = xmlreader
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
diff --git a/xmlreader/source/pad.cxx b/xmlreader/source/pad.cxx
index b1673c4..8932ee3 100644
--- a/xmlreader/source/pad.cxx
+++ b/xmlreader/source/pad.cxx
@@ -25,9 +25,7 @@
 *
 ************************************************************************/
 
-#include "precompiled_xmlreader.hxx"
 #include "sal/config.h"
-
 #include "osl/diagnose.h"
 #include "rtl/string.h"
 #include "sal/types.h"
diff --git a/xmlreader/source/span.cxx b/xmlreader/source/span.cxx
index 3b93655..5adfa05 100644
--- a/xmlreader/source/span.cxx
+++ b/xmlreader/source/span.cxx
@@ -25,9 +25,7 @@
 *
 ************************************************************************/
 
-#include "precompiled_xmlreader.hxx"
 #include "sal/config.h"
-
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "osl/diagnose.h"
diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 27350a8..234eb71 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -25,7 +25,6 @@
 *
 ************************************************************************/
 
-#include "precompiled_xmlreader.hxx"
 #include "sal/config.h"
 
 #include <climits>

More information about the Libreoffice-commits mailing list