diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | cross_toolset/prj/build.lst | 2 | ||||
-rw-r--r-- | l10ntools/Executable_ulfconv.mk | 21 | ||||
-rw-r--r-- | l10ntools/Module_l10ntools.mk | 2 | ||||
-rw-r--r-- | l10ntools/Package_ulfconv.mk | 14 | ||||
-rw-r--r-- | l10ntools/source/ulfconv/msi-encodinglist.txt (renamed from setup_native/source/win32/msi-encodinglist.txt) | 0 | ||||
-rw-r--r-- | l10ntools/source/ulfconv/ulfconv.cxx (renamed from setup_native/source/ulfconv/ulfconv.cxx) | 0 | ||||
-rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
-rw-r--r-- | scp2/prj/build.lst | 2 | ||||
-rw-r--r-- | setup_native/prj/build.lst | 1 | ||||
-rw-r--r-- | setup_native/prj/d.lst | 2 | ||||
-rw-r--r-- | setup_native/source/ulfconv/makefile.mk | 45 | ||||
-rw-r--r-- | sysui/prj/build.lst | 2 | ||||
-rw-r--r-- | tail_build/prj/build.lst | 2 |
14 files changed, 43 insertions, 53 deletions
diff --git a/Repository.mk b/Repository.mk index b9ea8fb9b943..7e34039348e4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svidl \ transex3 \ typesconfig \ + ulfconv \ ulfex \ xml2cmp \ xrmex \ diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst index 5374f6ab7cb5..4346a83f0b81 100644 --- a/cross_toolset/prj/build.lst +++ b/cross_toolset/prj/build.lst @@ -1 +1 @@ -crs cross_toolset :: autodoc cross_tail_build setup_native NULL +crs cross_toolset :: autodoc cross_tail_build NULL diff --git a/l10ntools/Executable_ulfconv.mk b/l10ntools/Executable_ulfconv.mk new file mode 100644 index 000000000000..8ed5bb0e5f2c --- /dev/null +++ b/l10ntools/Executable_ulfconv.mk @@ -0,0 +1,21 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,ulfconv)) + +$(eval $(call gb_Executable_use_libraries,ulfconv,\ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_exception_objects,ulfconv,\ + l10ntools/source/ulfconv/ulfconv \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index c149db078c77..e3c11344a0c9 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,l10ntools)) $(eval $(call gb_Module_add_targets,l10ntools,\ Executable_helpex \ Executable_idxdict \ + Executable_ulfconv \ Executable_ulfex \ Executable_gsicheck \ Executable_cfgex \ @@ -41,6 +42,7 @@ $(eval $(call gb_Module_add_targets,l10ntools,\ Library_helplinker \ Package_inc \ Package_scripts \ + Package_ulfconv \ )) ifneq ($(SOLAR_JAVA),) diff --git a/l10ntools/Package_ulfconv.mk b/l10ntools/Package_ulfconv.mk new file mode 100644 index 000000000000..41337b26cb6e --- /dev/null +++ b/l10ntools/Package_ulfconv.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,l10ntools_ulfconv,$(SRCDIR)/l10ntools/source/ulfconv)) + +$(eval $(call gb_Package_add_file,l10ntools_ulfconv,bin/msi-encodinglist.txt,msi-encodinglist.txt)) + +# vim: set noet sw=4 ts=4: diff --git a/setup_native/source/win32/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index 1fd3cb96e70d..1fd3cb96e70d 100644 --- a/setup_native/source/win32/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt diff --git a/setup_native/source/ulfconv/ulfconv.cxx b/l10ntools/source/ulfconv/ulfconv.cxx index 1643b330d776..1643b330d776 100644 --- a/setup_native/source/ulfconv/ulfconv.cxx +++ b/l10ntools/source/ulfconv/ulfconv.cxx diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 8038e87da626..bf7be3357075 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts DICTIONARIES:dictionaries LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts DICTIONARIES:dictionaries LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport tail_build NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index d27274469092..35249814f435 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -1,3 +1,3 @@ -cp scp2 : TRANSLATIONS:translations i18npool DESKTOP:setup_native DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL +cp scp2 : TRANSLATIONS:translations i18npool DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL cp scp2 usr1 - all cp_mkout NULL cp scp2\prj nmake - all cp_prj NULL diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 8898e8ad4e17..d8ebf5934dac 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -16,4 +16,3 @@ pk setup_native\source\win32\customactions\shellextensions nmake - w sn_sh pk setup_native\source\win32\customactions\indexingfilter nmake - w sn_indexingfilter NULL pk setup_native\source\win32\customactions\languagepacks nmake - w sn_languagepacks sn_shellextensions.w sn_tools.w NULL pk setup_native\source\win32\customactions\patch nmake - w sn_patch sn_languagepacks.w sn_shellextensions.w sn_quickstarter.w sn_tools.w NULL -pk setup_native\source\ulfconv nmake - all sn_ulfconv NULL diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 0056694df617..19669cddd457 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -9,7 +9,6 @@ mkdir: %_DEST%\bin\userscripts ..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm mkdir: %_DEST%\bin\osolsmf -..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv ..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh ..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin\linuxpatchscript.sh ..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh @@ -19,7 +18,6 @@ mkdir: %_DEST%\bin\osolsmf ..\%__SRC%\bin\update.sh %_DEST%\bin\update ..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh ..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin\*.ulf -..\source\win32\msi-encodinglist.txt %_DEST%\bin\msi-encodinglist.txt ..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt ..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt ..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat diff --git a/setup_native/source/ulfconv/makefile.mk b/setup_native/source/ulfconv/makefile.mk deleted file mode 100644 index fbfeeb7b8adc..000000000000 --- a/setup_native/source/ulfconv/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# 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 . -# - -PRJ=..$/.. - -PRJNAME=setup_native -TARGET=ulfconv -TARGETTYPE=CUI -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = $(SLO)$/$(TARGET).obj - -APP1TARGET=$(TARGET) -APP1OBJS=$(OBJ)$/$(TARGET).obj -APP1LIBS= -APP1STDLIBS= $(SALLIB) -APP1RPATH=NONE - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst index fc83ef405a30..0823776398b4 100644 --- a/sysui/prj/build.lst +++ b/sysui/prj/build.lst @@ -1,4 +1,4 @@ -su sysui : TRANSLATIONS:translations offapi NATIVE:xml2cmp DESKTOP:rdbmaker DESKTOP:l10ntools DESKTOP:setup_native NULL +su sysui : TRANSLATIONS:translations offapi NATIVE:xml2cmp DESKTOP:rdbmaker DESKTOP:l10ntools NULL #su sysui\source\win32\QuickStart nmake - w su_win32_quickstart NULL #su sysui\source\win32\QuickStart\so nmake - w su_win32_quickstart_so su_win32_quickstart.w NULL su sysui\desktop\icons nmake - w su_iconsw NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ec0e1bd0b532..411c88a50203 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL |