[Libreoffice-commits] .: package/inc package/Library_package2.mk package/Library_xstor.mk package/Makefile package/Module_package.mk package/Package_dtd.mk package/Package_inc.mk package/prj package/source package/util postprocess/packcomponents RepositoryFixes.mk Repository.mk sc/CppunitTest_sc_test_filters.mk sw/CppunitTest_sw_test_filters.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Fri Aug 26 05:34:32 PDT 2011
Repository.mk | 2
RepositoryFixes.mk | 1
package/Library_package2.mk | 100 ++++++++++++++++++++++++++++
package/Library_xstor.mk | 67 ++++++++++++++++++
package/Makefile | 39 ++++++++++
package/Module_package.mk | 38 ++++++++++
package/Package_dtd.mk | 33 +++++++++
package/Package_inc.mk | 35 +++++++++
package/inc/Deflater.hxx | 73 --------------------
package/inc/Inflater.hxx | 65 ------------------
package/inc/ZipFile.hxx | 2
package/inc/ZipOutputStream.hxx | 2
package/inc/makefile.mk | 47 -------------
package/inc/package/Deflater.hxx | 73 ++++++++++++++++++++
package/inc/package/Inflater.hxx | 65 ++++++++++++++++++
package/inc/package/packagedllapi.hxx | 15 ++++
package/inc/packagedllapi.hxx | 15 ----
package/prj/build.lst | 9 --
package/prj/d.lst | 12 ---
package/prj/makefile.mk | 40 +++++++++++
package/source/manifest/makefile.mk | 55 ---------------
package/source/xstor/makefile.mk | 83 -----------------------
package/source/xstor/xstor.dxp | 1
package/source/zipapi/Deflater.cxx | 2
package/source/zipapi/Inflater.cxx | 2
package/source/zipapi/XUnbufferedStream.hxx | 2
package/source/zipapi/makefile.mk | 62 -----------------
package/source/zippackage/makefile.mk | 58 ----------------
package/util/exports.dxp | 1
package/util/makefile.mk | 89 ------------------------
package/util/package.pmk | 2
postprocess/packcomponents/makefile.mk | 4 -
sc/CppunitTest_sc_test_filters.mk | 2
sw/CppunitTest_sw_test_filters.mk | 2
34 files changed, 518 insertions(+), 580 deletions(-)
New commits:
commit d0c301bba0b483c7ffef83fe93fa9658aa10bd44
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Aug 26 14:04:17 2011 +0200
convert package to gbuild
diff --git a/Repository.mk b/Repository.mk
index eaa4ed1..eebefe7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_others \
mcnttype \
neon \
+ package2 \
reg \
store \
test \
@@ -172,6 +173,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsecurity \
xsec_fw \
xsec_xmlsec \
+ xstor \
))
ifeq ($(OS),WNT)
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 5cb8d4b..2bd81d0 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -105,6 +105,7 @@ gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library
gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst package2:ipackage2%,package2:ipackage%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
new file mode 100644
index 0000000..3f36f55
--- /dev/null
+++ b/package/Library_package2.mk
@@ -0,0 +1,100 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,package2))
+
+$(eval $(call gb_Library_add_package_headers,package2,package_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,package2,$(SRCDIR)/package/inc/pch/precompiled_package))
+
+$(eval $(call gb_Library_set_componentfile,package2,package/util/package2))
+
+$(eval $(call gb_Library_set_include,package2,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/package/inc) \
+ -I$(realpath $(SRCDIR)/package/inc/pch) \
+))
+
+$(eval $(call gb_Library_add_api,package2,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,package2,\
+ -DDLLIMPLEMENTATION_PACKAGE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,package2,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,package2,\
+ zlib \
+))
+
+$(eval $(call gb_Library_add_exception_objects,package2,\
+ package/source/manifest/Base64Codec \
+ package/source/manifest/ManifestExport \
+ package/source/manifest/ManifestImport \
+ package/source/manifest/ManifestReader \
+ package/source/manifest/ManifestWriter \
+ package/source/manifest/UnoRegister \
+ package/source/zipapi/blowfishcontext \
+ package/source/zipapi/ByteChucker \
+ package/source/zipapi/ByteGrabber \
+ package/source/zipapi/CRC32 \
+ package/source/zipapi/Deflater \
+ package/source/zipapi/Inflater \
+ package/source/zipapi/sha1context \
+ package/source/zipapi/XUnbufferedStream \
+ package/source/zipapi/ZipEnumeration \
+ package/source/zipapi/ZipFile \
+ package/source/zipapi/ZipOutputStream \
+ package/source/zippackage/wrapstreamforshare \
+ package/source/zippackage/zipfileaccess \
+ package/source/zippackage/ZipPackageBuffer \
+ package/source/zippackage/ZipPackage \
+ package/source/zippackage/ZipPackageEntry \
+ package/source/zippackage/ZipPackageFolder \
+ package/source/zippackage/ZipPackageFolderEnumeration \
+ package/source/zippackage/ZipPackageSink \
+ package/source/zippackage/ZipPackageStream \
+))
+
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_add_defs,package2,\
+ -DSYSTEM_ZLIB \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk
new file mode 100644
index 0000000..50a28ed
--- /dev/null
+++ b/package/Library_xstor.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,xstor))
+
+$(eval $(call gb_Library_add_precompiled_header,xstor,$(SRCDIR)/package/inc/pch/precompiled_package))
+
+$(eval $(call gb_Library_set_componentfile,xstor,package/source/xstor/xstor))
+
+$(eval $(call gb_Library_set_include,xstor,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/package/inc) \
+ -I$(realpath $(SRCDIR)/package/inc/pch) \
+))
+
+$(eval $(call gb_Library_add_api,xstor,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xstor,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xstor,\
+ package/source/xstor/disposelistener \
+ package/source/xstor/ocompinstream \
+ package/source/xstor/ohierarchyholder \
+ package/source/xstor/oseekinstream \
+ package/source/xstor/owriteablestream \
+ package/source/xstor/register \
+ package/source/xstor/selfterminatefilestream \
+ package/source/xstor/switchpersistencestream \
+ package/source/xstor/xfactory \
+ package/source/xstor/xstorage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Makefile b/package/Makefile
new file mode 100644
index 0000000..a1b344d
--- /dev/null
+++ b/package/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/package/Module_package.mk b/package/Module_package.mk
new file mode 100644
index 0000000..0ed480b
--- /dev/null
+++ b/package/Module_package.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,package))
+
+$(eval $(call gb_Module_add_targets,package,\
+ Library_package2 \
+ Library_xstor \
+ Package_dtd \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk
new file mode 100644
index 0000000..55414ee
--- /dev/null
+++ b/package/Package_dtd.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd))
+
+$(eval $(call gb_Package_add_file,package_dtd,bin/Manifest.dtd,Manifest.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Package_inc.mk b/package/Package_inc.mk
new file mode 100644
index 0000000..f85f432
--- /dev/null
+++ b/package/Package_inc.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,package_inc,$(SRCDIR)/package/inc))
+
+$(eval $(call gb_Package_add_file,package_inc,inc/package/Deflater.hxx,package/Deflater.hxx))
+$(eval $(call gb_Package_add_file,package_inc,inc/package/Inflater.hxx,package/Inflater.hxx))
+$(eval $(call gb_Package_add_file,package_inc,inc/package/packagedllapi.hxx,package/packagedllapi.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx
deleted file mode 100644
index 6c1cf44..0000000
--- a/package/inc/Deflater.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#ifndef _DEFLATER_HXX_
-#define _DEFLATER_HXX_
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include "packagedllapi.hxx"
-
-struct z_stream_s;
-
-namespace ZipUtils {
-
-class DLLPUBLIC_PACKAGE Deflater
-{
- typedef struct z_stream_s z_stream;
-
-protected:
- com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
- sal_Bool bFinish;
- sal_Bool bFinished;
- sal_Bool bSetParams;
- sal_Int32 nLevel, nStrategy;
- sal_Int32 nOffset, nLength;
- z_stream* pStream;
-
- void init (sal_Int32 nLevel, sal_Int32 nStrategy, sal_Bool bNowrap);
- sal_Int32 doDeflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
-
-public:
- ~Deflater();
- Deflater(sal_Int32 nSetLevel, sal_Bool bNowrap);
- void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
- void SAL_CALL setLevel( sal_Int32 nNewLevel );
- sal_Bool SAL_CALL needsInput( );
- void SAL_CALL finish( );
- sal_Bool SAL_CALL finished( );
- sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
- sal_Int32 SAL_CALL getTotalIn( );
- sal_Int32 SAL_CALL getTotalOut( );
- void SAL_CALL reset( );
- void SAL_CALL end( );
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx
deleted file mode 100644
index f5241df..0000000
--- a/package/inc/Inflater.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#ifndef _INFLATER_HXX_
-#define _INFLATER_HXX_
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include "packagedllapi.hxx"
-
-struct z_stream_s;
-
-namespace ZipUtils {
-
-class DLLPUBLIC_PACKAGE Inflater
-{
- typedef struct z_stream_s z_stream;
-
-protected:
- sal_Bool bFinish, bFinished, bSetParams, bNeedDict;
- sal_Int32 nOffset, nLength, nLastInflateError;
- z_stream* pStream;
- com::sun::star::uno::Sequence < sal_Int8 > sInBuffer;
- sal_Int32 doInflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
-
-public:
- Inflater(sal_Bool bNoWrap = sal_False);
- ~Inflater();
- void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer );
- sal_Bool SAL_CALL needsDictionary( );
- sal_Bool SAL_CALL finished( );
- sal_Int32 SAL_CALL doInflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
- void SAL_CALL end( );
-
- sal_Int32 getLastInflateError() { return nLastInflateError; }
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 05186c0..bb348f3 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -35,9 +35,9 @@
#include <com/sun/star/xml/crypto/XCipherContext.hpp>
#include <com/sun/star/xml/crypto/XDigestContext.hpp>
+#include <package/Inflater.hxx>
#include <ByteGrabber.hxx>
#include <HashMaps.hxx>
-#include <Inflater.hxx>
#include <EncryptionData.hxx>
#include <mutexholder.hxx>
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index b5d6ee8..abd5efc 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -34,8 +34,8 @@
#include <com/sun/star/xml/crypto/XCipherContext.hpp>
#include <com/sun/star/xml/crypto/XDigestContext.hpp>
+#include <package/Deflater.hxx>
#include <ByteChucker.hxx>
-#include <Deflater.hxx>
#include <CRC32.hxx>
#include <vector>
diff --git a/package/inc/makefile.mk b/package/inc/makefile.mk
deleted file mode 100644
index 19d8967..0000000
--- a/package/inc/makefile.mk
+++ /dev/null
@@ -1,47 +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=package
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/package/inc/package/Deflater.hxx b/package/inc/package/Deflater.hxx
new file mode 100644
index 0000000..6c1cf44
--- /dev/null
+++ b/package/inc/package/Deflater.hxx
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _DEFLATER_HXX_
+#define _DEFLATER_HXX_
+
+#include <com/sun/star/uno/Sequence.hxx>
+#include "packagedllapi.hxx"
+
+struct z_stream_s;
+
+namespace ZipUtils {
+
+class DLLPUBLIC_PACKAGE Deflater
+{
+ typedef struct z_stream_s z_stream;
+
+protected:
+ com::sun::star::uno::Sequence< sal_Int8 > sInBuffer;
+ sal_Bool bFinish;
+ sal_Bool bFinished;
+ sal_Bool bSetParams;
+ sal_Int32 nLevel, nStrategy;
+ sal_Int32 nOffset, nLength;
+ z_stream* pStream;
+
+ void init (sal_Int32 nLevel, sal_Int32 nStrategy, sal_Bool bNowrap);
+ sal_Int32 doDeflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
+
+public:
+ ~Deflater();
+ Deflater(sal_Int32 nSetLevel, sal_Bool bNowrap);
+ void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
+ void SAL_CALL setLevel( sal_Int32 nNewLevel );
+ sal_Bool SAL_CALL needsInput( );
+ void SAL_CALL finish( );
+ sal_Bool SAL_CALL finished( );
+ sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
+ sal_Int32 SAL_CALL getTotalIn( );
+ sal_Int32 SAL_CALL getTotalOut( );
+ void SAL_CALL reset( );
+ void SAL_CALL end( );
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/package/Inflater.hxx b/package/inc/package/Inflater.hxx
new file mode 100644
index 0000000..f5241df
--- /dev/null
+++ b/package/inc/package/Inflater.hxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _INFLATER_HXX_
+#define _INFLATER_HXX_
+
+#include <com/sun/star/uno/Sequence.hxx>
+#include "packagedllapi.hxx"
+
+struct z_stream_s;
+
+namespace ZipUtils {
+
+class DLLPUBLIC_PACKAGE Inflater
+{
+ typedef struct z_stream_s z_stream;
+
+protected:
+ sal_Bool bFinish, bFinished, bSetParams, bNeedDict;
+ sal_Int32 nOffset, nLength, nLastInflateError;
+ z_stream* pStream;
+ com::sun::star::uno::Sequence < sal_Int8 > sInBuffer;
+ sal_Int32 doInflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
+
+public:
+ Inflater(sal_Bool bNoWrap = sal_False);
+ ~Inflater();
+ void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer );
+ sal_Bool SAL_CALL needsDictionary( );
+ sal_Bool SAL_CALL finished( );
+ sal_Int32 SAL_CALL doInflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength );
+ void SAL_CALL end( );
+
+ sal_Int32 getLastInflateError() { return nLastInflateError; }
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/package/packagedllapi.hxx b/package/inc/package/packagedllapi.hxx
new file mode 100644
index 0000000..41e8efa
--- /dev/null
+++ b/package/inc/package/packagedllapi.hxx
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_PACKAGEDLLAPI_H
+#define INCLUDED_PACKAGEDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(DLLIMPLEMENTATION_PACKAGE)
+#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT
+#else
+#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif /* INCLUDED_PACKAGEDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/packagedllapi.hxx b/package/inc/packagedllapi.hxx
deleted file mode 100644
index 41e8efa..0000000
--- a/package/inc/packagedllapi.hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef INCLUDED_PACKAGEDLLAPI_H
-#define INCLUDED_PACKAGEDLLAPI_H
-
-#include "sal/types.h"
-
-#if defined(DLLIMPLEMENTATION_PACKAGE)
-#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT
-#else
-#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif /* INCLUDED_PACKAGEDLLAPI_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/prj/build.lst b/package/prj/build.lst
index 6afa434..e1a2c11 100644
--- a/package/prj/build.lst
+++ b/package/prj/build.lst
@@ -1,9 +1,2 @@
pk package : cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib LIBXSLT:libxslt NULL
-pk package usr1 - all pk_mkout NULL
-pk package\inc nmake - all pk_inc NULL
-pk package\source\zipapi nmake - all pk_zipapi pk_inc NULL
-pk package\source\zippackage nmake - all pk_zippackage pk_inc NULL
-pk package\source\manifest nmake - all pk_manifest pk_inc NULL
-pk package\source\xstor nmake - all pk_xstor pk_manifest pk_inc NULL
-pk package\util nmake - all pk_util pk_zipapi pk_zippackage pk_manifest pk_xstor NULL
-
+pk package\prj nmake - all pk_prj NULL
diff --git a/package/prj/d.lst b/package/prj/d.lst
index 7b3aff2..e69de29 100644
--- a/package/prj/d.lst
+++ b/package/prj/d.lst
@@ -1,12 +0,0 @@
-..\%__SRC%\misc\*.map %_DEST%\bin\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\dtd\*.dtd %_DEST%\bin\*.*
-..\%__SRC%\misc\package2.component %_DEST%\xml\package2.component
-..\%__SRC%\misc\xstor.component %_DEST%\xml\xstor.component
-..\inc\Inflater.hxx %_DEST%\inc\package\Inflater.hxx
-..\inc\Deflater.hxx %_DEST%\inc\package\Deflater.hxx
-..\inc\packagedllapi.hxx %_DEST%\inc\package\packagedllapi.hxx
diff --git a/package/prj/makefile.mk b/package/prj/makefile.mk
new file mode 100644
index 0000000..85b2566
--- /dev/null
+++ b/package/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$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/package/source/manifest/makefile.mk b/package/source/manifest/makefile.mk
deleted file mode 100644
index abc6184..0000000
--- a/package/source/manifest/makefile.mk
+++ /dev/null
@@ -1,55 +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=package
-TARGET=manifest
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES= \
- $(SLO)$/ManifestReader.obj \
- $(SLO)$/ManifestWriter.obj \
- $(SLO)$/ManifestImport.obj \
- $(SLO)$/ManifestExport.obj \
- $(SLO)$/Base64Codec.obj \
- $(SLO)$/UnoRegister.obj
-
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk
deleted file mode 100644
index 5c381ba..0000000
--- a/package/source/xstor/makefile.mk
+++ /dev/null
@@ -1,83 +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=package
-TARGET=xstor
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES = \
- $(SLO)$/ohierarchyholder.obj\
- $(SLO)$/ocompinstream.obj\
- $(SLO)$/oseekinstream.obj\
- $(SLO)$/owriteablestream.obj\
- $(SLO)$/xstorage.obj\
- $(SLO)$/xfactory.obj\
- $(SLO)$/disposelistener.obj\
- $(SLO)$/selfterminatefilestream.obj\
- $(SLO)$/switchpersistencestream.obj\
- $(SLO)$/register.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB)
-
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(TARGET).def
-
-SHL1IMPLIB=i$(SHL1TARGET)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-.ENDIF # L10N_framework
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/xstor.component
-
-$(MISC)/xstor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- xstor.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt xstor.component
diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp
deleted file mode 100644
index 7003307..0000000
--- a/package/source/xstor/xstor.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index 30318ce..1e42bdb 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_package.hxx"
-#include <Deflater.hxx>
+#include <package/Deflater.hxx>
#ifndef _ZLIB_H
#ifdef SYSTEM_ZLIB
#include <zlib.h>
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 40d2bee..1438b69 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_package.hxx"
-#include <Inflater.hxx>
+#include <package/Inflater.hxx>
#ifndef _ZLIB_H
#ifdef SYSTEM_ZLIB
#include <zlib.h>
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 43a6594..796c633 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -36,7 +36,7 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
-#include <Inflater.hxx>
+#include <package/Inflater.hxx>
#include <ZipEntry.hxx>
#include <CRC32.hxx>
#include <mutexholder.hxx>
diff --git a/package/source/zipapi/makefile.mk b/package/source/zipapi/makefile.mk
deleted file mode 100644
index 8a07d44..0000000
--- a/package/source/zipapi/makefile.mk
+++ /dev/null
@@ -1,62 +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=package
-TARGET=zipapi
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/package.pmk
-
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
-SLOFILES= \
- $(SLO)$/CRC32.obj \
- $(SLO)$/ByteChucker.obj \
- $(SLO)$/ByteGrabber.obj \
- $(SLO)$/blowfishcontext.obj \
- $(SLO)$/Inflater.obj \
- $(SLO)$/Deflater.obj \
- $(SLO)$/sha1context.obj \
- $(SLO)$/ZipEnumeration.obj \
- $(SLO)$/ZipFile.obj \
- $(SLO)$/ZipOutputStream.obj \
- $(SLO)$/XUnbufferedStream.obj
-
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/package/source/zippackage/makefile.mk b/package/source/zippackage/makefile.mk
deleted file mode 100644
index c729b94..0000000
--- a/package/source/zippackage/makefile.mk
+++ /dev/null
@@ -1,58 +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=package
-TARGET=zippackage
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES= \
- $(SLO)$/ZipPackage.obj \
- $(SLO)$/ZipPackageBuffer.obj \
- $(SLO)$/ZipPackageEntry.obj \
- $(SLO)$/ZipPackageFolder.obj \
- $(SLO)$/ZipPackageFolderEnumeration.obj \
- $(SLO)$/ZipPackageSink.obj \
- $(SLO)$/ZipPackageStream.obj \
- $(SLO)$/wrapstreamforshare.obj \
- $(SLO)$/zipfileaccess.obj
-
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/package/util/exports.dxp b/package/util/exports.dxp
deleted file mode 100644
index 7003307..0000000
--- a/package/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/package/util/makefile.mk b/package/util/makefile.mk
deleted file mode 100644
index cf94fe8..0000000
--- a/package/util/makefile.mk
+++ /dev/null
@@ -1,89 +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.
-#
-#*************************************************************************
-
-# 2 == Unicode
-MAJOR_VERSION=2
-
-PRJ=..
-PRJNAME=package
-TARGET=package
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(L10N_framework)"==""
-
-# --- General ----------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES= \
- $(SLB)$/zipapi.lib \
- $(SLB)$/zippackage.lib \
- $(SLB)$/manifest.lib
-
-# --- Shared-Library -----------------------------------------------
-
-SHL1TARGET=$(TARGET)$(MAJOR_VERSION)
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
-SHL1IMPLIB=$(TARGET)$(MAJOR_VERSION)
-.ENDIF
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(SALLIB) \
- $(ZLIB3RDLIB)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # L10N_framework
-
-# --- Targets ----------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/package2.component
-
-$(MISC)/package2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- package2.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt package2.component
diff --git a/package/util/package.pmk b/package/util/package.pmk
deleted file mode 100644
index 7d3d412..0000000
--- a/package/util/package.pmk
+++ /dev/null
@@ -1,2 +0,0 @@
-VISIBILITY_HIDDEN = TRUE
-CDEFS += -DDLLIMPLEMENTATION_PACKAGE
\ No newline at end of file
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c23da77..959492f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -76,6 +76,8 @@ my_components = \
component/linguistic/source/lng \
component/lotuswordpro/util/lwpfilter \
component/oox/util/oox \
+ component/package/source/xstor/xstor \
+ component/package/util/package2 \
component/reportdesign/util/rpt \
component/reportdesign/util/rptui \
component/reportdesign/util/rptxml \
@@ -151,7 +153,6 @@ my_components = \
odfflatxml \
offacc \
oooimprovecore \
- package2 \
pcr \
pdffilter \
placeware \
@@ -186,7 +187,6 @@ my_components = \
xmx \
xsltdlg \
xsltfilter \
- xstor
.IF "$(DISABLE_PYTHON)" != "TRUE"
my_components += pythonloader
diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_test_filters.mk
index d503a47..6a52e2c 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_test_filters.mk
@@ -94,10 +94,10 @@ $(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
fileaccess/source/fileacc \
comphelper/util/comphelp \
i18npool/util/i18npool \
+ package/util/package2 \
))
$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
- package2 \
ucb1 \
ucpfile1 \
))
diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk
index 18a2e2a..7098fcb 100644
--- a/sw/CppunitTest_sw_test_filters.mk
+++ b/sw/CppunitTest_sw_test_filters.mk
@@ -96,10 +96,10 @@ $(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
fileaccess/source/fileacc \
comphelper/util/comphelp \
i18npool/util/i18npool \
+ package/util/package2 \
))
$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
- package2 \
ucb1 \
ucpfile1 \
))
More information about the Libreoffice-commits
mailing list