openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1772542 - in /openoffice/trunk/main: ./ package/ package/inc/ package/inc/package/ package/prj/ package/source/manifest/ package/source/package/ package/source/package/manifest/ package/source/package/zipapi/ package/source/package/zippack...
Date Sun, 04 Dec 2016 15:13:32 GMT
Author: damjan
Date: Sun Dec  4 15:13:31 2016
New Revision: 1772542

URL: http://svn.apache.org/viewvc?rev=1772542&view=rev
Log:
Port main/package to gbuild.

Patch by: me


Added:
    openoffice/trunk/main/package/Library_package2.mk
    openoffice/trunk/main/package/Library_xstor.mk
    openoffice/trunk/main/package/Makefile   (with props)
    openoffice/trunk/main/package/Module_package.mk
    openoffice/trunk/main/package/Package_dtd.mk
    openoffice/trunk/main/package/inc/package/
    openoffice/trunk/main/package/inc/package/dllapi.h   (with props)
    openoffice/trunk/main/package/prj/makefile.mk
    openoffice/trunk/main/package/source/package/
    openoffice/trunk/main/package/source/package/manifest/
      - copied from r1772541, openoffice/trunk/main/package/source/manifest/
    openoffice/trunk/main/package/source/package/zipapi/
      - copied from r1772541, openoffice/trunk/main/package/source/zipapi/
    openoffice/trunk/main/package/source/package/zippackage/
      - copied from r1772541, openoffice/trunk/main/package/source/zippackage/
Removed:
    openoffice/trunk/main/package/inc/makefile.mk
    openoffice/trunk/main/package/source/manifest/
    openoffice/trunk/main/package/source/package/manifest/makefile.mk
    openoffice/trunk/main/package/source/package/zipapi/makefile.mk
    openoffice/trunk/main/package/source/package/zippackage/makefile.mk
    openoffice/trunk/main/package/source/xstor/makefile.mk
    openoffice/trunk/main/package/source/xstor/xstor.dxp
    openoffice/trunk/main/package/source/zipapi/
    openoffice/trunk/main/package/source/zippackage/
    openoffice/trunk/main/package/util/exports.dxp
    openoffice/trunk/main/package/util/makefile.mk
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/package/prj/build.lst
    openoffice/trunk/main/package/prj/d.lst
    openoffice/trunk/main/package/source/package/manifest/UnoRegister.cxx
    openoffice/trunk/main/package/source/xstor/register.cxx
    openoffice/trunk/main/postprocess/packcomponents/makefile.mk

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sun Dec  4 15:13:31 2016
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	oovbaapi \
 	oox \
 	padmin \
+	package \
 	reportdesign \
 	sax \
 	sd \

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sun Dec  4 15:13:31 2016
@@ -76,6 +76,7 @@ $(eval $(call gb_Helper_register_librari
 	odbc \
 	odbcbase \
 	oox \
+	package2 \
 	qstart_gtk \
 	rpt \
 	rptui \
@@ -117,6 +118,7 @@ $(eval $(call gb_Helper_register_librari
 	xcr \
 	xo \
 	xof \
+	xstor \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \

Added: openoffice/trunk/main/package/Library_package2.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/Library_package2.mk?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/Library_package2.mk (added)
+++ openoffice/trunk/main/package/Library_package2.mk Sun Dec  4 15:13:31 2016
@@ -0,0 +1,85 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,package2))
+
+$(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$(SRCDIR)/package/inc \
+	-I$(SRCDIR)/package/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,package2,\
+	-DPACKAGE_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,package2,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,package2,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	sax \
+	ucbhelper \
+	$(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_external,package2,zlib)
+
+$(eval $(call gb_Library_add_exception_objects,package2,\
+	package/source/package/manifest/ManifestReader \
+	package/source/package/manifest/ManifestWriter \
+	package/source/package/manifest/ManifestImport \
+	package/source/package/manifest/ManifestExport \
+	package/source/package/manifest/UnoRegister \
+	package/source/package/zipapi/CRC32 \
+	package/source/package/zipapi/ByteChucker \
+	package/source/package/zipapi/ByteGrabber \
+	package/source/package/zipapi/blowfishcontext \
+	package/source/package/zipapi/Inflater \
+	package/source/package/zipapi/Deflater \
+	package/source/package/zipapi/sha1context \
+	package/source/package/zipapi/ZipEnumeration \
+	package/source/package/zipapi/ZipFile \
+	package/source/package/zipapi/ZipOutputStream \
+	package/source/package/zipapi/XUnbufferedStream \
+	package/source/package/zippackage/ZipPackage \
+	package/source/package/zippackage/ZipPackageBuffer \
+	package/source/package/zippackage/ZipPackageEntry \
+	package/source/package/zippackage/ZipPackageFolder \
+	package/source/package/zippackage/ZipPackageFolderEnumeration \
+	package/source/package/zippackage/ZipPackageSink \
+	package/source/package/zippackage/ZipPackageStream \
+	package/source/package/zippackage/wrapstreamforshare \
+	package/source/package/zippackage/zipfileaccess \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/package/Library_xstor.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/Library_xstor.mk?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/Library_xstor.mk (added)
+++ openoffice/trunk/main/package/Library_xstor.mk Sun Dec  4 15:13:31 2016
@@ -0,0 +1,67 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(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$(SRCDIR)/package/inc \
+	-I$(SRCDIR)/package/inc/pch \
+))
+
+$(eval $(call gb_Library_add_defs,xstor,\
+	-DPACKAGE_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,xstor,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xstor,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,xstor,\
+	package/source/xstor/ohierarchyholder \
+	package/source/xstor/ocompinstream \
+	package/source/xstor/oseekinstream \
+	package/source/xstor/owriteablestream \
+	package/source/xstor/xstorage \
+	package/source/xstor/xfactory \
+	package/source/xstor/disposelistener \
+	package/source/xstor/selfterminatefilestream \
+	package/source/xstor/switchpersistencestream \
+	package/source/xstor/register \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/package/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/Makefile?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/Makefile (added)
+++ openoffice/trunk/main/package/Makefile Sun Dec  4 15:13:31 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the 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:

Propchange: openoffice/trunk/main/package/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/package/Module_package.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/Module_package.mk?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/Module_package.mk (added)
+++ openoffice/trunk/main/package/Module_package.mk Sun Dec  4 15:13:31 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,package))
+
+$(eval $(call gb_Module_add_targets,package,\
+	Library_package2 \
+	Library_xstor \
+	Package_dtd \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/package/Package_dtd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/Package_dtd.mk?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/Package_dtd.mk (added)
+++ openoffice/trunk/main/package/Package_dtd.mk Sun Dec  4 15:13:31 2016
@@ -0,0 +1,25 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd))
+$(eval $(call gb_Package_add_file,package_dtd,bin/Manifest.dtd,Manifest.dtd))

Added: openoffice/trunk/main/package/inc/package/dllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/inc/package/dllapi.h?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/inc/package/dllapi.h (added)
+++ openoffice/trunk/main/package/inc/package/dllapi.h Sun Dec  4 15:13:31 2016
@@ -0,0 +1,36 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+
+
+#ifndef PACKAGE_DLLAPI_H
+#define PACKAGE_DLLAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined PACKAGE_DLLIMPLEMENTATION
+#define PACKAGE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define PACKAGE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif

Propchange: openoffice/trunk/main/package/inc/package/dllapi.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openoffice/trunk/main/package/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/prj/build.lst?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/package/prj/build.lst (original)
+++ openoffice/trunk/main/package/prj/build.lst Sun Dec  4 15:13:31 2016
@@ -1,9 +1,2 @@
 pk	package	:	cppu cppuhelper comphelper ucbhelper sal sax 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

Modified: openoffice/trunk/main/package/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/prj/d.lst?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/package/prj/d.lst (original)
+++ openoffice/trunk/main/package/prj/d.lst Sun Dec  4 15:13:31 2016
@@ -1,7 +0,0 @@
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\misc\package2.component %_DEST%\xml%_EXT%\package2.component
-..\%__SRC%\misc\xstor.component %_DEST%\xml%_EXT%\xstor.component

Added: openoffice/trunk/main/package/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/prj/makefile.mk?rev=1772542&view=auto
==============================================================================
--- openoffice/trunk/main/package/prj/makefile.mk (added)
+++ openoffice/trunk/main/package/prj/makefile.mk Sun Dec  4 15:13:31 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
&& $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/trunk/main/package/source/package/manifest/UnoRegister.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/source/package/manifest/UnoRegister.cxx?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/package/source/package/manifest/UnoRegister.cxx (original)
+++ openoffice/trunk/main/package/source/package/manifest/UnoRegister.cxx Sun Dec  4 15:13:31
2016
@@ -33,6 +33,7 @@
 #include <ZipPackage.hxx>
 
 #include <zipfileaccess.hxx>
+#include "package/dllapi.h"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -45,7 +46,7 @@ using namespace ::com::sun::star::packag
 
 // C functions to implement this as a component
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" PACKAGE_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
 	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -58,7 +59,7 @@ extern "C" void SAL_CALL component_getIm
  * @param pRegistryKey registry data key to read and write component persistent data
  * @return a component factory (generic uno interface)
  */
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" PACKAGE_DLLPUBLIC void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;

Modified: openoffice/trunk/main/package/source/xstor/register.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/package/source/xstor/register.cxx?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/package/source/xstor/register.cxx (original)
+++ openoffice/trunk/main/package/source/xstor/register.cxx Sun Dec  4 15:13:31 2016
@@ -30,18 +30,19 @@
 #include <cppuhelper/factory.hxx>
 
 #include "xfactory.hxx"
+#include "package/dllapi.h"
 
 using namespace ::com::sun::star;
 
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment
** /*ppEnv*/ )
+PACKAGE_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char **
ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
 	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager,
void * /*pRegistryKey*/ )
+PACKAGE_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, void
* pServiceManager, void * /*pRegistryKey*/ )
 {
 	void * pRet = 0;
 	

Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772542&r1=1772541&r2=1772542&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sun Dec  4 15:13:31 2016
@@ -85,6 +85,8 @@ my_components = \
     component/io/source/TextOutputStream/textoutstream \
     component/linguistic/source/lng \
     component/oox/util/oox \
+    component/package/source/xstor/xstor \
+    component/package/util/package2 \
 	component/reportdesign/util/rptxml \
 	component/reportdesign/util/rpt \
 	component/reportdesign/util/rptui \
@@ -150,7 +152,6 @@ my_components = \
     odbc \
     offacc \
     oooimprovecore \
-    package2 \
     pcr \
     pdffilter \
     placeware \
@@ -192,7 +193,6 @@ my_components = \
     xmlfd \
     xmx \
     xsltdlg \
-    xstor \
     PresentationMinimizer \
     PresenterScreen
 



Mime
View raw message