[ooo-build-commit] Branch 'ooo/master' - 2 commits - set_soenv.in solenv/bin solenv/config solenv/inc soltools/util
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jun 16 17:00:26 PDT 2009
set_soenv.in | 8 ++--
solenv/bin/mhids.pl | 5 +-
solenv/bin/modules/installer/epmfile.pm | 3 +
solenv/config/sdev300.ini | 2 -
solenv/inc/_tg_def.mk | 20 -----------
solenv/inc/pstrules.mk | 2 -
solenv/inc/settings.mk | 56 ++++++++++++++++++--------------
solenv/inc/tg_def.mk | 2 -
solenv/inc/tg_ext.mk | 3 +
solenv/inc/unitools.mk | 19 ++++++----
solenv/inc/wnt.mk | 8 +++-
solenv/inc/wntgcci6.mk | 2 -
soltools/util/makefile.pmk | 4 +-
13 files changed, 68 insertions(+), 66 deletions(-)
New commits:
commit 7cf1fc407ddc53171bfea2a949812e80f5d10c98
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Jun 16 18:11:49 2009 +0000
CWS-TOOLING: integrate CWS ause102
2009-06-16 19:22:59 +0200 hjs r273039 : #i102607# don't kill mingw
2009-06-12 15:17:22 +0200 ihi r272921 : #i102607# add path before calling l10n tool
2009-06-11 14:25:20 +0200 hjs r272873 : #i102607# on EPM=internal call binary with full path
2009-06-10 13:35:48 +0200 hjs r272807 : #i102607# remove solver PATH entry from OOo env.
2009-06-10 12:10:44 +0200 hjs r272802 : #i102635# correct dependencies for all
2009-06-10 11:58:53 +0200 hjs r272801 : #i102607# call tools from solver with absolute path
diff --git a/set_soenv.in b/set_soenv.in
index 3219c44..1ee948f 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/bin/mhids.pl b/solenv/bin/mhids.pl
index b571c86..6c68b52 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -132,6 +132,7 @@ $filebase = $filename;
$filebase =~ s/.*[\\\/]//;
$filebase =~ s/\..*?$//;
$workfile = "$tmpdir/${filebase}_".$$;
+#$workfile =~ s/setup/set_up/;
# now get $workfile ready for shell usage...
$shell_workfile = $workfile;
@@ -171,8 +172,8 @@ if ( defined $ENV{"NO_HID_FILES"} ) {
#echo "perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0"
#call perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0
-print "hidc $filename ${shell_workfile}.c1 $prjname \n";
-$ret = system "hidc $filename ${shell_workfile}.c1 $prjname";
+print "$ENV{SOLARBINDIR}/hidc $filename ${shell_workfile}.c1 $prjname \n";
+$ret = system "$ENV{SOLARBINDIR}/hidc $filename ${shell_workfile}.c1 $prjname";
if ( $ret ) {
push @cleanuplist, ".c1";
cleandie("ERROR - calling \"hidc\" failed");
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index d3996ac..65e52c2 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -838,6 +838,9 @@ sub find_epm_on_system
elsif ( ($ENV{'EPM'} eq "no") || ($ENV{'EPM'} eq "internal") )
{
$epmname = "epm";
+ my $epmref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$epmname, $includepatharrayref, 0);
+ if ($$epmref eq "") { installer::exiter::exit_program("ERROR: Could not find program $epmname (EPM set to \"internal\" or \"no\")!", "find_epm_on_system"); }
+ $epmname = $$epmref;
}
else
{
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 86a5fa1..d5e7fae 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -190,7 +190,7 @@ finish
BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
DPKG %BUILD_TOOLS%$/dpkg
- PATH .$:$cp(%SOLARVERSION%$/%INPATH%$/bin%UPDMINOREXT%)$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
+ PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
PATH_SEPERATOR $;
SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 66e6478..1b293d4 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -8,9 +8,7 @@ DEFLIB1NAME*=$(DEF1LIBNAME)
.ENDIF # "$(DEF1LIBNAME)"!=""
.IF "$(DEFLIB1NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL1VERSIONMAP)"!=""
@@ -293,9 +291,7 @@ DEFLIB2NAME*=$(DEF2LIBNAME)
.ENDIF # "$(DEF2LIBNAME)"!=""
.IF "$(DEFLIB2NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL2VERSIONMAP)"!=""
@@ -578,9 +574,7 @@ DEFLIB3NAME*=$(DEF3LIBNAME)
.ENDIF # "$(DEF3LIBNAME)"!=""
.IF "$(DEFLIB3NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL3VERSIONMAP)"!=""
@@ -863,9 +857,7 @@ DEFLIB4NAME*=$(DEF4LIBNAME)
.ENDIF # "$(DEF4LIBNAME)"!=""
.IF "$(DEFLIB4NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL4VERSIONMAP)"!=""
@@ -1148,9 +1140,7 @@ DEFLIB5NAME*=$(DEF5LIBNAME)
.ENDIF # "$(DEF5LIBNAME)"!=""
.IF "$(DEFLIB5NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL5VERSIONMAP)"!=""
@@ -1433,9 +1423,7 @@ DEFLIB6NAME*=$(DEF6LIBNAME)
.ENDIF # "$(DEF6LIBNAME)"!=""
.IF "$(DEFLIB6NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL6VERSIONMAP)"!=""
@@ -1718,9 +1706,7 @@ DEFLIB7NAME*=$(DEF7LIBNAME)
.ENDIF # "$(DEF7LIBNAME)"!=""
.IF "$(DEFLIB7NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL7VERSIONMAP)"!=""
@@ -2003,9 +1989,7 @@ DEFLIB8NAME*=$(DEF8LIBNAME)
.ENDIF # "$(DEF8LIBNAME)"!=""
.IF "$(DEFLIB8NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL8VERSIONMAP)"!=""
@@ -2288,9 +2272,7 @@ DEFLIB9NAME*=$(DEF9LIBNAME)
.ENDIF # "$(DEF9LIBNAME)"!=""
.IF "$(DEFLIB9NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL9VERSIONMAP)"!=""
@@ -2573,9 +2555,7 @@ DEFLIB10NAME*=$(DEF10LIBNAME)
.ENDIF # "$(DEF10LIBNAME)"!=""
.IF "$(DEFLIB10NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL10VERSIONMAP)"!=""
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index d80d698..a5555bd 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -147,7 +147,7 @@ $(PAR)$/%.par :
$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="UNX"
- $(AUGMENT_LIBRARY_PATH) cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+ $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(common_build_srs)"!=""
$(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(TARGET)$/$(@:b).$(LANGFILEEXT)} -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 94623d2..8b6fcd5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -691,7 +691,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) javadep
+STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javadep
.IF "$(PRJNAME)"=="sj2"
CLASSPATH!:=$(CLASSPATH:s/sj2/no/)
.ENDIF
@@ -802,7 +802,7 @@ SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)$/$(SOLARLANG)
SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)$/$(SOLARLANG)
.ENDIF
.ENDIF
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(EXT_UPDMINOR)
+SOLARBINDIR:=$(SOLARVERSION)$/$(INPATH)$/bin$(EXT_UPDMINOR)
SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(EXT_UPDMINOR)
SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(EXT_UPDMINOR)
SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(EXT_UPDMINOR)
@@ -817,6 +817,8 @@ SOLARCOMMONRESDIR=$(SOLARRESDIR)
SOLARCOMMONPCKDIR=$(SOLARPCKDIR)
.ENDIF
+.EXPORT : SOLARBINDIR
+
.IF "$(PRE)"==""
#JARDIR=$(CLASSDIR)
JARDIR=$(OUT)$/class
@@ -932,10 +934,9 @@ MKDEPFLAGS+=$(MKDEPLOCAL)
BISON=bison
YACCFLAGS*=-d
-SVIDL=$(AUGMENT_LIBRARY_PATH) svidl
+SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/svidl
-LDUMP=ldump4
-LDUMP2=ldump4
+LDUMP2*=$(SOLARBINDIR)$/ldump4
ZIPUPDATE=-u -j
ZIPFLAGS=$(ZIPUPDATE)
@@ -949,9 +950,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION)
.ENDIF # "$(SCPLINKVERSION)"!=""
.IF "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) rscdep
+RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rscdep
.ELSE # "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) rsc
+RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)$/rsc
.ENDIF # "$(make_srs_deps)"!=""
#new
@@ -1015,13 +1016,20 @@ MAXPROCESS!:=1
# allow seperate handling
EXTMAXPROCESS*=$(MAXPROCESS)
-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
+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
+
+TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/testshl2
+HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/helpex
+LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/lngconvex
+HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/HelpLinker
+
.IF "$(JAVAINTERPRETER)" == ""
JAVA*:=java
.ELSE
@@ -1034,7 +1042,7 @@ JAVA*:=$(JAVAINTERPRETER)
SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl
SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl
LZIP*=lzip
-CPPLCC*=cpplcc
+CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpplcc
.IF "$(DISABLE_ENHANCED_COMID)"==""
.INCLUDE : tg_compv.mk
@@ -1285,47 +1293,47 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc
.IF "$(COMP1TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk
-$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP2TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk
-$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP3TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk
-$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP4TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk
-$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP5TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk
-$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP6TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk
-$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP7TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk
-$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP8TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk
-$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
.IF "$(COMP9TYPELIST)"!=""
.INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk
-$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
.ENDIF
# some place to define these jars for SO environment
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 9c6f3b5..602dfcb 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -41,9 +41,7 @@ DEFLIB$(TNR)NAME*=$(DEF$(TNR)LIBNAME)
.ENDIF # "$(DEF$(TNR)LIBNAME)"!=""
.IF "$(DEFLIB$(TNR)NAME)"!=""
-.IF "$(UPDATER)"!=""
DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib)
-.ENDIF # "$(UPDATER)"!=""
.ENDIF
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 53d35aa..6a06591 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -47,6 +47,9 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
.EXPORT : LDFLAGS
.ENDIF
+PATH!:=.:$(SOLARBINDIR):$(PATH)
+.EXPORT : PATH
+
#override
PACKAGE_DIR=$(MISC)$/build
ABS_PACKAGE_DIR:=$(MAKEDIR)$/$(MISC)$/build
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index f623578..3da9ed3 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -30,14 +30,19 @@
#*************************************************************************
# Common tools - move this to the end / consolidate
-TRANSEX*=$(AUGMENT_LIBRARY_PATH) transex3
-ULFEX*=$(AUGMENT_LIBRARY_PATH) ulfex
-XMLEX*=$(AUGMENT_LIBRARY_PATH) xmlex
-XRMEX*=$(AUGMENT_LIBRARY_PATH) xrmex
-CFGEX*=$(AUGMENT_LIBRARY_PATH) cfgex
+TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/transex3
+ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfex
+XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xmlex
+XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xrmex
+CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cfgex
+
+.IF "$(SYSTEM_LIBXSLT)"!="YES"
+XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xsltproc
+.ELSE # "$(SYSTEM_LIBXSLT)"!="YES"
XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
+.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES"
-ULFCONV*=$(AUGMENT_LIBRARY_PATH) ulfconv
+ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfconv
MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/makedepend
@@ -228,7 +233,7 @@ GNUTAR*:=tar
TAR*:=tar
RM+=$(RMFLAGS)
-ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) adjustvisibility
+ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/adjustvisibility
CONVERT*:=$(PERL) $(SOLARENV)$/bin$/leconvert.pl
EXECTEST := $(PERL) -w $(SOLARENV)$/bin$/exectest.pl
GCCINSTLIB:=$(PERL) -w $(SOLARENV)$/bin$/gccinstlib.pl
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index b59ecaf..e4a7fb8 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -49,7 +49,6 @@
# --- changes for W32-tcsh - should move into settings.mk ---
.IF "$(USE_SHELL)"!="4nt"
-STARDEP=javadep
JAVAC=javac
JAVA=java
JAVAI!:=java
@@ -59,7 +58,6 @@ PATH_SEPERATOR*=;
.ENDIF # "$(USE_SHELL)"!="4nt"
# --- general WNT settings ---
-CLIMAKER*=climaker
HC=hc
HCFLAGS=
@@ -79,3 +77,9 @@ JAVA_RUNTIME=javai_g.lib
.ENDIF
.ENDIF
+.IF "$(USE_SHELL)" == "bash"
+AUGMENT_LIBRARY_PATH *= : && \
+ PATH=$${{PATH}}:$(SOLARBINDIR:s/://:^"/cygdrive/")
+.ELSE
+AUGMENT_LIBRARY_PATH *= echos && PATH=%PATH%;$(SOLARBINDIR) &&
+.ENDIF
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index b0a67f8..ad80f13 100644
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -30,7 +30,7 @@
#*************************************************************************
# find 'makedepend' in own output tree
-MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/makedepend
+MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
# find 'adjustvisibility' in own output tree
-ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/adjustvisibility
+ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
commit 08808da4a2ed87f3eafd56fe579e9fc7a01a9d64
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Jun 16 17:37:30 2009 +0000
CWS-TOOLING: integrate CWS mingwport20
2009-06-13 05:03:46 +0200 tono r272946 : i102723: Set WINVER abd _WIN32_IE to 0x500 in mingw build
diff --git a/solenv/inc/wntgcci6.mk b/solenv/inc/wntgcci6.mk
index 30132e0..28c1656 100644
--- a/solenv/inc/wntgcci6.mk
+++ b/solenv/inc/wntgcci6.mk
@@ -81,7 +81,7 @@ CFLAGSNOOPT=-O0
# Compiler flags for describing the output path
CFLAGSOUTOBJ=-o
#plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x400 -D_WIN32_IE=0x400 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
+CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
More information about the ooo-build-commit
mailing list