Repository.mk | 1
fileaccess/Library_fileacc.mk | 57 +++++++++++++++++++++++++++++++++
fileaccess/Makefile | 32 ++++++++++++++++++
fileaccess/Module_fileaccess.mk | 30 +++++++++++++++++
fileaccess/inc/fileaccess/dllapi.h | 36 ++++++++++++++++++++
fileaccess/prj/build.lst | 3 -
fileaccess/prj/d.lst | 6 ---
fileaccess/prj/makefile.mk | 44 +++++++++++++++++++++++++
fileaccess/source/FileAccess.cxx | 6 ++-
fileaccess/source/fileacc.component | 30 -----------------
fileaccess/util/fileacc.component | 30 +++++++++++++++++
postprocess/packcomponents/makefile.mk | 2 -
12 files changed, 236 insertions(+), 41 deletions(-)
New commits:
commit 9b3e00b30c23151aa1cdfc97b7ec935cbcb4d7e2
Author: Damjan Jovanovic <dam...@apache.org>
Date: Mon Aug 29 00:32:41 2016 +0000
Port main/fileaccess to gbuild.
Patch by: me
diff --git a/Repository.mk b/Repository.mk
index 0765379..fd3e491 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
svgio \
editeng \
file \
+ fileacc \
for \
forui \
fwe \
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
new file mode 100644
index 0000000..4faadc9
--- /dev/null
+++ b/fileaccess/Library_fileacc.mk
@@ -0,0 +1,57 @@
+#**************************************************************
+#
+# 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,fileacc))
+
+$(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/util/fileacc))
+
+$(eval $(call gb_Library_set_include,fileacc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fileaccess/inc \
+))
+
+$(eval $(call gb_Library_add_defs,fileacc,\
+ -DFILEACCESS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,fileacc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fileacc,\
+ utl \
+ tl \
+ ucbhelper \
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,fileacc,\
+ fileaccess/source/FileAccess \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fileaccess/Makefile b/fileaccess/Makefile
new file mode 100644
index 0000000..c1d144c
--- /dev/null
+++ b/fileaccess/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/fileaccess/Module_fileaccess.mk b/fileaccess/Module_fileaccess.mk
new file mode 100644
index 0000000..34d7cd4
--- /dev/null
+++ b/fileaccess/Module_fileaccess.mk
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# 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,fileaccess))
+
+$(eval $(call gb_Module_add_targets,fileaccess,\
+ Library_fileacc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fileaccess/inc/fileaccess/dllapi.h
b/fileaccess/inc/fileaccess/dllapi.h
new file mode 100644
index 0000000..e9c7446
--- /dev/null
+++ b/fileaccess/inc/fileaccess/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 FILEACCESS_DLLAPI_H
+#define FILEACCESS_DLLAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined FILEACCESS_DLLIMPLEMENTATION
+#define FILEACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define FILEACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst
index 0349810..b2a7425 100644
--- a/fileaccess/prj/build.lst
+++ b/fileaccess/prj/build.lst
@@ -1,3 +1,2 @@
fa fileaccess : unotools rdbmaker tools ucbhelper
LIBXSLT:libxslt NULL
-fa fileaccess
usr1 - all fa_mkout NULL
-fa fileaccess\source nmake
- all fa_src NULL
+fa fileaccess\prj nmake -
all fa_prj NULL
diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst
index c9b2bdd..e69de29 100644
--- a/fileaccess/prj/d.lst
+++ b/fileaccess/prj/d.lst
@@ -1,6 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml
-..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component
diff --git a/fileaccess/prj/makefile.mk b/fileaccess/prj/makefile.mk
new file mode 100644
index 0000000..c62c6a6
--- /dev/null
+++ b/fileaccess/prj/makefile.mk
@@ -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
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index b6f1be5..73300aa 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -24,6 +24,8 @@
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
+#include "fileaccess/dllapi.h"
+
#include <uno/mapping.hxx>
#include <cppuhelper/factory.hxx>
@@ -904,13 +906,13 @@ Sequence< rtl::OUString >
FileAccess_getSupportedServiceNames()
extern "C"
{
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+FILEACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+FILEACCESS_DLLPUBLIC void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void *
/*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/fileaccess/source/fileacc.component
b/fileaccess/util/fileacc.component
similarity index 100%
rename from fileaccess/source/fileacc.component
rename to fileaccess/util/fileacc.component
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index 328985d..7fd8163 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -78,6 +78,7 @@ my_components = \
component/dbaccess/util/dba \
component/dbaccess/util/dbu \
component/dbaccess/util/sdbt \
+ component/fileaccess/util/fileacc \
component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
@@ -129,7 +130,6 @@ my_components = \
dlgprov \
embobj \
evtatt \
- fileacc \
filterconfig1 \
flash \
flat \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
