ooo-build r15079 - trunk/scratch/sc-vba/testvba

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Jan 15 17:15:54 2009
New Revision: 15079
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15079&view=rev

Log:
adjust for ooo-build


Modified:
   trunk/scratch/sc-vba/testvba/runTests.pl

Modified: trunk/scratch/sc-vba/testvba/runTests.pl
==============================================================================
--- trunk/scratch/sc-vba/testvba/runTests.pl	(original)
+++ trunk/scratch/sc-vba/testvba/runTests.pl	Thu Jan 15 17:15:54 2009
@@ -22,6 +22,7 @@
 my $programpath = "$officepath"."3/program:$officepath/program:";
 my $basiclibrarypath = "$officepath/basis3.0/program";
 my $urelibpath = "$officepath/ure/lib";
+my $urebinpath = "$officepath/URE/bin";
 my $binext = "";
 my $testDocDir = "$binDir/TestDocuments";
 my $testLogDir = "$binDir/Logs";
@@ -57,7 +58,12 @@
       # windows under cygwin
       $sysDir = "win" ;
       $tmpPath=$ENV{"PATH"};
-      $ENV{"PATH"} = "$officepath/program:$officepath/URE/bin:$officepath/Basis/program:$tmpPath";
+# adjust for ooo-build ( need to make sure this works for non ooo-build too )
+      my $tmpofficepath = "$officepath"."/OpenOffice.org 3"; 
+      my $tmpofficebinpath = "$tmpofficepath/program"; 
+      my $tmpbasiclibpath = "$tmpofficepath/Basis/program"; 
+      my $tmpurebinpath = "$tmpofficepath/URE/bin"; 
+      $ENV{"PATH"} = "$tmpofficebinpath:$tmpbasiclibpath:$tmpurebinpath:$tmpPath";
       $testDocDir=`cygpath -m  $testDocDir`;
       uri_escape($testDocDir);
       # hacky windows url construction
@@ -71,8 +77,6 @@
       chomp($testLogDir);
       #print "*** log dir is $testLogDir\n";
       $binext = ".exe";
-      my $tmpPath=$ENV{"PATH"};
-      #print"*** win PATH is $tmpPath\n"
    }
    else{
       # unix we need to find sal etc. ( from the office path )