You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/08 18:02:15 UTC
svn commit: r1734110 - in /openoffice/branches/gbuild-reintegration: ./
main/ main/xmlreader/ main/xmlreader/prj/ main/xmlreader/source/
Author: damjan
Date: Tue Mar 8 17:02:15 2016
New Revision: 1734110
URL: http://svn.apache.org/viewvc?rev=1734110&view=rev
Log:
Merge r1409523 and r1409529 from branches/gbuild:
CWS gnumake4: convert xmlreader to new build system
gnumake4: xmlreader: fix build.lst
Added:
openoffice/branches/gbuild-reintegration/main/xmlreader/Library_xmlreader.mk
- copied unchanged from r1409523, incubator/ooo/branches/gbuild/main/xmlreader/Library_xmlreader.mk
openoffice/branches/gbuild-reintegration/main/xmlreader/Makefile
- copied unchanged from r1409523, incubator/ooo/branches/gbuild/main/xmlreader/Makefile
openoffice/branches/gbuild-reintegration/main/xmlreader/Module_xmlreader.mk
- copied unchanged from r1409523, incubator/ooo/branches/gbuild/main/xmlreader/Module_xmlreader.mk
openoffice/branches/gbuild-reintegration/main/xmlreader/Package_inc.mk
- copied unchanged from r1409523, incubator/ooo/branches/gbuild/main/xmlreader/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/xmlreader/prj/makefile.mk
- copied unchanged from r1409523, incubator/ooo/branches/gbuild/main/xmlreader/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst
openoffice/branches/gbuild-reintegration/main/xmlreader/prj/d.lst
openoffice/branches/gbuild-reintegration/main/xmlreader/source/pad.cxx
openoffice/branches/gbuild-reintegration/main/xmlreader/source/span.cxx
openoffice/branches/gbuild-reintegration/main/xmlreader/source/xmlreader.cxx
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 17:02:15 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409529
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1734110&r1=1734109&r2=1734110&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Tue Mar 8 17:02:15 2016
@@ -99,6 +99,7 @@ $(eval $(call gb_Helper_register_librari
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
xml2 \
+ xmlreader \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
Modified: openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst?rev=1734110&r1=1734109&r2=1734110&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlreader/prj/build.lst Tue Mar 8 17:02:15 2016
@@ -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
Modified: openoffice/branches/gbuild-reintegration/main/xmlreader/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/prj/d.lst?rev=1734110&r1=1734109&r2=1734110&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlreader/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlreader/prj/d.lst Tue Mar 8 17:02:15 2016
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmlreader
-mkdir: %_DEST%\inc%_EXT%\xmlreader\detail
-..\%__SRC%\bin\xmlread*.dll %_DEST%\bin%_EXT%\xmlread*.dll
-..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib
-..\%__SRC%\lib\xmlreader*.lib %_DEST%\lib%_EXT%\xmlreader*.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
Modified: openoffice/branches/gbuild-reintegration/main/xmlreader/source/pad.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/source/pad.cxx?rev=1734110&r1=1734109&r2=1734110&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlreader/source/pad.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlreader/source/pad.cxx Tue Mar 8 17:02:15 2016
@@ -21,9 +21,7 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
-
#include "osl/diagnose.h"
#include "rtl/string.h"
#include "sal/types.h"
Modified: openoffice/branches/gbuild-reintegration/main/xmlreader/source/span.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/source/span.cxx?rev=1734110&r1=1734109&r2=1734110&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlreader/source/span.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlreader/source/span.cxx Tue Mar 8 17:02:15 2016
@@ -21,9 +21,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"
Modified: openoffice/branches/gbuild-reintegration/main/xmlreader/source/xmlreader.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/xmlreader/source/xmlreader.cxx?rev=1734110&r1=1734109&r2=1734110&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/xmlreader/source/xmlreader.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/xmlreader/source/xmlreader.cxx Tue Mar 8 17:02:15 2016
@@ -21,7 +21,6 @@
-#include "precompiled_xmlreader.hxx"
#include "sal/config.h"
#include <climits>