Author: damjan
Date: Thu Dec 29 07:16:38 2016
New Revision: 1776380
URL: http://svn.apache.org/viewvc?rev=1776380&view=rev
Log:
Port main/i18nutil to gbuild.
Patch by: me
Added:
openoffice/trunk/main/i18nutil/Library_i18nutil.mk
openoffice/trunk/main/i18nutil/Makefile (with props)
openoffice/trunk/main/i18nutil/Module_i18nutil.mk
openoffice/trunk/main/i18nutil/Package_inc.mk
openoffice/trunk/main/i18nutil/inc/i18nutil/i18nutildllapi.h (with props)
openoffice/trunk/main/i18nutil/prj/makefile.mk
Removed:
openoffice/trunk/main/i18nutil/source/utility/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/i18nutil/inc/i18nutil/casefolding.hxx
openoffice/trunk/main/i18nutil/inc/i18nutil/oneToOneMapping.hxx
openoffice/trunk/main/i18nutil/inc/i18nutil/unicode.hxx
openoffice/trunk/main/i18nutil/inc/i18nutil/widthfolding.hxx
openoffice/trunk/main/i18nutil/prj/build.lst
openoffice/trunk/main/i18nutil/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Dec 29 07:16:38 2016
@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,o
formula \
fpicker \
framework \
+ i18nutil \
idl \
io \
javaunohelper \
Added: openoffice/trunk/main/i18nutil/Library_i18nutil.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/Library_i18nutil.mk?rev=1776380&view=auto
==============================================================================
--- openoffice/trunk/main/i18nutil/Library_i18nutil.mk (added)
+++ openoffice/trunk/main/i18nutil/Library_i18nutil.mk Thu Dec 29 07:16:38 2016
@@ -0,0 +1,60 @@
+#**************************************************************
+#
+# 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,i18nutil))
+
+$(eval $(call gb_Library_set_include,i18nutil,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/i18nutil/inc \
+))
+
+$(eval $(call gb_Library_add_defs,i18nutil,\
+ -DI18NUTIL_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,i18nutil,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,i18nutil,\
+ cppu \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,i18nutil,\
+ i18nutil/source/utility/casefolding \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,i18nutil,\
+ i18nutil/source/utility/unicode \
+ i18nutil/source/utility/widthfolding \
+ i18nutil/source/utility/oneToOneMapping \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/i18nutil/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/Makefile?rev=1776380&view=auto
==============================================================================
--- openoffice/trunk/main/i18nutil/Makefile (added)
+++ openoffice/trunk/main/i18nutil/Makefile Thu Dec 29 07:16:38 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/i18nutil/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/i18nutil/Module_i18nutil.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/Module_i18nutil.mk?rev=1776380&view=auto
==============================================================================
--- openoffice/trunk/main/i18nutil/Module_i18nutil.mk (added)
+++ openoffice/trunk/main/i18nutil/Module_i18nutil.mk Thu Dec 29 07:16:38 2016
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# 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,i18nutil))
+
+$(eval $(call gb_Module_add_targets,i18nutil,\
+ Library_i18nutil \
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/i18nutil/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/Package_inc.mk?rev=1776380&view=auto
==============================================================================
--- openoffice/trunk/main/i18nutil/Package_inc.mk (added)
+++ openoffice/trunk/main/i18nutil/Package_inc.mk Thu Dec 29 07:16:38 2016
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# 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,i18nutil_inc,$(SRCDIR)/i18nutil/inc/i18nutil))
+
+$(eval $(call
gb_Package_add_file,i18nutil_inc,inc/i18nutil/i18nutildllapi.h,i18nutildllapi.h))
+$(eval $(call
gb_Package_add_file,i18nutil_inc,inc/i18nutil/casefolding.hxx,casefolding.hxx))
+$(eval $(call
gb_Package_add_file,i18nutil_inc,inc/i18nutil/oneToOneMapping.hxx,oneToOneMapping.hxx))
+$(eval $(call
gb_Package_add_file,i18nutil_inc,inc/i18nutil/unicode.hxx,unicode.hxx))
+$(eval $(call
gb_Package_add_file,i18nutil_inc,inc/i18nutil/widthfolding.hxx,widthfolding.hxx))
+$(eval $(call
gb_Package_add_file,i18nutil_inc,inc/i18nutil/x_rtl_ustring.h,x_rtl_ustring.h))
Modified: openoffice/trunk/main/i18nutil/inc/i18nutil/casefolding.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/inc/i18nutil/casefolding.hxx?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/inc/i18nutil/casefolding.hxx (original)
+++ openoffice/trunk/main/i18nutil/inc/i18nutil/casefolding.hxx Thu Dec 29
07:16:38 2016
@@ -27,6 +27,7 @@
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
+#include "i18nutil/i18nutildllapi.h"
namespace com { namespace sun { namespace star { namespace i18n {
@@ -66,7 +67,7 @@ struct MappingElement
sal_Int8 current;
};
-class casefolding
+class I18NUTIL_DLLPUBLIC casefolding
{
public:
static Mapping& getValue(const sal_Unicode* str, sal_Int32 pos,
sal_Int32 len, com::sun::star::lang::Locale& aLocale, sal_uInt8 nMappingType)
throw (com::sun::star::uno::RuntimeException);
Added: openoffice/trunk/main/i18nutil/inc/i18nutil/i18nutildllapi.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/inc/i18nutil/i18nutildllapi.h?rev=1776380&view=auto
==============================================================================
--- openoffice/trunk/main/i18nutil/inc/i18nutil/i18nutildllapi.h (added)
+++ openoffice/trunk/main/i18nutil/inc/i18nutil/i18nutildllapi.h Thu Dec 29
07:16:38 2016
@@ -0,0 +1,34 @@
+/**************************************************************
+ *
+ * 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_I18NUTILDLLAPI_H
+#define INCLUDED_I18NUTILDLLAPI_H
+
+#if defined I18NUTIL_DLLIMPLEMENTATION
+#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define I18NUTIL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define I18NUTIL_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
Propchange: openoffice/trunk/main/i18nutil/inc/i18nutil/i18nutildllapi.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/main/i18nutil/inc/i18nutil/oneToOneMapping.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/inc/i18nutil/oneToOneMapping.hxx?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/inc/i18nutil/oneToOneMapping.hxx (original)
+++ openoffice/trunk/main/i18nutil/inc/i18nutil/oneToOneMapping.hxx Thu Dec 29
07:16:38 2016
@@ -25,6 +25,7 @@
#include <utility>
#include <rtl/ustring.hxx>
+#include "i18nutil/i18nutildllapi.h"
namespace com { namespace sun { namespace star { namespace i18n {
@@ -42,7 +43,7 @@ typedef struct _UnicodePairWithFlag
UnicodePairFlag flag;
} UnicodePairWithFlag;
-class oneToOneMapping
+class I18NUTIL_DLLPUBLIC oneToOneMapping
{
private:
// no copy, no substitution
@@ -67,7 +68,7 @@ protected:
size_t mnSize;
};
-class oneToOneMappingWithFlag : public oneToOneMapping
+class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping
{
friend class widthfolding;
Modified: openoffice/trunk/main/i18nutil/inc/i18nutil/unicode.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/inc/i18nutil/unicode.hxx?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/inc/i18nutil/unicode.hxx (original)
+++ openoffice/trunk/main/i18nutil/inc/i18nutil/unicode.hxx Thu Dec 29 07:16:38
2016
@@ -25,6 +25,7 @@
#include <com/sun/star/i18n/UnicodeScript.hpp>
#include <sal/types.h>
+#include "i18nutil/i18nutildllapi.h"
typedef struct _ScriptTypeList {
sal_Int16 from;
@@ -32,7 +33,7 @@ typedef struct _ScriptTypeList {
sal_Int16 value;
} ScriptTypeList;
-class unicode
+class I18NUTIL_DLLPUBLIC unicode
{
public:
Modified: openoffice/trunk/main/i18nutil/inc/i18nutil/widthfolding.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/inc/i18nutil/widthfolding.hxx?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/inc/i18nutil/widthfolding.hxx (original)
+++ openoffice/trunk/main/i18nutil/inc/i18nutil/widthfolding.hxx Thu Dec 29
07:16:38 2016
@@ -26,12 +26,13 @@
#include <sal/types.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <i18nutil/oneToOneMapping.hxx>
+#include "i18nutil/i18nutildllapi.h"
namespace com { namespace sun { namespace star { namespace i18n {
#define WIDTHFOLDNIG_DONT_USE_COMBINED_VU 0x01
-class widthfolding
+class I18NUTIL_DLLPUBLIC widthfolding
{
public:
static oneToOneMapping& getfull2halfTable();
Modified: openoffice/trunk/main/i18nutil/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/prj/build.lst?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/prj/build.lst (original)
+++ openoffice/trunk/main/i18nutil/prj/build.lst Thu Dec 29 07:16:38 2016
@@ -1,3 +1,2 @@
inu i18nutil : sal cppu offapi NULL
-inu i18nutil usr1 - all inu_mkout NULL
-inu i18nutil\source\utility nmake - all inu_utility
NULL
+inu i18nutil\prj nmake - all inu_prj NULL
Modified: openoffice/trunk/main/i18nutil/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/prj/d.lst?rev=1776380&r1=1776379&r2=1776380&view=diff
==============================================================================
--- openoffice/trunk/main/i18nutil/prj/d.lst (original)
+++ openoffice/trunk/main/i18nutil/prj/d.lst Thu Dec 29 07:16:38 2016
@@ -1,15 +0,0 @@
-
-mkdir: %_DEST%\inc%_EXT%\i18nutil
-
-..\inc\i18nutil\casefolding.hxx %_DEST%\inc%_EXT%\i18nutil\casefolding.hxx
-..\inc\i18nutil\oneToOneMapping.hxx
%_DEST%\inc%_EXT%\i18nutil\oneToOneMapping.hxx
-..\inc\i18nutil\unicode.hxx %_DEST%\inc%_EXT%\i18nutil\unicode.hxx
-..\inc\i18nutil\widthfolding.hxx %_DEST%\inc%_EXT%\i18nutil\widthfolding.hxx
-..\inc\i18nutil\x_rtl_ustring.h %_DEST%\inc%_EXT%\i18nutil\x_rtl_ustring.h
-
-..\%__SRC%\bin\i18nutil*.dll %_DEST%\bin%_EXT%\i18nutil*.dll
-..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib%_EXT%\libi18nutil*.so
-..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib%_EXT%\libi18nutil*.dylib
-..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib
-..\%__SRC%\lib\i18nutil.lib %_DEST%\lib%_EXT%\i18nutil.lib
-..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\i18nutilgcc3.lib
Added: openoffice/trunk/main/i18nutil/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18nutil/prj/makefile.mk?rev=1776380&view=auto
==============================================================================
--- openoffice/trunk/main/i18nutil/prj/makefile.mk (added)
+++ openoffice/trunk/main/i18nutil/prj/makefile.mk Thu Dec 29 07:16:38 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
