diff options
author | Damjan Jovanovic <damjan@apache.org> | 2016-12-04 15:13:31 +0000 |
---|---|---|
committer | Damjan Jovanovic <damjan@apache.org> | 2016-12-04 15:13:31 +0000 |
commit | 4c5a2d096c9bf3b17552e8ee47de6b5aff7493bb (patch) | |
tree | f19301d8f6c4f5c2a1e44ea3ad87ada99ecaaf62 /package | |
parent | ecd7f6c5a3b5243d0d67c0d1ad2a215b07103c66 (diff) |
Port main/package to gbuild.
Patch by: me
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'package')
-rw-r--r-- | package/Library_package2.mk | 85 | ||||
-rw-r--r-- | package/Library_xstor.mk | 67 | ||||
-rw-r--r-- | package/Makefile | 32 | ||||
-rw-r--r-- | package/Module_package.mk (renamed from package/source/zippackage/makefile.mk) | 41 | ||||
-rw-r--r-- | package/Package_dtd.mk | 25 | ||||
-rw-r--r-- | package/inc/package/dllapi.h | 36 | ||||
-rw-r--r-- | package/prj/build.lst | 9 | ||||
-rw-r--r-- | package/prj/d.lst | 7 | ||||
-rw-r--r-- | package/prj/makefile.mk (renamed from package/inc/makefile.mk) | 41 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestDefines.hxx (renamed from package/source/manifest/ManifestDefines.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestExport.cxx (renamed from package/source/manifest/ManifestExport.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestExport.hxx (renamed from package/source/manifest/ManifestExport.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestImport.cxx (renamed from package/source/manifest/ManifestImport.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestImport.hxx (renamed from package/source/manifest/ManifestImport.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestReader.cxx (renamed from package/source/manifest/ManifestReader.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestReader.hxx (renamed from package/source/manifest/ManifestReader.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestWriter.cxx (renamed from package/source/manifest/ManifestWriter.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/ManifestWriter.hxx (renamed from package/source/manifest/ManifestWriter.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/UnoRegister.cxx (renamed from package/source/manifest/UnoRegister.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/manifest/makefile.mk (renamed from package/source/manifest/makefile.mk) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/ByteChucker.cxx (renamed from package/source/zipapi/ByteChucker.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/ByteGrabber.cxx (renamed from package/source/zipapi/ByteGrabber.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/CRC32.cxx (renamed from package/source/zipapi/CRC32.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/Deflater.cxx (renamed from package/source/zipapi/Deflater.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/Inflater.cxx (renamed from package/source/zipapi/Inflater.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/MemoryByteGrabber.hxx (renamed from package/source/zipapi/MemoryByteGrabber.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/XUnbufferedStream.cxx (renamed from package/source/zipapi/XUnbufferedStream.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/XUnbufferedStream.hxx (renamed from package/source/zipapi/XUnbufferedStream.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/ZipEnumeration.cxx (renamed from package/source/zipapi/ZipEnumeration.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/ZipFile.cxx (renamed from package/source/zipapi/ZipFile.cxx) | 4 | ||||
-rw-r--r-- | package/source/package/zipapi/ZipOutputStream.cxx (renamed from package/source/zipapi/ZipOutputStream.cxx) | 4 | ||||
-rw-r--r-- | package/source/package/zipapi/blowfishcontext.cxx (renamed from package/source/zipapi/blowfishcontext.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/blowfishcontext.hxx (renamed from package/source/zipapi/blowfishcontext.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/makefile.mk (renamed from package/source/zipapi/makefile.mk) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/sha1context.cxx (renamed from package/source/zipapi/sha1context.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zipapi/sha1context.hxx (renamed from package/source/zipapi/sha1context.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ContentInfo.hxx (renamed from package/source/zippackage/ContentInfo.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackage.cxx (renamed from package/source/zippackage/ZipPackage.cxx) | 12 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageBuffer.cxx (renamed from package/source/zippackage/ZipPackageBuffer.cxx) | 2 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageEntry.cxx (renamed from package/source/zippackage/ZipPackageEntry.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageFolder.cxx (renamed from package/source/zippackage/ZipPackageFolder.cxx) | 2 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageFolderEnumeration.cxx (renamed from package/source/zippackage/ZipPackageFolderEnumeration.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageFolderEnumeration.hxx (renamed from package/source/zippackage/ZipPackageFolderEnumeration.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageSink.cxx (renamed from package/source/zippackage/ZipPackageSink.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageSink.hxx (renamed from package/source/zippackage/ZipPackageSink.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/ZipPackageStream.cxx (renamed from package/source/zippackage/ZipPackageStream.cxx) | 8 | ||||
-rw-r--r-- | package/source/package/zippackage/wrapstreamforshare.cxx (renamed from package/source/zippackage/wrapstreamforshare.cxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/wrapstreamforshare.hxx (renamed from package/source/zippackage/wrapstreamforshare.hxx) | 0 | ||||
-rw-r--r-- | package/source/package/zippackage/zipfileaccess.cxx (renamed from package/source/zippackage/zipfileaccess.cxx) | 2 | ||||
-rw-r--r-- | package/source/xstor/makefile.mk | 79 | ||||
-rw-r--r-- | package/source/xstor/register.cxx | 5 | ||||
-rw-r--r-- | package/source/xstor/xstor.dxp | 2 | ||||
-rw-r--r-- | package/util/exports.dxp | 2 | ||||
-rw-r--r-- | package/util/makefile.mk | 82 |
54 files changed, 294 insertions, 253 deletions
diff --git a/package/Library_package2.mk b/package/Library_package2.mk new file mode 100644 index 000000000000..0aa945ccb31b --- /dev/null +++ b/package/Library_package2.mk @@ -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: diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk new file mode 100644 index 000000000000..6085addf0705 --- /dev/null +++ b/package/Library_xstor.mk @@ -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: diff --git a/package/Makefile b/package/Makefile new file mode 100644 index 000000000000..c1d144cbd4c9 --- /dev/null +++ b/package/Makefile @@ -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: diff --git a/package/source/zippackage/makefile.mk b/package/Module_package.mk index c914b9474e04..76c6a075d83c 100644 --- a/package/source/zippackage/makefile.mk +++ b/package/Module_package.mk @@ -21,39 +21,12 @@ -PRJ=..$/.. -PRJNAME=package -TARGET=zippackage -AUTOSEG=true +$(eval $(call gb_Module_Module,package)) -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Module_add_targets,package,\ + Library_package2 \ + Library_xstor \ + Package_dtd \ +)) -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(L10N_framework)"=="" - -# --- Files -------------------------------------------------------- -# the following flag un-inlines function calls and disables optimisations -#CFLAGS+=/Ob0 /Od - -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 - -# $(SLO)$/InteractionRequest.obj \ -# $(SLO)$/InteractionContinuation.obj - -.ENDIF # L10N_framework - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk new file mode 100644 index 000000000000..832d58336417 --- /dev/null +++ b/package/Package_dtd.mk @@ -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)) diff --git a/package/inc/package/dllapi.h b/package/inc/package/dllapi.h new file mode 100644 index 000000000000..ebac65b7196e --- /dev/null +++ b/package/inc/package/dllapi.h @@ -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 diff --git a/package/prj/build.lst b/package/prj/build.lst index b2d0d18aeabd..933e8e70aca3 100644 --- a/package/prj/build.lst +++ b/package/prj/build.lst @@ -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 diff --git a/package/prj/d.lst b/package/prj/d.lst index 919a1719aa09..e69de29bb2d1 100644 --- a/package/prj/d.lst +++ b/package/prj/d.lst @@ -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 diff --git a/package/inc/makefile.mk b/package/prj/makefile.mk index 0b73b2d66fa6..c62c6a657d16 100644 --- a/package/inc/makefile.mk +++ b/package/prj/makefile.mk @@ -20,24 +20,25 @@ #************************************************************** -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)"!="" +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 diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/package/manifest/ManifestDefines.hxx index c37c5a5ff53d..c37c5a5ff53d 100644 --- a/package/source/manifest/ManifestDefines.hxx +++ b/package/source/package/manifest/ManifestDefines.hxx diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/package/manifest/ManifestExport.cxx index 58a626d8dfc2..58a626d8dfc2 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/package/manifest/ManifestExport.cxx diff --git a/package/source/manifest/ManifestExport.hxx b/package/source/package/manifest/ManifestExport.hxx index dc613967b2a0..dc613967b2a0 100644 --- a/package/source/manifest/ManifestExport.hxx +++ b/package/source/package/manifest/ManifestExport.hxx diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/package/manifest/ManifestImport.cxx index aaf67bb94cb3..aaf67bb94cb3 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/package/manifest/ManifestImport.cxx diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/package/manifest/ManifestImport.hxx index 5ce953a4a4d8..5ce953a4a4d8 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/package/manifest/ManifestImport.hxx diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/package/manifest/ManifestReader.cxx index 2c214a0a3513..2c214a0a3513 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/package/manifest/ManifestReader.cxx diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/package/manifest/ManifestReader.hxx index 972832e90e38..972832e90e38 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/package/manifest/ManifestReader.hxx diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/package/manifest/ManifestWriter.cxx index ce81f94c0d8a..ce81f94c0d8a 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/package/manifest/ManifestWriter.cxx diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/package/manifest/ManifestWriter.hxx index ef51e722d01e..ef51e722d01e 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/package/manifest/ManifestWriter.hxx diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/package/manifest/UnoRegister.cxx index a886b2c17dd3..a886b2c17dd3 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/package/manifest/UnoRegister.cxx diff --git a/package/source/manifest/makefile.mk b/package/source/package/manifest/makefile.mk index 39804c29f401..39804c29f401 100644 --- a/package/source/manifest/makefile.mk +++ b/package/source/package/manifest/makefile.mk diff --git a/package/source/zipapi/ByteChucker.cxx b/package/source/package/zipapi/ByteChucker.cxx index dfd4f51985f9..dfd4f51985f9 100644 --- a/package/source/zipapi/ByteChucker.cxx +++ b/package/source/package/zipapi/ByteChucker.cxx diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/package/zipapi/ByteGrabber.cxx index 5f2e09c17ef0..5f2e09c17ef0 100644 --- a/package/source/zipapi/ByteGrabber.cxx +++ b/package/source/package/zipapi/ByteGrabber.cxx diff --git a/package/source/zipapi/CRC32.cxx b/package/source/package/zipapi/CRC32.cxx index baf639939fa3..baf639939fa3 100644 --- a/package/source/zipapi/CRC32.cxx +++ b/package/source/package/zipapi/CRC32.cxx diff --git a/package/source/zipapi/Deflater.cxx b/package/source/package/zipapi/Deflater.cxx index 7900fabfe556..7900fabfe556 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/package/zipapi/Deflater.cxx diff --git a/package/source/zipapi/Inflater.cxx b/package/source/package/zipapi/Inflater.cxx index baa3da1859aa..baa3da1859aa 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/package/zipapi/Inflater.cxx diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/package/zipapi/MemoryByteGrabber.hxx index 391996814575..391996814575 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/package/zipapi/MemoryByteGrabber.hxx diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/package/zipapi/XUnbufferedStream.cxx index 32b697f1800a..32b697f1800a 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/package/zipapi/XUnbufferedStream.cxx diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/package/zipapi/XUnbufferedStream.hxx index a491773e7211..a491773e7211 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/package/zipapi/XUnbufferedStream.hxx diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/package/zipapi/ZipEnumeration.cxx index 8358e1a43a4e..8358e1a43a4e 100644 --- a/package/source/zipapi/ZipEnumeration.cxx +++ b/package/source/package/zipapi/ZipEnumeration.cxx diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/package/zipapi/ZipFile.cxx index f2b8891a364b..e88bfc055168 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/package/zipapi/ZipFile.cxx @@ -480,7 +480,7 @@ sal_Bool ZipFile::StaticHasValidPassword( const uno::Reference< lang::XMultiServ if ( rData->m_aDigest.getLength() != 0 && ( aDigestSeq.getLength() != rData->m_aDigest.getLength() || 0 != rtl_compareMemory ( aDigestSeq.getConstArray(), - rData->m_aDigest.getConstArray(), + rData->m_aDigest.getConstArray(), aDigestSeq.getLength() ) ) ) { // We should probably tell the user that the password they entered was wrong @@ -913,7 +913,7 @@ sal_Int32 ZipFile::recover() // read always in UTF8, some tools seem not to set UTF8 bit if( nPos + 30 + aEntry.nPathLen <= nBufSize ) aEntry.sPath = OUString ( (sal_Char *) &pBuffer[nPos + 30], - aEntry.nPathLen, + aEntry.nPathLen, RTL_TEXTENCODING_UTF8 ); else { diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/package/zipapi/ZipOutputStream.cxx index d11824aaca15..9a34139f78ac 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/package/zipapi/ZipOutputStream.cxx @@ -197,7 +197,7 @@ void SAL_CALL ZipOutputStream::write( const Sequence< sal_Int8 >& rBuffer, sal_I if (!aDeflater.finished()) { aDeflater.setInputSegment(rBuffer, nNewOffset, nNewLength); - while (!aDeflater.needsInput()) + while (!aDeflater.needsInput()) doDeflate(); if (!bEncryptCurrentEntry) aCRC.updateSegment(rBuffer, nNewOffset, nNewLength); @@ -421,7 +421,7 @@ sal_uInt32 ZipOutputStream::getCurrentDosTime( ) ( 32 * (aDateTime.Month)) + ( 512 * nYear ) ) << 16) | ( ( aDateTime.Seconds/2) + - ( 32 * aDateTime.Minutes) + + ( 32 * aDateTime.Minutes) + ( 2048 * static_cast <sal_uInt32 > (aDateTime.Hours) ) ) ); return nResult; } diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/package/zipapi/blowfishcontext.cxx index ea7a5feff0f8..ea7a5feff0f8 100644 --- a/package/source/zipapi/blowfishcontext.cxx +++ b/package/source/package/zipapi/blowfishcontext.cxx diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/package/zipapi/blowfishcontext.hxx index 8a2e7248798c..8a2e7248798c 100644 --- a/package/source/zipapi/blowfishcontext.hxx +++ b/package/source/package/zipapi/blowfishcontext.hxx diff --git a/package/source/zipapi/makefile.mk b/package/source/package/zipapi/makefile.mk index d68dd1ceea46..d68dd1ceea46 100644 --- a/package/source/zipapi/makefile.mk +++ b/package/source/package/zipapi/makefile.mk diff --git a/package/source/zipapi/sha1context.cxx b/package/source/package/zipapi/sha1context.cxx index f68998613189..f68998613189 100644 --- a/package/source/zipapi/sha1context.cxx +++ b/package/source/package/zipapi/sha1context.cxx diff --git a/package/source/zipapi/sha1context.hxx b/package/source/package/zipapi/sha1context.hxx index d64cb87de940..d64cb87de940 100644 --- a/package/source/zipapi/sha1context.hxx +++ b/package/source/package/zipapi/sha1context.hxx diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/package/zippackage/ContentInfo.hxx index ac7463ebeb5a..ac7463ebeb5a 100644 --- a/package/source/zippackage/ContentInfo.hxx +++ b/package/source/package/zippackage/ContentInfo.hxx diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/package/zippackage/ZipPackage.cxx index 74e01690d52b..548f5b8c774e 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/package/zippackage/ZipPackage.cxx @@ -123,7 +123,7 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL ) pBroker->getContentProviderManagerInterface(); try { - aSystemPath = getSystemPathFromFileURL( xManager, aURL ); + aSystemPath = getSystemPathFromFileURL( xManager, aURL ); } catch ( Exception& ) { @@ -624,7 +624,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) m_aURL = aParamUrl.copy( 0, nParam ); OUString aParam = aParamUrl.copy( nParam + 1 ); - sal_Int32 nIndex = 0; + sal_Int32 nIndex = 0; do { ::rtl::OUString aCommand = aParam.getToken( 0, '&', nIndex ); @@ -1369,10 +1369,10 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() } OpenCommandArgument2 aArg; - aArg.Mode = OpenMode::DOCUMENT; - aArg.Priority = 0; // unused - aArg.Sink = xSink; - aArg.Properties = uno::Sequence< Property >( 0 ); // unused + aArg.Mode = OpenMode::DOCUMENT; + aArg.Priority = 0; // unused + aArg.Sink = xSink; + aArg.Properties = uno::Sequence< Property >( 0 ); // unused aOriginalContent.executeCommand( OUString::createFromAscii( "open" ), makeAny( aArg ) ); } diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/package/zippackage/ZipPackageBuffer.cxx index f7a773abd99b..4f09c3cda1d4 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/package/zippackage/ZipPackageBuffer.cxx @@ -97,7 +97,7 @@ void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData ) } else if (m_bMustInitBuffer) { - m_aBuffer.realloc ( static_cast < sal_Int32 > ( m_nBufferSize ) ); + m_aBuffer.realloc ( static_cast < sal_Int32 > ( m_nBufferSize ) ); m_bMustInitBuffer = sal_False; } memcpy( m_aBuffer.getArray() + m_nCurrent, aData.getConstArray(), static_cast < sal_Int32 > (nDataLen)); diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/package/zippackage/ZipPackageEntry.cxx index c9a7f67e731a..c9a7f67e731a 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/package/zippackage/ZipPackageEntry.cxx diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/package/zippackage/ZipPackageFolder.cxx index e9150fa90bfc..425180ac5166 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/package/zippackage/ZipPackageFolder.cxx @@ -169,7 +169,7 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair& void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource) { - rDest.nVersion = rSource.nVersion; + rDest.nVersion = rSource.nVersion; rDest.nFlag = rSource.nFlag; rDest.nMethod = rSource.nMethod; rDest.nTime = rSource.nTime; diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/package/zippackage/ZipPackageFolderEnumeration.cxx index 1a2f605ce6fa..1a2f605ce6fa 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx +++ b/package/source/package/zippackage/ZipPackageFolderEnumeration.cxx diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/package/zippackage/ZipPackageFolderEnumeration.hxx index 402d17690938..402d17690938 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/package/zippackage/ZipPackageFolderEnumeration.hxx diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/package/zippackage/ZipPackageSink.cxx index 93c06cd29200..93c06cd29200 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/package/zippackage/ZipPackageSink.cxx diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/package/zippackage/ZipPackageSink.hxx index 8422a0dacb6d..8422a0dacb6d 100644 --- a/package/source/zippackage/ZipPackageSink.hxx +++ b/package/source/package/zippackage/ZipPackageSink.hxx diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/package/zippackage/ZipPackageStream.cxx index c3bf013d54ae..1e43dbd7ea4c 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/package/zippackage/ZipPackageStream.cxx @@ -406,9 +406,9 @@ sal_Bool ZipPackageStream::ParsePackageRawStream() { const sal_Int8 *pHeader = aHeader.getConstArray(); sal_uInt32 nHeader = ( pHeader [0] & 0xFF ) | - ( pHeader [1] & 0xFF ) << 8 | - ( pHeader [2] & 0xFF ) << 16 | - ( pHeader [3] & 0xFF ) << 24; + ( pHeader [1] & 0xFF ) << 8 | + ( pHeader [2] & 0xFF ) << 16 | + ( pHeader [3] & 0xFF ) << 24; if ( nHeader == n_ConstHeader ) { // this is one of our god-awful, but extremely devious hacks, everyone cheer @@ -720,7 +720,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, if ( sMediaType.getLength() > 0 ) { if ( sMediaType.indexOf ( OUString( RTL_CONSTASCII_USTRINGPARAM ( "text" ) ) ) != -1 - || sMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM ( "application/vnd.sun.star.oleobject" ) ) ) ) + || sMediaType.equals( OUString( RTL_CONSTASCII_USTRINGPARAM ( "application/vnd.sun.star.oleobject" ) ) ) ) bToBeCompressed = sal_True; else if ( !m_bCompressedIsSetFromOutside ) bToBeCompressed = sal_False; diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/package/zippackage/wrapstreamforshare.cxx index 539fac0652a8..539fac0652a8 100644 --- a/package/source/zippackage/wrapstreamforshare.cxx +++ b/package/source/package/zippackage/wrapstreamforshare.cxx diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/package/zippackage/wrapstreamforshare.hxx index 2d5021e71a75..2d5021e71a75 100644 --- a/package/source/zippackage/wrapstreamforshare.hxx +++ b/package/source/package/zippackage/wrapstreamforshare.hxx diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/package/zippackage/zipfileaccess.cxx index 6df00f182bc4..9d762049d8df 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/package/zippackage/zipfileaccess.cxx @@ -390,7 +390,7 @@ void SAL_CALL OZipFileAccess::dispose() if ( m_pListenersContainer ) { - lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) ); + lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) ); m_pListenersContainer->disposeAndClear( aSource ); delete m_pListenersContainer; m_pListenersContainer = NULL; diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk deleted file mode 100644 index d68224164bf4..000000000000 --- a/package/source/xstor/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************** -# -# 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=..$/.. - -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/register.cxx b/package/source/xstor/register.cxx index fb6b9e09f623..1702e497e5c7 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -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; diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp deleted file mode 100644 index f0e1c69934bc..000000000000 --- a/package/source/xstor/xstor.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/package/util/exports.dxp b/package/util/exports.dxp deleted file mode 100644 index f0e1c69934bc..000000000000 --- a/package/util/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/package/util/makefile.mk b/package/util/makefile.mk deleted file mode 100644 index fe1911f8a259..000000000000 --- a/package/util/makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -#************************************************************** -# -# 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. -# -#************************************************************** - - - -# 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) -SHL1IMPLIB=i$(TARGET) -SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map - -SHL1STDLIBS=\ - $(CPPULIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(SALLIB) \ - $(ZLIB3RDLIB) \ - $(SAXLIB) - -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 |