[ooo-build-commit] set_soenv.in solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jul 3 08:42:33 PDT 2009
set_soenv.in | 8 +++----
solenv/inc/settings.mk | 54 ++++++++++++++++++++++++-------------------------
2 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 74e7fedc0cab1d07768b979b352d7f2e3d07ac58
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jul 3 17:41:01 2009 +0200
Split build: Relativize some paths again (reverts i#102607).
Absolute paths (which came in with m51) are quite a bad idea in the split
build...
* set_soenv.in:
* solenv/inc/settings.mk:
diff --git a/set_soenv.in b/set_soenv.in
index f8b3bf9..d6ccd0b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1122,7 +1122,7 @@ if ($platform =~ m/cygwin|os2/)
# The general environment path.
if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/)
{ $PATH = $cur_dir.
-# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
+ $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
$ps.'$SOLARENV'.$BIN;
@@ -1153,7 +1153,7 @@ elsif ($platform =~ m/cygwin/)
my ( $tmppath );
$PATH = $cur_dir.
-# $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
+ $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
$ps.CygFormat($SOLARENV).$ds."bin".
$ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
@@ -1291,7 +1291,7 @@ elsif ($platform =~ m/os2/)
# needed is appended to the end.
$PATH = $cur_dir.
-# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
+ $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds."bin".
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN;
@@ -1319,7 +1319,7 @@ elsif ($platform =~ m/os2/)
elsif ($platform =~ m/darwin/)
{ $PATH = $cur_dir.
-# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
+ $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
$ps.'$SOLARENV'.$BIN;
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index bbc7fd5..f99795c 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -720,7 +720,7 @@ CLASSDIR=$(OUT)$/class
CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH)
STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)$/bin$/jtools.jar com.sun.star.tool.starjar.StarJar
-STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javadep
+STARDEP=$(AUGMENT_LIBRARY_PATH) javadep
.IF "$(PRJNAME)"=="sj2"
CLASSPATH!:=$(CLASSPATH:s/sj2/no/)
.ENDIF
@@ -979,9 +979,9 @@ MKDEPFLAGS+=$(MKDEPLOCAL)
BISON=bison
YACCFLAGS*=-d
-SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/svidl
+SVIDL=$(AUGMENT_LIBRARY_PATH) svidl
-LDUMP2*=$(SOLARBINDIR)$/ldump4
+LDUMP2*=ldump4
ZIPUPDATE=-u -j
ZIPFLAGS=$(ZIPUPDATE)
@@ -995,9 +995,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION)
.ENDIF # "$(SCPLINKVERSION)"!=""
.IF "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rscdep
+RSC=$(AUGMENT_LIBRARY_PATH) rscdep
.ELSE # "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)$/rsc
+RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) rsc
.ENDIF # "$(make_srs_deps)"!=""
#new
@@ -1061,19 +1061,19 @@ MAXPROCESS!:=1
# allow seperate handling
EXTMAXPROCESS*=$(MAXPROCESS)
-IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/idlc
-REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regmerge
-REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcompare
-REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcomp
-CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cppumaker
-JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javamaker
-RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rdbmaker
-CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/climaker
+IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
+REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare
+REGCOMP*=$(AUGMENT_LIBRARY_PATH) regcomp
+CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) cppumaker
+JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) javamaker
+RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker
+CLIMAKER*=$(AUGMENT_LIBRARY_PATH) climaker
-TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/testshl2
-HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/helpex
-LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/lngconvex
-HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/HelpLinker
+TESTSHL2=$(AUGMENT_LIBRARY_PATH) testshl2
+HELPEX=$(AUGMENT_LIBRARY_PATH) helpex
+LNGCONVEX=$(AUGMENT_LIBRARY_PATH) lngconvex
+HELPLINKER=$(AUGMENT_LIBRARY_PATH) HelpLinker
.IF "$(JAVAINTERPRETER)" == ""
JAVA*:=java
@@ -1087,7 +1087,7 @@ JAVA*:=$(JAVAINTERPRETER)
SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl
SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl
LZIP*=lzip
-CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpplcc
+CPPLCC*=$(AUGMENT_LIBRARY_PATH) cpplcc
.IF "$(DISABLE_ENHANCED_COMID)"==""
.INCLUDE : tg_compv.mk
@@ -1338,47 +1338,47 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc
.IF "$(COMP1TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk
-$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP2TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk
-$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP3TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk
-$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP4TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk
-$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP5TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk
-$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP6TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk
-$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP7TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk
-$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP8TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk
-$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP9TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk
-$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
# some place to define these jars for SO environment
More information about the ooo-build-commit
mailing list