openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1827880 - in /openoffice/trunk/main: ./ cosv/ cosv/prj/ cosv/source/comphelp/ cosv/source/service/ cosv/source/storage/ cosv/source/strings/ cosv/util/ vos/ vos/inc/vos/ vos/prj/ vos/source/ vos/util/
Date Wed, 28 Mar 2018 05:28:31 GMT
Author: damjan
Date: Wed Mar 28 05:28:31 2018
New Revision: 1827880

URL: http://svn.apache.org/viewvc?rev=1827880&view=rev
Log:
Port main/cosv and mac/vos to gbuild.

Patch by: me


Added:
    openoffice/trunk/main/cosv/Makefile
    openoffice/trunk/main/cosv/Module_cosv.mk
    openoffice/trunk/main/cosv/Package_inc.mk
    openoffice/trunk/main/cosv/StaticLibrary_cosv.mk
    openoffice/trunk/main/cosv/prj/makefile.mk
    openoffice/trunk/main/vos/Library_vos3.mk
    openoffice/trunk/main/vos/Makefile
    openoffice/trunk/main/vos/Module_vos.mk
    openoffice/trunk/main/vos/Package_inc.mk
    openoffice/trunk/main/vos/inc/vos/vosdllapi.h
    openoffice/trunk/main/vos/prj/makefile.mk
Removed:
    openoffice/trunk/main/cosv/source/comphelp/makefile.mk
    openoffice/trunk/main/cosv/source/service/makefile.mk
    openoffice/trunk/main/cosv/source/storage/makefile.mk
    openoffice/trunk/main/cosv/source/strings/makefile.mk
    openoffice/trunk/main/cosv/util/makefile.mk
    openoffice/trunk/main/vos/source/makefile.mk
    openoffice/trunk/main/vos/util/
    openoffice/trunk/main/vos/version.mk
Modified:
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/cosv/prj/build.lst
    openoffice/trunk/main/cosv/prj/d.lst
    openoffice/trunk/main/vos/inc/vos/conditn.hxx
    openoffice/trunk/main/vos/inc/vos/module.hxx
    openoffice/trunk/main/vos/inc/vos/mutex.hxx
    openoffice/trunk/main/vos/inc/vos/object.hxx
    openoffice/trunk/main/vos/inc/vos/pipe.hxx
    openoffice/trunk/main/vos/inc/vos/process.hxx
    openoffice/trunk/main/vos/inc/vos/refernce.hxx
    openoffice/trunk/main/vos/inc/vos/security.hxx
    openoffice/trunk/main/vos/inc/vos/signal.hxx
    openoffice/trunk/main/vos/inc/vos/socket.hxx
    openoffice/trunk/main/vos/inc/vos/stream.hxx
    openoffice/trunk/main/vos/inc/vos/thread.hxx
    openoffice/trunk/main/vos/inc/vos/timer.hxx
    openoffice/trunk/main/vos/inc/vos/xception.hxx
    openoffice/trunk/main/vos/prj/build.lst
    openoffice/trunk/main/vos/prj/d.lst

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Wed Mar 28 05:28:31 2018
@@ -253,6 +253,7 @@ $(eval $(call gb_Helper_register_static_
 	codemaker \
 	commoncpp \
 	commonjava \
+	cosv \
 	ooopathutils \
 	salcpprt \
 	sldshw_s \

Added: openoffice/trunk/main/cosv/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/Makefile?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/cosv/Makefile (added)
+++ openoffice/trunk/main/cosv/Makefile Wed Mar 28 05:28:31 2018
@@ -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:

Added: openoffice/trunk/main/cosv/Module_cosv.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/Module_cosv.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/cosv/Module_cosv.mk (added)
+++ openoffice/trunk/main/cosv/Module_cosv.mk Wed Mar 28 05:28:31 2018
@@ -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,cosv))
+
+$(eval $(call gb_Module_add_targets,cosv,\
+	StaticLibrary_cosv \
+	Package_inc \
+))
+
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/cosv/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/Package_inc.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/cosv/Package_inc.mk (added)
+++ openoffice/trunk/main/cosv/Package_inc.mk Wed Mar 28 05:28:31 2018
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  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,cosv_inc,$(SRCDIR)/cosv/inc/cosv))
+
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/file.hxx,file.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/bstream.hxx,bstream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc_dir.hxx,ploc_dir.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/openclose.hxx,openclose.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comfunc.hxx,comfunc.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/datetime.hxx,datetime.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/mbstream.hxx,mbstream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_precomp.h,csv_precomp.h))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_ostream.hxx,csv_ostream.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/streamstr.hxx,streamstr.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/x.hxx,x.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/stringdata.hxx,stringdata.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/commandline.hxx,commandline.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/str_types.hxx,str_types.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/plocroot.hxx,plocroot.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/persist.hxx,persist.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc.hxx,ploc.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_env.hxx,csv_env.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/string.hxx,string.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comdline.hxx,comdline.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/dirchain.hxx,dirchain.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/std_outp.hxx,std_outp.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/tpltools.hxx,tpl/tpltools.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/range.hxx,tpl/range.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/dyn.hxx,tpl/dyn.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/funcall.hxx,tpl/funcall.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/swelist.hxx,tpl/swelist.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/vvector.hxx,tpl/vvector.hxx))
+$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/processor.hxx,tpl/processor.hxx))

Added: openoffice/trunk/main/cosv/StaticLibrary_cosv.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/StaticLibrary_cosv.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/cosv/StaticLibrary_cosv.mk (added)
+++ openoffice/trunk/main/cosv/StaticLibrary_cosv.mk Wed Mar 28 05:28:31 2018
@@ -0,0 +1,63 @@
+###############################################################
+#  
+#  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_StaticLibrary_StaticLibrary,cosv))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,cosv,cosv_inc))
+
+#$(eval $(call gb_StaticLibrary_add_api,cosv,\
+#	udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_StaticLibrary_set_include,cosv,\
+	-I$(SRCDIR)/cosv/inc \
+	-I$(SRCDIR)/cosv/source/inc \
+	$$(INCLUDE) \
+))
+
+#$(eval $(call gb_StaticLibrary_add_defs,cosv,\
+#	-DBASEGFX_STATICLIBRARY \
+#))
+
+# copied sources are generated cxx sources
+$(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\
+	cosv/source/service/comdline \
+	cosv/source/service/comfunc \
+	cosv/source/service/csv_ostream \
+	cosv/source/service/datetime \
+	cosv/source/service/std_outp \
+	cosv/source/storage/dirchain \
+	cosv/source/storage/file \
+	cosv/source/storage/mbstream \
+	cosv/source/storage/persist \
+	cosv/source/storage/ploc \
+	cosv/source/storage/ploc_dir \
+	cosv/source/storage/plocroot \
+	cosv/source/strings/str_types \
+	cosv/source/strings/streamstr \
+	cosv/source/strings/string \
+	cosv/source/comphelp/badcast \
+))
+
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/cosv/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/prj/build.lst?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/cosv/prj/build.lst (original)
+++ openoffice/trunk/main/cosv/prj/build.lst Wed Mar 28 05:28:31 2018
@@ -1,15 +1,4 @@
 cs	cosv	:  soltools stlport NULL
-cs	cosv								usr1	-	all	cs_mkout NULL
-cs	cosv\prj							get		-	all	cs_prj NULL
-cs	cosv\inc							get		-	all	cs_inc NULL
-cs	cosv\inc\cosv		  				get		-	all	cs_inc_cosv NULL
-cs	cosv\inc\cosv\template				get		-	all	cs_inc_templ NULL
-cs	cosv\source							get		-	all	cs_src NULL
-cs	cosv\source\inc						get		-	all	cs_src_inc NULL
-cs	cosv\source\service					nmake	-	all	cs_serv NULL
-cs	cosv\source\storage					nmake	-	all	cs_store NULL
-cs	cosv\source\strings					nmake	-	all	cs_string NULL
-cs	cosv\source\comphelp				nmake	-	all	cs_badcast NULL
-cs	cosv\util						    nmake	-	all	cs_util cs_serv cs_store cs_string cs_badcast NULL
+cs	cosv\prj							nmake		-	all	cs_prj NULL
 #==============================================================================================
 

Modified: openoffice/trunk/main/cosv/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/prj/d.lst?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/cosv/prj/d.lst (original)
+++ openoffice/trunk/main/cosv/prj/d.lst Wed Mar 28 05:28:31 2018
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\cosv
-mkdir: %_DEST%\inc%_EXT%\cosv\tpl
-
-..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib
-..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a
-..\inc\cosv\*.hxx %_DEST%\inc%_EXT%\cosv\*.hxx
-..\inc\cosv\*.h %_DEST%\inc%_EXT%\cosv\*.h
-..\inc\cosv\tpl\*.hxx %_DEST%\inc%_EXT%\cosv\tpl\*.hxx

Added: openoffice/trunk/main/cosv/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cosv/prj/makefile.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/cosv/prj/makefile.mk (added)
+++ openoffice/trunk/main/cosv/prj/makefile.mk Wed Mar 28 05:28:31 2018
@@ -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

Added: openoffice/trunk/main/vos/Library_vos3.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/Library_vos3.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/vos/Library_vos3.mk (added)
+++ openoffice/trunk/main/vos/Library_vos3.mk Wed Mar 28 05:28:31 2018
@@ -0,0 +1,73 @@
+#**************************************************************
+#  
+#  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,vos3))
+
+$(eval $(call gb_Library_add_package_headers,vos3,vos_inc))
+
+$(eval $(call gb_Library_set_include,vos3,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/vos/inc \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,vos3, \
+#        udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_Library_add_defs,vos3,\
+	-DVOS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vos3,\
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,vos3,\
+	ws2_32 \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,vos3,\
+	vos/source/conditn \
+	vos/source/module \
+	vos/source/mutex \
+	vos/source/object \
+	vos/source/pipe \
+	vos/source/process \
+	vos/source/refernce \
+	vos/source/security \
+	vos/source/signal \
+	vos/source/socket \
+	vos/source/stream \
+	vos/source/thread \
+	vos/source/timer \
+	vos/source/xception \
+))
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/vos/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/Makefile?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/vos/Makefile (added)
+++ openoffice/trunk/main/vos/Makefile Wed Mar 28 05:28:31 2018
@@ -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:

Added: openoffice/trunk/main/vos/Module_vos.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/Module_vos.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/vos/Module_vos.mk (added)
+++ openoffice/trunk/main/vos/Module_vos.mk Wed Mar 28 05:28:31 2018
@@ -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,vos))
+
+$(eval $(call gb_Module_add_targets,vos,\
+	Library_vos3 \
+	Package_inc \
+))
+
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/vos/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/Package_inc.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/vos/Package_inc.mk (added)
+++ openoffice/trunk/main/vos/Package_inc.mk Wed Mar 28 05:28:31 2018
@@ -0,0 +1,51 @@
+#**************************************************************
+#  
+#  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,vos_inc,$(SRCDIR)/vos/inc/vos))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/conditn.hxx,conditn.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/connectn.hxx,connectn.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/diagnose.hxx,diagnose.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/execabl.hxx,execabl.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/istream.hxx,istream.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/macros.hxx,macros.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/module.hxx,module.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/mutex.hxx,mutex.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/object.hxx,object.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/pipe.hxx,pipe.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/process.hxx,process.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/ref.hxx,ref.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/ref.inl,ref.inl))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/refernce.hxx,refernce.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/refobj.hxx,refobj.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/refobj.inl,refobj.inl))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/runnable.hxx,runnable.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/security.hxx,security.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/signal.hxx,signal.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/socket.hxx,socket.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/stream.hxx,stream.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/thread.hxx,thread.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/timer.hxx,timer.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/types.hxx,types.hxx))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/vosdllapi.h,vosdllapi.h))
+$(eval $(call gb_Package_add_file,vos_inc,inc/vos/xception.hxx,xception.hxx))
+

Modified: openoffice/trunk/main/vos/inc/vos/conditn.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/conditn.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/conditn.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/conditn.hxx Wed Mar 28 05:28:31 2018
@@ -30,6 +30,7 @@
 #endif
 #include <osl/time.h>
 #	include <vos/object.hxx>
+#	include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -93,7 +94,7 @@ public:
 	@version 1.0
 
 */
-class OCondition : public OObject, public ICondition
+class VOS_DLLPUBLIC OCondition : public OObject, public ICondition
 {
 
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OCondition, vos));

Modified: openoffice/trunk/main/vos/inc/vos/module.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/module.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/module.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/module.hxx Wed Mar 28 05:28:31 2018
@@ -28,11 +28,12 @@
 #   include <vos/object.hxx>
 #   include <rtl/ustring.hxx>
 #   include <osl/module.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
 
-class OModule : public OObject
+class VOS_DLLPUBLIC OModule : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OModule, vos));
 

Modified: openoffice/trunk/main/vos/inc/vos/mutex.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/mutex.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/mutex.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/mutex.hxx Wed Mar 28 05:28:31 2018
@@ -27,6 +27,7 @@
 #	include <vos/types.hxx>
 #	include <vos/object.hxx>
 #	include <osl/mutex.h>
+#	include <vos/vosdllapi.h>
 
 namespace vos
 {     
@@ -65,7 +66,7 @@ protected:
 	@version 1.0
 */
 
-class OMutex : public OObject, public IMutex
+class VOS_DLLPUBLIC OMutex : public OObject, public IMutex
 {
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OMutex, vos));
 

Modified: openoffice/trunk/main/vos/inc/vos/object.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/object.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/object.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/object.hxx Wed Mar 28 05:28:31 2018
@@ -27,6 +27,7 @@
 
 #	include <vos/types.hxx>
 #	include <vos/macros.hxx>
+#	include <vos/vosdllapi.h>
 
 namespace vos
 {     
@@ -41,7 +42,7 @@ struct OCreateParam;
 	common base class for all framework classes. Used for memory-management
 	and runtime type-info.
 */
-class OObject
+class VOS_DLLPUBLIC OObject
 {
 public:
 
@@ -107,7 +108,7 @@ struct OCreateParam
 
 /**
 */
-struct OClassInfo
+struct VOS_DLLPUBLIC OClassInfo
 {
 	///
 	const sal_Char  *m_pClassName;

Modified: openoffice/trunk/main/vos/inc/vos/pipe.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/pipe.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/pipe.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/pipe.hxx Wed Mar 28 05:28:31 2018
@@ -44,7 +44,7 @@ class OStreamPipe;
 
 /** Represents a pipe.
 */
-class OPipe : public vos::OReference,
+class VOS_DLLPUBLIC OPipe : public vos::OReference,
               public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(vos::OPipe);
@@ -187,7 +187,7 @@ public:
 
 /** A pipe to send or receive a stream of data.
 */
-class OStreamPipe : public vos::OPipe,
+class VOS_DLLPUBLIC OStreamPipe : public vos::OPipe,
                     public vos::IStream
 {
     VOS_DECLARE_CLASSINFO(vos::OStreamPipe);

Modified: openoffice/trunk/main/vos/inc/vos/process.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/process.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/process.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/process.hxx Wed Mar 28 05:28:31 2018
@@ -30,6 +30,7 @@
 #   include <vos/object.hxx>
 #   include <vos/socket.hxx>
 #   include <osl/process.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -38,7 +39,7 @@ class OProcess;
 
 /** helper class to fill a vector of command line arguments
  */
-class OArgumentList
+class VOS_DLLPUBLIC OArgumentList
 {
     sal_uInt32 n_Args;
     rtl_uString** m_aVec;
@@ -61,7 +62,7 @@ public:
 
 /** helper class to fill a vector of environment settings
  */
-class OEnvironment
+class VOS_DLLPUBLIC OEnvironment
 {
     sal_Int32 n_Vars;
     rtl_uString** m_aVec;
@@ -91,7 +92,7 @@ public:
     <li>setting user rights and security,
     <li>providing ioresources like file descriptors and sockets.</ul>
 */
-class OProcess : public OObject
+class VOS_DLLPUBLIC OProcess : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OProcess, vos));
 
@@ -218,7 +219,7 @@ protected:
 */
 
 
-class OStartupInfo : public OObject
+class VOS_DLLPUBLIC OStartupInfo : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStartupInfo, vos));
 
@@ -277,7 +278,7 @@ public:
 
 class OExtCommandLineImpl;
 
-class OExtCommandLine : public OObject
+class VOS_DLLPUBLIC OExtCommandLine : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OExtCommandLine, vos));
     static vos::OExtCommandLineImpl* pExtImpl;

Modified: openoffice/trunk/main/vos/inc/vos/refernce.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/refernce.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/refernce.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/refernce.hxx Wed Mar 28 05:28:31 2018
@@ -27,6 +27,7 @@
 #	include <vos/types.hxx>
 #	include <osl/interlck.h>
 #	include <vos/object.hxx>
+#	include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -48,7 +49,7 @@ public:
 	virtual RefCount SAL_CALL referenced() const=0;
 };
 
-class ORefCount
+class VOS_DLLPUBLIC ORefCount
 {
 public:
 	typedef IReference::RefCount RefCount;
@@ -78,7 +79,7 @@ private:
 	ORefCount& SAL_CALL operator= (const ORefCount&);
 };
 
-class OReference : public vos::IReference
+class VOS_DLLPUBLIC OReference : public vos::IReference
 {
 public:
 	OReference();

Modified: openoffice/trunk/main/vos/inc/vos/security.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/security.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/security.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/security.hxx Wed Mar 28 05:28:31 2018
@@ -27,6 +27,7 @@
 #   include <vos/object.hxx>
 #   include <rtl/ustring.hxx>
 #   include <osl/security.h>
+#   include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -39,7 +40,7 @@ namespace vos
     @version 1.0
 
 */
-class OSecurity : public OObject
+class VOS_DLLPUBLIC OSecurity : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OSecurity, vos));
 

Modified: openoffice/trunk/main/vos/inc/vos/signal.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/signal.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/signal.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/signal.hxx Wed Mar 28 05:28:31 2018
@@ -28,6 +28,7 @@
 #	include <vos/types.hxx>
 #	include <vos/object.hxx>
 #	include <osl/signal.h>
+#	include <vos/vosdllapi.h>
 
 namespace vos
 {
@@ -42,7 +43,7 @@ SignalHandlerFunction_impl signalHandler
 	@version 1.0
 */
 
-class OSignalHandler : public vos::OObject
+class VOS_DLLPUBLIC OSignalHandler : public vos::OObject
 {
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OSignalHandler, vos));
 

Modified: openoffice/trunk/main/vos/inc/vos/socket.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/socket.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/socket.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/socket.hxx Wed Mar 28 05:28:31 2018
@@ -33,6 +33,7 @@
 #   include <vos/refobj.hxx>
 #   include <rtl/ustring.hxx>
 #   include <osl/socket.h>
+#   include <vos/vosdllapi.h>
 
 #include <osl/time.h>
 
@@ -198,7 +199,7 @@ public:
     virtual sal_Bool SAL_CALL operator== (oslSocketAddr Addr)= 0;
 };
 
-class OSocketAddr : public vos::ISocketAddr,
+class VOS_DLLPUBLIC OSocketAddr : public vos::ISocketAddr,
             public vos::OObject
 
 {
@@ -270,7 +271,7 @@ protected:
 
 /** Represents an internet-address.
 */
-class OInetSocketAddr : public vos::OSocketAddr
+class VOS_DLLPUBLIC OInetSocketAddr : public vos::OSocketAddr
 {
     VOS_DECLARE_CLASSINFO(vos::OInetSocketAddr);
 public:
@@ -355,7 +356,7 @@ public:
 
 /** Represents an IPX/SPX address.
 */
-class OIpxSocketAddr :  public vos::OSocketAddr
+class VOS_DLLPUBLIC OIpxSocketAddr :  public vos::OSocketAddr
 {
     VOS_DECLARE_CLASSINFO(vos::OIpxSocketAddr);
 public:
@@ -426,7 +427,7 @@ public:
 
 /** Represents a socket.
 */
-class OSocket : public vos::ISocketTypes,
+class VOS_DLLPUBLIC OSocket : public vos::ISocketTypes,
                 public vos::OReference,
                 public vos::OObject
 {
@@ -805,7 +806,7 @@ public:
 
 /** A socket to send or receive a stream of data.
 */
-class OStreamSocket : public vos::OSocket,
+class VOS_DLLPUBLIC OStreamSocket : public vos::OSocket,
                       public vos::IStream
 {
     VOS_DECLARE_CLASSINFO(vos::OStreamSocket);
@@ -948,7 +949,7 @@ protected:
 
 /** A socket to accept incoming connections.
 */
-class OAcceptorSocket : public vos::OSocket
+class VOS_DLLPUBLIC OAcceptorSocket : public vos::OSocket
 {
     VOS_DECLARE_CLASSINFO(vos::OAcceptorSocket);
 public:
@@ -1010,7 +1011,7 @@ public:
 
 /** A socket to initiate a conenction.
 */
-class OConnectorSocket : public vos::OStreamSocket
+class VOS_DLLPUBLIC OConnectorSocket : public vos::OStreamSocket
 {
     VOS_DECLARE_CLASSINFO(vos::OConnectorSocket);
 public:
@@ -1046,7 +1047,7 @@ public:
 
 /** A connectionless socket to send and receive datagrams.
 */
-class ODatagramSocket : public vos::OSocket
+class VOS_DLLPUBLIC ODatagramSocket : public vos::OSocket
 {
     VOS_DECLARE_CLASSINFO(vos::ODatagramSocket);
 public:

Modified: openoffice/trunk/main/vos/inc/vos/stream.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/stream.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/stream.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/stream.hxx Wed Mar 28 05:28:31 2018
@@ -27,6 +27,7 @@
 #	include <vos/types.hxx>
 #	include <vos/object.hxx>
 #	include <vos/istream.hxx>
+#	include <vos/vosdllapi.h>
 
 namespace vos
 {     
@@ -71,7 +72,7 @@ protected:
 
 /** Implements IPositionableStream
 */
-class OStream : public vos::OObject, 
+class VOS_DLLPUBLIC OStream : public vos::OObject, 
 				public vos::IPositionableStream
 {
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStream, vos));

Modified: openoffice/trunk/main/vos/inc/vos/thread.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/thread.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/thread.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/thread.hxx Wed Mar 28 05:28:31 2018
@@ -29,6 +29,7 @@
 #	include <osl/thread.h>
 #	include <osl/conditn.h>
 #	include <vos/runnable.hxx>
+#	include <vos/vosdllapi.h>
 
 #include <osl/time.h>
 
@@ -49,7 +50,7 @@ ThreadWorkerFunction_impl threadWorkerFu
 	@version 1.0
 */
 
-class OThread : public vos::IRunnable,
+class VOS_DLLPUBLIC OThread : public vos::IRunnable,
 				public vos::OObject
 {
 
@@ -199,7 +200,7 @@ protected:
 	friend void threadWorkerFunction_impl(void *);
 };
 
-class OThreadData : public vos::OObject
+class VOS_DLLPUBLIC OThreadData : public vos::OObject
 {
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos));
 

Modified: openoffice/trunk/main/vos/inc/vos/timer.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/timer.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/timer.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/timer.hxx Wed Mar 28 05:28:31 2018
@@ -28,6 +28,7 @@
 #	include <vos/refernce.hxx>
 #	include <vos/mutex.hxx>
 #	include <osl/time.h>
+#	include <vos/vosdllapi.h>
 
 
 namespace vos
@@ -129,7 +130,7 @@ class OTimerManager;
 
 /** <code> class OTimer </code> : Interface for the Timer and handling the event
 */
-class OTimer : virtual public OReference , virtual public OObject
+class VOS_DLLPUBLIC OTimer : virtual public OReference , virtual public OObject
 {
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OTimer, vos));
 

Added: openoffice/trunk/main/vos/inc/vos/vosdllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/vosdllapi.h?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/vosdllapi.h (added)
+++ openoffice/trunk/main/vos/inc/vos/vosdllapi.h Wed Mar 28 05:28:31 2018
@@ -0,0 +1,37 @@
+/**************************************************************
+ * 
+ * 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 INCLUDED_VOSDLLAPI_H
+#define INCLUDED_VOSDLLAPI_H
+                                                                                        
                                    
+#include "sal/types.h"
+
+#if defined(VOS_DLLIMPLEMENTATION)
+#define VOS_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define VOS_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define VOS_DLLPRIVATE SAL_DLLPRIVATE
+                                                                                    
+#endif /* INCLUDED_VOSDLLAPI_H */
+

Modified: openoffice/trunk/main/vos/inc/vos/xception.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/inc/vos/xception.hxx?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/inc/vos/xception.hxx (original)
+++ openoffice/trunk/main/vos/inc/vos/xception.hxx Wed Mar 28 05:28:31 2018
@@ -25,6 +25,7 @@
 #define _XCEPTION_HXX_
 
 #include <vos/object.hxx>
+#include <vos/vosdllapi.h>
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4290 )
@@ -56,7 +57,7 @@ namespace vos
  * just a base class for further exceptions
  */
 
-class OException : public OObject
+class VOS_DLLPUBLIC OException : public OObject
 {
 	VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OException, vos));
 

Modified: openoffice/trunk/main/vos/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/prj/build.lst?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/prj/build.lst (original)
+++ openoffice/trunk/main/vos/prj/build.lst Wed Mar 28 05:28:31 2018
@@ -1,6 +1,2 @@
 vo	vos	:	sal solenv NULL
-vo	vos										usr1	-	all	vo_mkout NULL
-vo	vos\inc\vos								get		-	all	vo_inc NULL
-vo	vos\prj									get		-	all	vo_prj NULL
-vo	vos\source								nmake	-	all	vo_sou NULL
-vo	vos\util								nmake	-	all	vo_util vo_sou NULL
+vo	vos\prj									nmake		-	all	vo_prj NULL

Modified: openoffice/trunk/main/vos/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/prj/d.lst?rev=1827880&r1=1827879&r2=1827880&view=diff
==============================================================================
--- openoffice/trunk/main/vos/prj/d.lst (original)
+++ openoffice/trunk/main/vos/prj/d.lst Wed Mar 28 05:28:31 2018
@@ -1,16 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\vos
-..\version.mk %_DEST%\inc%_EXT%\vos\version.mk
-..\inc\vos\*.h %_DEST%\inc%_EXT%\vos\*.h
-..\inc\vos\*.hxx %_DEST%\inc%_EXT%\vos\*.hxx
-..\inc\vos\*.inl %_DEST%\inc%_EXT%\vos\*.inl
-
-..\%__SRC%\lib\avos.lib %_DEST%\lib%_EXT%\avos.lib
-..\%__SRC%\lib\ivos.lib %_DEST%\lib%_EXT%\ivos.lib
-..\%__SRC%\lib\vos*.lib %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\slb\cppvos.lib %_DEST%\lib%_EXT%\xvos.lib
-
-..\%__SRC%\bin\vos*.dll %_DEST%\bin%_EXT%\vos*.dll

Added: openoffice/trunk/main/vos/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vos/prj/makefile.mk?rev=1827880&view=auto
==============================================================================
--- openoffice/trunk/main/vos/prj/makefile.mk (added)
+++ openoffice/trunk/main/vos/prj/makefile.mk Wed Mar 28 05:28:31 2018
@@ -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



Mime
View raw message