Author: damjan
Date: Mon Aug 29 00:32:41 2016
New Revision: 1758161
URL: http://svn.apache.org/viewvc?rev=1758161&view=rev
Log:
Port main/fileaccess to gbuild.
Patch by: me
Added:
openoffice/trunk/main/fileaccess/Library_fileacc.mk
openoffice/trunk/main/fileaccess/Makefile (with props)
openoffice/trunk/main/fileaccess/Module_fileaccess.mk
openoffice/trunk/main/fileaccess/inc/
openoffice/trunk/main/fileaccess/inc/fileaccess/
openoffice/trunk/main/fileaccess/inc/fileaccess/dllapi.h (with props)
openoffice/trunk/main/fileaccess/prj/makefile.mk
openoffice/trunk/main/fileaccess/util/
openoffice/trunk/main/fileaccess/util/fileacc.component
- copied unchanged from r1758160,
openoffice/trunk/main/fileaccess/source/fileacc.component
Removed:
openoffice/trunk/main/fileaccess/source/fileacc.component
Modified:
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/fileaccess/prj/build.lst
openoffice/trunk/main/fileaccess/prj/d.lst
openoffice/trunk/main/fileaccess/source/FileAccess.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1758161&r1=1758160&r2=1758161&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Aug 29 00:32:41 2016
@@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_librari
svgio \
editeng \
file \
+ fileacc \
for \
forui \
fwe \
Added: openoffice/trunk/main/fileaccess/Library_fileacc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/Library_fileacc.mk?rev=1758161&view=auto
==============================================================================
--- openoffice/trunk/main/fileaccess/Library_fileacc.mk (added)
+++ openoffice/trunk/main/fileaccess/Library_fileacc.mk Mon Aug 29 00:32:41 2016
@@ -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:
Added: openoffice/trunk/main/fileaccess/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/Makefile?rev=1758161&view=auto
==============================================================================
--- openoffice/trunk/main/fileaccess/Makefile (added)
+++ openoffice/trunk/main/fileaccess/Makefile Mon Aug 29 00:32:41 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/fileaccess/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/fileaccess/Module_fileaccess.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/Module_fileaccess.mk?rev=1758161&view=auto
==============================================================================
--- openoffice/trunk/main/fileaccess/Module_fileaccess.mk (added)
+++ openoffice/trunk/main/fileaccess/Module_fileaccess.mk Mon Aug 29 00:32:41
2016
@@ -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:
Added: openoffice/trunk/main/fileaccess/inc/fileaccess/dllapi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/inc/fileaccess/dllapi.h?rev=1758161&view=auto
==============================================================================
--- openoffice/trunk/main/fileaccess/inc/fileaccess/dllapi.h (added)
+++ openoffice/trunk/main/fileaccess/inc/fileaccess/dllapi.h Mon Aug 29
00:32:41 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 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
Propchange: openoffice/trunk/main/fileaccess/inc/fileaccess/dllapi.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/main/fileaccess/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/prj/build.lst?rev=1758161&r1=1758160&r2=1758161&view=diff
==============================================================================
--- openoffice/trunk/main/fileaccess/prj/build.lst (original)
+++ openoffice/trunk/main/fileaccess/prj/build.lst Mon Aug 29 00:32:41 2016
@@ -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
Modified: openoffice/trunk/main/fileaccess/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/prj/d.lst?rev=1758161&r1=1758160&r2=1758161&view=diff
==============================================================================
--- openoffice/trunk/main/fileaccess/prj/d.lst (original)
+++ openoffice/trunk/main/fileaccess/prj/d.lst Mon Aug 29 00:32:41 2016
@@ -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
Added: openoffice/trunk/main/fileaccess/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/prj/makefile.mk?rev=1758161&view=auto
==============================================================================
--- openoffice/trunk/main/fileaccess/prj/makefile.mk (added)
+++ openoffice/trunk/main/fileaccess/prj/makefile.mk Mon Aug 29 00:32:41 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/fileaccess/source/FileAccess.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fileaccess/source/FileAccess.cxx?rev=1758161&r1=1758160&r2=1758161&view=diff
==============================================================================
--- openoffice/trunk/main/fileaccess/source/FileAccess.cxx (original)
+++ openoffice/trunk/main/fileaccess/source/FileAccess.cxx Mon Aug 29 00:32:41
2016
@@ -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_get
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;
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1758161&r1=1758160&r2=1758161&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Mon Aug 29
00:32:41 2016
@@ -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 \
