[ooo-build-commit] .: 2 commits - build/src download solenv/inc

[Jan Holesovsky]

 build/src/buildenv-common |    2 +-
 download                  |    2 +-
 solenv/inc/libs.mk        |   11 ++++++++++-
 solenv/inc/target.mk      |    2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 2376503430cdc99e38c9289be70e85fa9448f646
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Jul 7 20:38:33 2010 +0200

    Split build: Newer git changed the format of git-remote.
    
    * download:

diff --git a/download b/download
index c68ba5d..1b4d83d 100755
--- a/download
+++ b/download
@@ -22,7 +22,7 @@ COMPONENTS="artwork base bootstrap calc components extensions extras filters
 help impress l10n libs-core libs-extern libs-extern-sys libs-gui ooo-build
 postprocess sdk testing ure writer"
 
-ORIGIN=`git remote show -n origin | grep URL: | sed 's#^[[:space:]]*URL: ##'`
+ORIGIN=`git remote show -n origin | grep 'Fetch URL:' | sed 's#^[[:space:]]*Fetch URL: ##'`
 
 SKIP=
 REPO=`echo "$ORIGIN" | sed 's#/[^/]\+/\?$##'`
commit 3458a60a1a6c00a1494ec41bd1396fa45b29b538
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jul 20 14:27:30 2009 +0200

    Split build: Update version.mk's locations.
    
    They can be either in the build solver, or in the common one; be prepared for
    both...
    
    * build/src/buildenv-common:
    * solenv/inc/libs.mk:
    * solenv/inc/target.mk:

diff --git a/build/src/buildenv-common b/build/src/buildenv-common
index 0c79998..47125c9 100644
--- a/build/src/buildenv-common
+++ b/build/src/buildenv-common
@@ -40,7 +40,7 @@ if [ "$buildenv_build" = "1" ] ; then
     . "$solverdir"/Linux*Env.Set.sh
 
     export SOLARLIB="$SOLARLIB -L$buildsolverdir/$UPD/$INPATH/lib"
-    export SOLARINC="$SOLARINC -I$buildsolverdir/$UPD/$INPATH/inc"
+    export SOLARINC="$SOLARINC -I$buildsolverdir/$UPD/$INPATH/inc -I$buildsolverdir/$UPD/$INPATH/inc/external"
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$buildsolverdir/$UPD/$INPATH/lib"
     export PATH="$PATH:$buildsolverdir/$UPD/$INPATH/bin"
     export CLASSPATH="$CLASSPATH:$buildsolverdir/$UPD/$INPATH/bin"
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b463b5d..bba75da 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -54,7 +54,7 @@ ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 I18NUTILLIB=-li18nutil$(COMID)
-.INCLUDE .IGNORE : i18npool$/version.mk
+.INCLUDE .IGNORE : i18npoolversion.mk
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
 .IF "$(WITH_GPC)"!="NO"
@@ -66,6 +66,9 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
 SALHELPERLIB=-luno_salhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
+.IF "$(BUILDSOLVER)"!=""
+.INCLUDE .IGNORE : $(BUILDSOLVER)$/$(UPD)$/$(INPATH)$/inc$/comphelper$/version.mk
+.ENDIF
 .INCLUDE .IGNORE : comphelper$/version.mk
 COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
 CONNECTIVITYLIB=-lconnectivity
@@ -80,6 +83,9 @@ CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(BUILDSOLVER)"!=""
+.INCLUDE .IGNORE : $(BUILDSOLVER)$/$(UPD)$/$(INPATH)$/inc$/ucbhelper$/version.mk
+.ENDIF
 .INCLUDE .IGNORE : ucbhelper$/version.mk
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
 .IF "$(SYSTEM_OPENSSL)" == "YES"
@@ -98,6 +104,9 @@ REGLIB=-lreg$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 REGLIB=-lreg
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(BUILDSOLVER)"!=""
+.INCLUDE .IGNORE : $(BUILDSOLVER)$/$(UPD)$/$(INPATH)$/inc$/vos$/version.mk
+.ENDIF
 .INCLUDE .IGNORE : vos$/version.mk
 VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index d38290f..79c159e 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -71,7 +71,7 @@ INCLUDE:=
 .IF "$(PRJINC)"!=""
 INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
 .ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(UNOINCLUDES) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
 .ENDIF		# "$(PRJINC)"!=""
 INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 .EXPORT : LIB