[Libreoffice-commits] .: 4 commits - i18npool/source icu/prj RepositoryFixes.mk Repository.mk

[Tor Lillqvist]

 Repository.mk                          |    2 +-
 RepositoryFixes.mk                     |    8 ++++----
 i18npool/source/breakiterator/Makefile |    5 ++++-
 icu/prj/d.lst                          |    1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 4ae8b026a4eb2fc3585c913d0d3a613ed14a8ba3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 18 14:04:59 2011 +0300

    Need to use cygpath on Windows

diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile
index c8e5d08..8800a42 100644
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -37,8 +37,11 @@ data/dict_%.cxx : data/dict_%_invis.cxx
 	sed 's/\tconst/\tSAL_DLLPUBLIC_EXPORT const/' $< > $@
 
 data/dict_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.dic data
+ifeq ($(OS_FOR_BUILD),WNT)
+	$(gb_Helper_execute)gendict `cygpath -m $<` $@
+else
 	$(gb_Helper_execute)gendict $< $@
-
+endif
 
 ifeq ($(SYSTEM_ICU),YES)
 GENBRK := $(SYSTEM_GENBRK)
commit eab990db0a986c75ef49632f15ae84aa2d844123
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 18 13:56:08 2011 +0300

    Let's try to do without the extra copy of icuin.lib as iicui18n.lib

diff --git a/icu/prj/d.lst b/icu/prj/d.lst
index e13c1c1..859a504 100644
--- a/icu/prj/d.lst
+++ b/icu/prj/d.lst
@@ -8,7 +8,6 @@ mkdir: %_DEST%\inc\external\unicode
 
 ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 ..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\lib\icuin.lib %_DEST%\lib\iicui18n.lib
 ..\%__SRC%\lib\*.lib %_DEST%\lib
 
 ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
commit 2b95c17a562031676c9fd07939d0ca38b92bbfff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 18 12:12:41 2011 +0300

    Indentation fix

diff --git a/Repository.mk b/Repository.mk
index 81dd2fd..381fd61 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -209,7 +209,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 	i18npool \
 	i18nsearch \
     lomenubar \
-        msforms \
+    msforms \
 	mtfrenderer \
 	nullcanvas \
     OGLTrans \
commit c77e44481a961b94c2550c864b59de231be0b6d9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 18 12:08:58 2011 +0300

    Sort a block of lines that was almost sorted already

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index dbac84a..55cb4c7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -101,23 +101,23 @@ else #ifneq ($(USE_MINGW),)
 gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec:libxmlsec%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec:libxmlsec%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))