r13107@tres: ted | 2006-07-30 11:47:41 -0700

 Getting the basic build stuff in.  No we're building libwpg

diff --git a/src/Makefile.am b/src/Makefile.am
index 764ae3dc3788b56c5f017731ce547a674f21221d..7c8115701396dd03d0a5edf08499d936f732a9ee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,7 @@ include dom/Makefile_insert
 include extension/Makefile_insert
 include extension/implementation/Makefile_insert
 include extension/internal/Makefile_insert
+include extension/internal/libwpg/Makefile_insert
 include extension/script/Makefile_insert
 include helper/Makefile_insert
 include inkjar/Makefile_insert
@@ -73,6 +74,7 @@ noinst_LIBRARIES =    \
        dom/libdom.a    \
        extension/implementation/libimplementation.a    \
        extension/internal/libinternal.a        \
+       extension/internal/libwpg/libwpg.a      \
        extension/libextension.a        \
        extension/script/libscript.a    \
        helper/libspchelp.a     \

diff --git a/src/Makefile_insert b/src/Makefile_insert
index e096ef5e4304500dc61dc531cc8061a64d2e1c30..dd65108ce02f0ba80fc1b90b6bb1daa48db31849 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -284,6 +284,7 @@ inkscape_private_libs =     \
        extension/libextension.a        \
        extension/implementation/libimplementation.a    \
        extension/internal/libinternal.a        \
+       extension/internal/libwpg/libwpg.a      \
        extension/script/libscript.a    \
         dom/libdom.a            \
        xml/libspxml.a          \

diff --git a/src/extension/internal/libwpg/Makefile.am b/src/extension/internal/libwpg/Makefile.am
deleted file mode 100644 (file)
index e8b4495..0000000
--- a/src/extension/internal/libwpg/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-EXTRA_DIST = \
-       libwpg.h.in \
-       libwpg.rc.in \
-       libwpg-stream.rc.in
-
-# These may be in the builddir too
-BUILD_EXTRA_DIST = \
-       libwpg.rc \
-       libwpg-stream.rc        
-       
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 
-else
-no_undefined =
-version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-endif
-
-if OS_WIN32
-install-libtool-import-lib:
-       $(INSTALL) .libs/libwpg-1.dll.a $(DESTDIR)$(libdir)
-       $(INSTALL) .libs/libwpg-stream-1.dll.a $(DESTDIR)$(libdir)
-
-uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libwpg-1.dll.a
-       -rm $(DESTDIR)$(libdir)/libwpg-stream-1.dll.a
-       
-else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
-endif
-
-lib_LTLIBRARIES = libwpg-1.la libwpg-stream-1.la
-libwpg_1_includedir = $(includedir)/libwpg-1/libwpg
-libwpg_1_include_HEADERS = \
-       libwpg.h \
-       WPGraphics.h \
-       WPGColor.h \
-       WPGPen.h \
-       WPGBrush.h \
-       WPGGradient.h \
-       WPGPoint.h \
-       WPGRect.h \
-       WPGPath.h \
-       WPGStream.h \
-       WPGPaintInterface.h 
-
-AM_CXXFLAGS = $(LIBWPG_CXXFLAGS) $(DEBUG_CXXFLAGS)
-
-libwpg_1_la_LIBADD  = $(LIBWPG_LIBS) @LIBWPG_WIN32_RESOURCE@
-libwpg_1_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@
-libwpg_1_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
-libwpg_1_la_SOURCES = \
-       WPGraphics.cpp \
-       WPGPen.cpp \
-       WPGGradient.cpp \
-       WPGPoint.cpp \
-       WPGPath.cpp \
-       WPGHeader.cpp \
-       WPGXParser.cpp \
-       WPG1Parser.cpp \
-       WPG2Parser.cpp \
-       libwpg.h \
-       libwpg_utils.h \
-       WPGColor.h \
-       WPGPen.h \
-       WPGBrush.h \
-       WPGPath.h \
-       WPGGradient.h \
-       WPGHeader.h \
-       WPGXParser.h \
-       WPG1Parser.h \
-       WPG2Parser.h \
-       WPGPaintInterface.h 
-
-libwpg_stream_1_includedir = $(includedir)/libwpg-1/libwpg
-libwpg_stream_1_include_HEADERS = WPGStreamImplementation.h
-
-libwpg_stream_1_la_LIBADD  = $(LIBWPG_LIBS) @LIBWPG_STREAM_WIN32_RESOURCE@
-libwpg_stream_1_la_DEPENDENCIES = @LIBWPG_STREAM_WIN32_RESOURCE@
-libwpg_stream_1_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
-libwpg_stream_1_la_SOURCES = \
-       WPGOLEStream.cpp \
-       WPGStreamImplementation.cpp \
-       WPGOLEStream.h
-
-if OS_WIN32
-
-@LIBWPG_WIN32_RESOURCE@ : libwpg.rc
-       $(top_srcdir)/build/win32/lt-compile-resource libwpg.rc @LIBWPG_WIN32_RESOURCE@
-
-@LIBWPG_STREAM_WIN32_RESOURCE@ : libwpg.rc
-       $(top_srcdir)/build/win32/lt-compile-resource libwpg-stream.rc @LIBWPG_STREAM_WIN32_RESOURCE@
-
-endif
-
-
-install-data-local: install-libtool-import-lib
-
-uninstall-local: uninstall-libtool-import-lib

diff --git a/src/extension/internal/libwpg/libwpg-stream.rc.in b/src/extension/internal/libwpg/libwpg-stream.rc.in
deleted file mode 100644 (file)
index ad297d2..0000000
--- a/src/extension/internal/libwpg/libwpg-stream.rc.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @WPG_MAJOR_VERSION@,@WPG_MINOR_VERSION@,@WPG_MICRO_VERSION@,BUILDNUMBER
-  PRODUCTVERSION @WPG_MAJOR_VERSION@,@WPG_MINOR_VERSION@,@WPG_MICRO_VERSION@,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-       VALUE "CompanyName", "The libwpg developer community"
-       VALUE "FileDescription", "libwpg-stream"
-       VALUE "FileVersion", "@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@.@WPG_MICRO_VERSION@.BUILDNUMBER"
-       VALUE "InternalName", "libwpg-stream-1"
-       VALUE "LegalCopyright", "Copyright (C) 2004 Marc Oude Kotte, other contributers"
-       VALUE "OriginalFilename", "libwpg-stream-1.dll"
-       VALUE "ProductName", "libwpg"
-       VALUE "ProductVersion", "@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@.@WPG_MICRO_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END
-

diff --git a/src/extension/internal/libwpg/libwpg.h b/src/extension/internal/libwpg/libwpg.h
new file mode 100644 (file)
index 0000000..feba050
--- /dev/null
+++ b/src/extension/internal/libwpg/libwpg.h
@@ -0,0 +1,42 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libwpg.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __LIBWPG_H__
+#define __LIBWPG_H__
+
+#include "WPGraphics.h"
+#include "WPGPaintInterface.h"
+#include "WPGStream.h"
+
+#include "WPGColor.h"
+#include "WPGPen.h"
+#include "WPGBrush.h"
+#include "WPGGradient.h"
+#include "WPGPath.h"
+#include "WPGPoint.h"
+#include "WPGRect.h"
+
+#endif

diff --git a/src/extension/internal/libwpg/libwpg.h.in b/src/extension/internal/libwpg/libwpg.h.in
deleted file mode 100644 (file)
index fcbf993..0000000
--- a/src/extension/internal/libwpg/libwpg.h.in
+++ /dev/null
@@ -1,47 +0,0 @@
-/* libwpg
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#ifndef __LIBWPG_H__
-#define __LIBWPG_H__
-
-#define LIBWPG_VERSION_MAJOR     @WPG_MAJOR_VERSION@
-#define LIBWPG_VERSION_MINOR     @WPG_MINOR_VERSION@
-#define LIBWPG_VERSION_REVISION  @WPG_MICRO_VERSION@
-#define LIBWPG_VERSION_STRING    "@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@.@WPG_MICRO_VERSION@"
-
-#include "WPGraphics.h"
-#include "WPGPaintInterface.h"
-#include "WPGStream.h"
-
-#include "WPGColor.h"
-#include "WPGPen.h"
-#include "WPGBrush.h"
-#include "WPGGradient.h"
-#include "WPGPath.h"
-#include "WPGPoint.h"
-#include "WPGRect.h"
-
-#endif

diff --git a/src/extension/internal/libwpg/libwpg.rc.in b/src/extension/internal/libwpg/libwpg.rc.in
deleted file mode 100644 (file)
index e2278a0..0000000
--- a/src/extension/internal/libwpg/libwpg.rc.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @WPG_MAJOR_VERSION@,@WPG_MINOR_VERSION@,@WPG_MICRO_VERSION@,BUILDNUMBER
-  PRODUCTVERSION @WPG_MAJOR_VERSION@,@WPG_MINOR_VERSION@,@WPG_MICRO_VERSION@,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-       VALUE "CompanyName", "The libwpg developer community"
-       VALUE "FileDescription", "libwpg"
-       VALUE "FileVersion", "@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@.@WPG_MICRO_VERSION@.BUILDNUMBER"
-       VALUE "InternalName", "libwpg-1"
-       VALUE "LegalCopyright", "Copyright (C) 2004 Marc Oude Kotte, other contributers"
-       VALUE "OriginalFilename", "libwpg-1.dll"
-       VALUE "ProductName", "libwpg"
-       VALUE "ProductVersion", "@WPG_MAJOR_VERSION@.@WPG_MINOR_VERSION@.@WPG_MICRO_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END
-

diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index bc65ad5b9f04cfee115f4d3a3995ba975e4092e6..4f296f2abf36e136d4e3a80aa867d55fc6e860b3 100644 (file)
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -25,14 +25,14 @@
 \r
 #include <stdio.h>\r
 \r
-#include "libwpg.h"\r
-#include "WPGStreamImplementation.h"\r
+#include "libwpg/libwpg.h"\r
+#include "libwpg/WPGStreamImplementation.h"\r
 \r
 using namespace libwpg;\r
 \r
-class SvgPainter : public libwpg::WPGPaintInterface {\r
+class InkscapePainter : public libwpg::WPGPaintInterface {\r
 public:\r
-       SvgPainter();\r
+       InkscapePainter();\r
 \r
        void startDocument(double imageWidth, double imageHeight);\r
        void endDocument();\r
@@ -56,11 +56,11 @@ private:
        void writeStyle();\r
 };\r
 \r
-SvgPainter::SvgPainter(): m_fillRule(AlternatingFill), m_gradientIndex(1)\r
+InkscapePainter::InkscapePainter(): m_fillRule(AlternatingFill), m_gradientIndex(1)\r
 {\r
 }\r
 \r
-void SvgPainter::startDocument(double width, double height) \r
+void InkscapePainter::startDocument(double width, double height) \r
 {\r
        printf("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");\r
        printf("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");\r
@@ -75,17 +75,17 @@ void SvgPainter::startDocument(double width, double height)
        m_gradientIndex = 1;\r
 }\r
 \r
-void SvgPainter::endDocument()\r
+void InkscapePainter::endDocument()\r
 {\r
        printf("</svg>\n");\r
 }\r
 \r
-void SvgPainter::setPen(const WPGPen& pen)\r
+void InkscapePainter::setPen(const WPGPen& pen)\r
 {\r
        m_pen = pen;\r
 }\r
 \r
-void SvgPainter::setBrush(const WPGBrush& brush)\r
+void InkscapePainter::setBrush(const WPGBrush& brush)\r
 {\r
        m_brush = brush;\r
        \r
@@ -121,22 +121,22 @@ void SvgPainter::setBrush(const WPGBrush& brush)
        }\r
 }\r
 \r
-void SvgPainter::setFillRule(FillRule rule)\r
+void InkscapePainter::setFillRule(FillRule rule)\r
 {\r
        m_fillRule = rule;\r
 }\r
 \r
-void SvgPainter::startLayer(unsigned int id)\r
+void InkscapePainter::startLayer(unsigned int id)\r
 {\r
        printf("<g id=\"Layer%d\" >\n", id);\r
 }\r
 \r
-void SvgPainter::endLayer(unsigned int)\r
+void InkscapePainter::endLayer(unsigned int)\r
 {\r
        printf("</g>\n");\r
 }\r
 \r
-void SvgPainter::drawRectangle(const WPGRect& rect, double rx, double ry)\r
+void InkscapePainter::drawRectangle(const WPGRect& rect, double rx, double ry)\r
 {\r
        printf("<rect ");\r
        printf("x=\"%f\" y=\"%f\" ", 72*rect.x1, 72*rect.y1);\r
@@ -147,7 +147,7 @@ void SvgPainter::drawRectangle(const WPGRect& rect, double rx, double ry)
        printf("/>\n");\r
 }\r
 \r
-void SvgPainter::drawEllipse(const WPGPoint& center, double rx, double ry)\r
+void InkscapePainter::drawEllipse(const WPGPoint& center, double rx, double ry)\r
 {\r
        printf("<ellipse ");\r
        printf("cx=\"%f\" cy=\"%f\" ", 72*center.x, 72*center.y);\r
@@ -156,7 +156,7 @@ void SvgPainter::drawEllipse(const WPGPoint& center, double rx, double ry)
        printf("/>\n");\r
 }\r
 \r
-void SvgPainter::drawPolygon(const WPGPointArray& vertices)\r
+void InkscapePainter::drawPolygon(const WPGPointArray& vertices)\r
 {\r
        if(vertices.count() < 2)\r
                return;\r
@@ -186,7 +186,7 @@ void SvgPainter::drawPolygon(const WPGPointArray& vertices)
        }\r
 }\r
 \r
-void SvgPainter::drawPath(const WPGPath& path)\r
+void InkscapePainter::drawPath(const WPGPath& path)\r
 {\r
        printf("<path d=\"");\r
        for(unsigned i = 0; i < path.count(); i++)\r
@@ -220,7 +220,7 @@ void SvgPainter::drawPath(const WPGPath& path)
 }\r
 \r
 // create "style" attribute based on current pen and brush\r
-void SvgPainter::writeStyle()\r
+void InkscapePainter::writeStyle()\r
 {\r
        printf("style=\"");\r
 \r
@@ -249,9 +249,9 @@ void SvgPainter::writeStyle()
        if(m_brush.style == WPGBrush::NoBrush)\r
                printf("fill: none; ");\r
 \r
-       if(m_fillRule == SvgPainter::WindingFill)\r
+       if(m_fillRule == InkscapePainter::WindingFill)\r
                printf("fill-rule: nonzero; ");\r
-       else if(m_fillRule == SvgPainter::AlternatingFill)\r
+       else if(m_fillRule == InkscapePainter::AlternatingFill)\r
                printf("fill-rule: evenodd; ");\r
 \r
        if(m_brush.style == WPGBrush::Gradient)\r
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
                return 1;\r
        }\r
        \r
-       SvgPainter painter;\r
+       InkscapePainter painter;\r
        WPGraphics::parse(input, &painter);\r
        \r
        return 0;\r