[ooo-build-commit] .: 3 commits - libwpd/makefile.mk libwpg/makefile.mk libwpg/prj libwps/libwps-0.1.1.diff libwps/makefile.mk libwps/prj
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 02:35:38 PDT 2010
libwpd/makefile.mk | 7 +--
libwpg/makefile.mk | 60 ++++++++++++++++++++++++++++++
libwpg/prj/build.lst | 3 +
libwpg/prj/d.lst | 16 ++++++++
libwps/libwps-0.1.1.diff | 93 +++++++++++++++++++++++++++++++++++++++++++++++
libwps/makefile.mk | 60 ++++++++++++++++++++++++++++++
libwps/prj/build.lst | 3 +
libwps/prj/d.lst | 6 +++
8 files changed, 244 insertions(+), 4 deletions(-)
New commits:
commit 84b44afa238afc45065db0c87d94fdcda0b99489
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:26:04 2010 +0200
libwpg.diff: WPG Import filter - create a libwpg module.
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
new file mode 100644
index 0000000..424fd98
--- /dev/null
+++ b/libwpg/makefile.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# 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=wpg
+TARGET=wpg
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(SYSTEM_LIBWPG)" == "YES"
+ at all:
+ @echo "Using system libwpg..."
+.ENDIF
+
+# libwpg depends on the libwpd framework
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+INCPRE+=$(LIBWPD_CFLAGS)
+.ELSE
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+.ENDIF
+
+TARFILE_NAME=libwpg-0.1.3
+TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+BUILD_DIR=src/lib
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
diff --git a/libwpg/prj/build.lst b/libwpg/prj/build.lst
new file mode 100644
index 0000000..d54a1d9
--- /dev/null
+++ b/libwpg/prj/build.lst
@@ -0,0 +1,3 @@
+lwpg libwpg : LIBWPD:libwpd soltools NULL
+lwpg libwpg usr1 - all lwpg_mkout NULL
+lwpg libwpg nmake - all lwpg_libwpg NULL
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
new file mode 100644
index 0000000..d01a25a
--- /dev/null
+++ b/libwpg/prj/d.lst
@@ -0,0 +1,16 @@
+mkdir: %_DEST%\inc%_EXT%\libwpg
+..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGBitmap.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGBinaryData.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGBrush.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGColor.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGGradient.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPath.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPen.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPoint.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGRect.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\misc\build\libwpg*\src\lib\WPGString.h %_DEST%\inc%_EXT%\libwpg\
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
commit c9802c9c9481ef47c8bb5225fb5be640ed4f4c87
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:15:24 2010 +0200
libwps.diff: WPS Import filter - create a libwps module
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 104d79f..d12173d 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/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
diff --git a/libwps/libwps-0.1.1.diff b/libwps/libwps-0.1.1.diff
new file mode 100644
index 0000000..6977cf3
--- /dev/null
+++ b/libwps/libwps-0.1.1.diff
@@ -0,0 +1,93 @@
+*** misc/libwps-0.1.1/src/lib/WPSListener.h Thu Nov 29 20:58:57 2007
+--- misc/build/libwps-0.1.1/src/lib/WPSListener.h Sun Dec 2 20:54:35 2007
+***************
+*** 39,45 ****
+ virtual ~WPSListener();
+
+ bool isUndoOn() { return m_isUndoOn; }
+! void setUndoOn(bool isUndoOn) { m_isUndoOn = isUndoOn; }
+
+ std::list<WPSPageSpan> &m_pageList;
+
+--- 39,45 ----
+ virtual ~WPSListener();
+
+ bool isUndoOn() { return m_isUndoOn; }
+! void setUndoOn(bool undoOn) { m_isUndoOn = undoOn; }
+
+ std::list<WPSPageSpan> &m_pageList;
+
+*** misc/libwps-0.1.1/src/lib/WPSContentListener.cpp Thu Nov 29 20:58:57 2007
+--- misc/build/libwps-0.1.1/src/lib/WPSContentListener.cpp Sun Dec 2 21:09:11 2007
+***************
+*** 36,62 ****
+ #define LIBWPS_MAX std::max
+ #endif
+
+- namespace {
+-
+- WPXString doubleToString(const double value)
+- {
+- WPXString tempString;
+- tempString.sprintf("%.4f", value);
+- std::string decimalPoint(localeconv()->decimal_point);
+- if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+- return tempString;
+- std::string stringValue(tempString.cstr());
+- if (!stringValue.empty())
+- {
+- std::string::size_type pos;
+- while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
+- stringValue.replace(pos,decimalPoint.size(),".");
+- }
+- return WPXString(stringValue.c_str());
+- }
+-
+- } // namespace
+-
+ _WPSContentParsingState::_WPSContentParsingState() :
+ m_textAttributeBits(0),
+ m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE
+--- 36,41 ----
+***************
+*** 578,585 ****
+ _closePageSpan();
+ }
+
+- const float WPS_DEFAULT_SUPER_SUB_SCRIPT = 58.0f;
+-
+ void WPSContentListener::_openSpan()
+ {
+ if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened)
+--- 557,562 ----
+***************
+*** 622,639 ****
+ }
+
+ WPXPropertyList propList;
+! if (attributeBits & WPS_SUPERSCRIPT_BIT) {
+! WPXString sSuperScript("super ");
+! sSuperScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT));
+! sSuperScript.append("%");
+! propList.insert("style:text-position", sSuperScript);
+! }
+! else if (attributeBits & WPS_SUBSCRIPT_BIT) {
+! WPXString sSubScript("sub ");
+! sSubScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT));
+! sSubScript.append("%");
+! propList.insert("style:text-position", sSubScript);
+! }
+ if (attributeBits & WPS_ITALICS_BIT)
+ propList.insert("fo:font-style", "italic");
+ if (attributeBits & WPS_BOLD_BIT)
+--- 599,608 ----
+ }
+
+ WPXPropertyList propList;
+! if (m_ps->m_textAttributeBits & WPS_SUPERSCRIPT_BIT)
+! propList.insert("style:text-position", "super 58%");
+! else if (m_ps->m_textAttributeBits & WPS_SUBSCRIPT_BIT)
+! propList.insert("style:text-position", "sub 58%");
+ if (attributeBits & WPS_ITALICS_BIT)
+ propList.insert("fo:font-style", "italic");
+ if (attributeBits & WPS_BOLD_BIT)
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
new file mode 100644
index 0000000..3d9cefe
--- /dev/null
+++ b/libwps/makefile.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# 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=wps
+TARGET=wps
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(SYSTEM_LIBWPS)" == "YES"
+ at all:
+ @echo "Using system libwps..."
+.ENDIF
+
+# libwps depends on the libwpd framework
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+INCPRE+=$(LIBWPD_CFLAGS)
+.ELSE
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+.ENDIF
+
+TARFILE_NAME=libwps-0.1.2
+TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+BUILD_DIR=src/lib
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
diff --git a/libwps/prj/build.lst b/libwps/prj/build.lst
new file mode 100644
index 0000000..85004e1
--- /dev/null
+++ b/libwps/prj/build.lst
@@ -0,0 +1,3 @@
+lwps libwps : LIBWPD:libwpd soltools NULL
+lwps libwps usr1 - all lwps_mkout NULL
+lwps libwps nmake - all lwps_libwps NULL
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
new file mode 100644
index 0000000..fe897d7
--- /dev/null
+++ b/libwps/prj/d.lst
@@ -0,0 +1,6 @@
+mkdir: %_DEST%\inc%_EXT%\libwps
+..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\
+..\%__SRC%\misc\build\libwps*\src\lib\WPSStream.h %_DEST%\inc%_EXT%\libwps\
+..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
commit 37676cddbfa10f29efea49aafd07acb40aa6b7d4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 10:34:20 2010 +0200
libwpd.diff: upload new libwpd
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index abca6ff..104d79f 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -41,9 +41,8 @@ TARGET=wpd
@echo "Using system libwpd..."
.ENDIF
-TARFILE_NAME=libwpd-0.8.8
-TARFILE_MD5=cd5997284f4ba1e8dde5d1e5869fc342
-PATCH_FILES=$(TARFILE_NAME).diff
+TARFILE_NAME=libwpd-0.8.14
+TARFILE_MD5=64d66018897d759358f454010b6e75d2
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
More information about the ooo-build-commit
mailing list