Commits

Anonymous committed d0cd2b5

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

Comments (0)

Files changed (27)

basebmp/test/makefile.mk

 		@echo ----------------------------------------------------------
 		@echo - start unit test on library $(SHL1TARGETN)
 		@echo ----------------------------------------------------------
-		$(AUGMENT_LIBRARY_PATH) testshl2 -sf $(mktmp ) $(SHL1TARGETN)
+		$(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
 
 ALLTAR : unittest

basegfx/test/makefile.mk

 		@echo ----------------------------------------------------------
 		@echo - start unit test on library $(SHL1TARGETN)
 		@echo ----------------------------------------------------------
-		$(AUGMENT_LIBRARY_PATH) testshl2 -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
+		$(TESTSHL2) -sf $(mktmp ) -forward $(BIN)$/ $(SHL1TARGETN)
 		$(TOUCH) $@
 
 ALLTAR : $(MISC)$/unittest_succeeded

binfilter/bf_so3/util/makefile.mk

 TARGET=bf_so
 
 USE_LDUMP2=TRUE
-LDUMP2=LDUMP3
+#LDUMP2=LDUMP3
 
 # --- Settings -----------------------------------------------------
 

cli_ure/unotypes/makefile.mk

 
 #When changing the assembly version then this must also be done in scp2
 $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-	$(WRAPCMD) $(BIN)$/climaker.exe $(CLIMAKERFLAGS) \
+	$(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
 		--out $@ \
 		--keyfile $(BIN)$/cliuno.snk \
 		--assembly-version $(CLI_URETYPES_NEW_VERSION) \

crashrep/source/win32/makefile.mk

 # using lngconvex.exe 
 
 $(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt
-    lngconvex.exe -ulf $(ULFDIR)$/crashrep.ulf -rc $(RES)$/$(TARGET).rc  -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
+    $(LNGCONVEX) -ulf $(ULFDIR)$/crashrep.ulf -rc $(RES)$/$(TARGET).rc  -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt
     

desktop/win32/source/setup/makefile.mk

 .INCLUDE :  target.mk
 
 $(RCFILES) : $(ULFDIR)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-    $(WRAPCMD) lngconvex.exe -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+    $(LNGCONVEX) -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
 

helpcontent2/makefile.pmk

 
 $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
 .IF "$(WITH_LANG)"!=""
-	@$(AUGMENT_LIBRARY_PATH) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
+	@$(HELPEX) -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
 .ELSE			# "$(WITH_LANG)"!=""
 .IF "$(USE_SHELL)"=="4nt"
 # it's getting real ugly...

helpcontent2/util/target.pmk

 .ENDIF
  
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst
-	$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+	$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 .IF "$(SOLAR_JAVA)" == "TRUE"
 	$(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@
 .ELSE

migrationanalysis/prj/build.lst

-at  migrationanalysis   :   soltools NULL
+at  migrationanalysis   :   soltools shell NULL
 at	migrationanalysis\src\msokill           nmake    -  w  at_src NULL
 at  migrationanalysis\src\driver_docs       nmake    -  w  at_src_driver NULL
 at  migrationanalysis\src\resources         nmake    -  w  at_src_resources NULL

migrationanalysis/src/wizard/makefile.mk

 # using lngconvex.exe 
 
 $(RCFILES) : $(MANIFEST) $(ULFDIR)$/$(TARGET).ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-    $(WRAPCMD) lngconvex.exe -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+    $(LNGCONVEX) -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
 
 $(PAW_RES_DLLS) : $(RCFILES)
     -$(MKDIRHIER) $(@:d)

o3tl/qa/makefile.mk

 		@echo ----------------------------------------------------------
 		@echo - start unit test on library $(SHL1TARGETN)
 		@echo ----------------------------------------------------------
-		$(AUGMENT_LIBRARY_PATH) testshl2 -sf $(mktmp ) $(SHL1TARGETN)
+		$(TESTSHL2) -sf $(mktmp ) $(SHL1TARGETN)
 
 ALLTAR : unittest

rsc/source/prj/start.cxx

 	BOOL			bHelp	 = FALSE;
 	BOOL			bError	 = FALSE;
 	BOOL			bResponse = FALSE;
-	ByteString		aPrePro( "rscpp" );
-	ByteString		aRsc2Name( "rsc2" );
+	ByteString		aSolarbin(getenv("SOLARBINDIR"));
+	ByteString		aDelim("/");
+	ByteString		aPrePro; //( aSolarbin + aDelim + ByteString("rscpp"));
+	ByteString		aRsc2Name; //(  aSolarbin + aDelim + ByteString("rsc2"));
 	ByteString		aSrsName;
 	ByteString		aResName;
 	RscStrList		aInputList;
 	sal_uInt32		i;
 	ByteString* 	pString;
 
+	aPrePro = aSolarbin;
+	aPrePro += aDelim;
+	aPrePro += ByteString("rscpp");
+
+	aRsc2Name = aSolarbin;
+	aRsc2Name += aDelim;
+	aRsc2Name += ByteString("rsc2");
+
 	printf( "VCL Resource Compiler 3.0\n" );
 
 	pStr = ::ResponseFile( &aCmdLine, argv, argc );
 # 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;
 
    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;
 
    # 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;
 
 
 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;
 

shell/source/win32/shlxthandler/res/makefile.mk

 # using lngconvex.exe 
 
 $(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-    $(WRAPCMD) $(BIN)$/lngconvex.exe -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+    $(subst,$(SOLARBINDIR)$/lngconvex,$(BIN)$/lngconvex $(LNGCONVEX)) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
     

solenv/bin/mhids.pl

 $filebase =~ s/.*[\\\/]//;
 $filebase =~ s/\..*?$//;
 $workfile = "$tmpdir/${filebase}_".$$;
+#$workfile =~ s/setup/set_up/;
 
 # now get $workfile ready for shell usage...
 $shell_workfile = $workfile;
 #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");

solenv/bin/modules/installer/epmfile.pm

 		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
 		{

solenv/config/sdev300.ini

 			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%

solenv/inc/_tg_def.mk

 .ENDIF			# "$(DEF1LIBNAME)"!=""
 
 .IF "$(DEFLIB1NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL1VERSIONMAP)"!=""
 .ENDIF			# "$(DEF2LIBNAME)"!=""
 
 .IF "$(DEFLIB2NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL2VERSIONMAP)"!=""
 .ENDIF			# "$(DEF3LIBNAME)"!=""
 
 .IF "$(DEFLIB3NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL3VERSIONMAP)"!=""
 .ENDIF			# "$(DEF4LIBNAME)"!=""
 
 .IF "$(DEFLIB4NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL4VERSIONMAP)"!=""
 .ENDIF			# "$(DEF5LIBNAME)"!=""
 
 .IF "$(DEFLIB5NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL5VERSIONMAP)"!=""
 .ENDIF			# "$(DEF6LIBNAME)"!=""
 
 .IF "$(DEFLIB6NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL6VERSIONMAP)"!=""
 .ENDIF			# "$(DEF7LIBNAME)"!=""
 
 .IF "$(DEFLIB7NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL7VERSIONMAP)"!=""
 .ENDIF			# "$(DEF8LIBNAME)"!=""
 
 .IF "$(DEFLIB8NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL8VERSIONMAP)"!=""
 .ENDIF			# "$(DEF9LIBNAME)"!=""
 
 .IF "$(DEFLIB9NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL9VERSIONMAP)"!=""
 .ENDIF			# "$(DEF10LIBNAME)"!=""
 
 .IF "$(DEFLIB10NAME)"!=""
-.IF "$(UPDATER)"!=""
 DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib)
-.ENDIF			# "$(UPDATER)"!=""
 .ENDIF
 
 .IF "$(SHL10VERSIONMAP)"!=""

solenv/inc/pstrules.mk

 	$(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 $@

solenv/inc/settings.mk

 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
 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)
 SOLARCOMMONPCKDIR=$(SOLARPCKDIR)
 .ENDIF
 
+.EXPORT : SOLARBINDIR
+
 .IF "$(PRE)"==""
 #JARDIR=$(CLASSDIR)
 JARDIR=$(OUT)$/class
 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)
 .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
 # 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
 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
 
 .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

solenv/inc/tg_def.mk

 .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)"!=""

solenv/inc/tg_ext.mk

 .EXPORT : LDFLAGS
 .ENDIF
 
+PATH!:=.:$(SOLARBINDIR):$(PATH)
+.EXPORT : PATH
+
 #override
 PACKAGE_DIR=$(MISC)$/build
 ABS_PACKAGE_DIR:=$(MAKEDIR)$/$(MISC)$/build

solenv/inc/unitools.mk

 #*************************************************************************
 
 # 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
 
 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

solenv/inc/wnt.mk

 
 # --- changes for W32-tcsh - should move into settings.mk ---
 .IF "$(USE_SHELL)"!="4nt"
-STARDEP=javadep
 JAVAC=javac
 JAVA=java
 JAVAI!:=java
 .ENDIF # "$(USE_SHELL)"!="4nt"
 
 # --- general WNT settings ---
-CLIMAKER*=climaker
 
 HC=hc
 HCFLAGS=
 .ENDIF
 .ENDIF
 
+.IF "$(USE_SHELL)" == "bash"
+AUGMENT_LIBRARY_PATH *= : && \
+	PATH=$${{PATH}}:$(SOLARBINDIR:s/://:^"/cygdrive/")
+.ELSE
+AUGMENT_LIBRARY_PATH *= echos && PATH=%PATH%;$(SOLARBINDIR) &&
+.ENDIF

soltools/util/makefile.pmk

 #*************************************************************************
 
 # 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

swext/mediawiki/help/makefile.mk

 
 
 $(OUT_MEDIAWIKI)$/$(TARGET).done : localize.sdf $(XHPFILES) $(HLANGXHPFILES)
-	@$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m localize.sdf && $(TOUCH) $@
+	@$(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m localize.sdf && $(TOUCH) $@
 .ENDIF
 

transex3/source/localize.cxx

 			DirEntry aTemp( Export::GetTempFile());
 			ByteString sTempFile( aTemp.GetFull(), RTL_TEXTENCODING_ASCII_US );
 
-			ByteString sExecutable( rExecutable );
+            ByteString sDel;
+#if defined(WNT) || defined(OS2)
+            sDel=ByteString("\\");
+#else
+            sDel=ByteString("/");
+#endif
+            ByteString sPath1( Export::GetEnv("SOLARVER") );
+			ByteString sPath2( Export::GetEnv("INPATH") );
+            ByteString sPath3( "bin" );
+            ByteString sPath4( Export::GetEnv("UPDMINOREXT") );
+            ByteString sExecutable( sPath1 );
+            sExecutable += sDel ;
+            sExecutable += sPath2 ;
+            sExecutable += sDel;
+            sExecutable += sPath3 ;
+            sExecutable += sPath4 ;
+            sExecutable += sDel ;
+            sExecutable += rExecutable ;
+
+           
 #if defined(WNT) || defined(OS2)
 			sExecutable += ".exe";
 			String sPath( Export::GetEnv( "PATH" ), RTL_TEXTENCODING_ASCII_US );