Merge branch 'feature/gnumake4'

18 files changed, 160 insertions, 134 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 000000000..f18402b73
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
diff --git a/offapi/com/sun/star/document/XVbaMethodParameter.idl b/offapi/com/sun/star/document/XVbaMethodParameter.idl
index 6240b37ba..64fca058b 100644
--- a/offapi/com/sun/star/document/XVbaMethodParameter.idl
+++ b/offapi/com/sun/star/document/XVbaMethodParameter.idl
@@ -43,18 +43,18 @@ module com {  module sun {  module star {  module document {
 
 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 ); 
 };
 
 //============================================================================= 
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index c54305b78..b194811a2 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -178,9 +178,9 @@ published service Shape
     */
     [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 --git a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
index 276001cf8..e7c1b0264 100644
--- a/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
+++ b/offapi/com/sun/star/script/XLibraryQueryExecutable.idl
@@ -35,7 +35,7 @@ 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 );
 };
 
 //============================================================================= 
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 6a8001b43..22cd4e591 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 b51f2a247..5b763130c 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
new file mode 100644
index 000000000..807af424e
--- /dev/null
+++ b/xmlreader/Library_xmlreader.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# 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))
+
+$(eval $(call gb_Library_add_defs,xmlreader,\
+	-DOOO_DLLIMPLEMENTATION_XMLREADER \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xmlreader,\
+	sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xmlreader,\
+	xmlreader/source/pad \
+	xmlreader/source/span \
+	xmlreader/source/xmlreader \
+))
+
+$(eval $(call gb_Library_add_api,xmlreader,\
+    offapi \
+    udkapi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/source/makefile.mk b/xmlreader/Makefile
index 1f5f98eae..90947b2e5 100644
--- a/xmlreader/source/makefile.mk
+++ b/xmlreader/Makefile
@@ -1,8 +1,8 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -23,35 +23,16 @@
 # <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
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-SLOFILES = \
-    $(SLO)/pad.obj \
-    $(SLO)/span.obj \
-    $(SLO)/xmlreader.obj
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB = i$(SHL1TARGET)
-.ELSE
-SHL1IMPLIB= $(SHL1TARGET)
-.ENDIF
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = URELIB
-SHL1STDLIBS = \
-    $(SALLIB)
-SHL1TARGET = xmlreader
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE: target.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 000000000..096001e8f
--- /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 000000000..54a4a6947
--- /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/pch/precompiled_xmlreader.cxx b/xmlreader/inc/pch/precompiled_xmlreader.cxx
deleted file mode 100644
index e5d584855..000000000
--- 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 7561fe89f..000000000
--- 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/build.lst b/xmlreader/prj/build.lst
index ab6084653..59b71b87d 100644
--- a/xmlreader/prj/build.lst
+++ b/xmlreader/prj/build.lst
@@ -1,3 +1,2 @@
 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 --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index f850331df..a4c06081d 100644
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@ -1,11 +1 @@
-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.dll.a %_DEST%\lib\libxmlreader.dll.a
-..\%__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
diff --git a/xmlreader/inc/makefile.mk b/xmlreader/prj/makefile.mk
index 9f8443470..88cd9dfe0 100644
--- a/xmlreader/inc/makefile.mk
+++ b/xmlreader/prj/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -23,18 +23,18 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = xmlreader
-TARGET = inc
+#*************************************************************************
 
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
+PRJ=..
+TARGET=prj
 
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)" != ""
-ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
+.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/pad.cxx b/xmlreader/source/pad.cxx
index b1673c4a4..8932ee382 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 3b936553b..5adfa0597 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 27350a8f0..234eb71cb 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>