[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 3 commits - RepositoryFixes.mk set_soenv.in solenv/config solenv/inc

[Norbert Thiebaud]

 RepositoryFixes.mk        |   10 ----------
 set_soenv.in              |    1 -
 solenv/config/sdev300.ini |    1 -
 solenv/inc/settings.mk    |    2 +-
 4 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 60c87b829367b07a8532d6f892c73e502b497379
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 18:49:52 2011 -0600

    mis-merge: issue with stl. this may no be the right resolution

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bada67c..91e1fcd 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -38,10 +38,8 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
-ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
 
 endif
 
@@ -53,10 +51,8 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
-ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
 
 endif
 
@@ -101,10 +97,8 @@ gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_D
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
-ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
 
 else
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -169,9 +163,7 @@ endif
 
 # we do not require a known rule for these, when using system libs
 
-ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
 
 ifeq ($(SYSTEM_LIBXML),YES)
 gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
commit 45554c687072cf076775146f65e23f6f0becd951
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 18:49:14 2011 -0600

    mismerge: l10n has not changed location in libo

diff --git a/set_soenv.in b/set_soenv.in
index b030b38..b1b3cc0 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1521,7 +1521,6 @@ $gb_REPOS = $SRC_ROOT;
 
 if ('@WITH_LANG@' ne "")
 {
-    $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/l10n";
     $BUILD_TYPE = "@BUILD_TYPE@ L10N";
 }
 else
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index c2579cd..9e9291c 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -221,7 +221,6 @@ finish
         }
         common_setrepo:0 IF X%WITH_LANG%X != XX
         {
-            gb_REPOS %gb_REPOS% %SOURCE_ROOT_DIR%/l10n 
             BUILD_TYPE %BUILD_TYPE% L10N
         }
         common_jre:0 IF %JREPATH% ==
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index de93a62..bbce4ff 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -809,7 +809,7 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
 
 .EXPORT : SOLARBINDIR
 
-L10N_MODULE*=$(SOURCE_ROOT_DIR)/l10n/l10n
+L10N_MODULE*=$(SRC_ROOT)/l10n
 ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
 
 .IF "$(WITH_LANG)"!=""
commit fb616d07076eb87fe70e8a3add17152df84ebd6b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 18:48:33 2011 -0600

    mis-merge: no more vos3

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 406cb6a..bada67c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -73,7 +73,6 @@ gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(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 vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 ifeq ($(gb_PRODUCT),$(true))
@@ -118,7 +117,6 @@ gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(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 vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 ifeq ($(gb_PRODUCT),$(true))