Alexandre Julliard : transl: Remove the no longer needed SCRIPTSDIR parameter.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 75bf08b6b6b57d5327c5ba9c74730a7b9723d678
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=75bf08b6b6b57d5327c5ba9c7...

Author: Alexandre Julliard 
Date:   Wed Jul 22 16:03:49 2009 +0200

transl: Remove the no longer needed SCRIPTSDIR parameter.

---

transl/scripts/Master.sh        |    2 +-
 transl/scripts/checkmakefile.pl |    5 +----
 transl/scripts/config-example   |    3 ---
 winetest/make-winetest          |    2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh
index b08383e..4a0df39 100755
--- a/transl/scripts/Master.sh
+++ b/transl/scripts/Master.sh
@@ -46,7 +46,7 @@ mkdir $WORKDIR/dumps
 mkdir $WORKDIR/dumps/res

# Analyze all the Makefiles
-$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit
+$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit

# Show any changes in the log
 diff -u $WORKDIR/run.log.old $WORKDIR/run.log
diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl
index ca62dae..4dcf5ac 100755
--- a/transl/scripts/checkmakefile.pl
+++ b/transl/scripts/checkmakefile.pl
@@ -8,7 +8,7 @@ use Cwd;
 use File::Basename;

# configuration parameters
-my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $scriptsdir, $wrc);
+my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $wrc);

sub shell($)
 {
@@ -326,7 +326,6 @@ while (@ARGV && $ARGV[0] =~ /^-/)
     my $opt = shift @ARGV;
     if ($opt eq "-S") { $srcdir = shift @ARGV; }
     elsif ($opt eq "-T") { $objdir = shift @ARGV; }
-    elsif ($opt eq "-s") { $scriptsdir = shift @ARGV; }
     elsif ($opt eq "-t") { $toolsdir = shift @ARGV; }
     elsif ($opt eq "-w") { $workdir = shift @ARGV; }
     else
@@ -335,7 +334,6 @@ while (@ARGV && $ARGV[0] =~ /^-/)
         print STDERR "  -S dir   Set the top of the Wine source tree\n";
         print STDERR "  -T dir   Set the top of the Wine build tree\n";
         print STDERR "  -t dir   Set the Wine tools directory\n";
-        print STDERR "  -s dir   Set the scripts directory\n";
         print STDERR "  -w dir   Set the work directory\n";
         exit 1;
     }
@@ -345,7 +343,6 @@ $srcdir ||= $CONFIG{"SOURCEROOT"};
 $objdir ||= $CONFIG{"BUILDROOT"} || $srcdir;
 $toolsdir ||= $CONFIG{"WRCROOT"} || $objdir;
 $workdir ||= $CONFIG{"WORKDIR"};
-$scriptsdir ||= $CONFIG{"SCRIPTSDIR"} || ".";
 $wrc = $toolsdir . "/tools/wrc/wrc";

if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "")
diff --git a/transl/scripts/config-example b/transl/scripts/config-example
index 47cc4c5..2409d13 100644
--- a/transl/scripts/config-example
+++ b/transl/scripts/config-example
@@ -9,9 +9,6 @@ BUILDROOT=/path/to/wine-src
 # Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. 
 WRCROOT=/path/to/wine-src

-# Directory containing the various scripts
-SCRIPTSDIR=.
-
 # The directory where to store the generated langs/ and dumps/. Usually the
 # directory with the PHP scripts.
 DESTDIR=../php
diff --git a/winetest/make-winetest b/winetest/make-winetest
index 15833b9..50903f6 100755
--- a/winetest/make-winetest
+++ b/winetest/make-winetest
@@ -132,7 +132,7 @@ umask 022

rm -rf work
     mkdir work work/langs work/dumps work/dumps/res
-    $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log
+    $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work 2>>work/run.log
     mv -f $transldir/langs $transldir/langs.old
     mv -f $transldir/dumps $transldir/dumps.old
     mv -f work/langs $transldir/langs