Module: tools Branch: master Commit: 34441783af76a889bb2c46f2363e9f4f51e33a2d URL: http://source.winehq.org/git/tools.git/?a=commit;h=34441783af76a889bb2c46f23...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Wed Aug 12 21:25:22 2009 +0200
transl: Move parse script to the php directory to overcome include issues.
---
transl/.gitignore | 6 +++--- transl/{scripts => php}/Master.sh | 0 transl/{scripts => php}/config-example | 4 ++-- transl/{scripts => php}/parse_resfiles.php | 4 ++-- winetest/make-winetest | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/transl/.gitignore b/transl/.gitignore index 3be2009..bf08c19 100644 --- a/transl/.gitignore +++ b/transl/.gitignore @@ -1,5 +1,5 @@ /work/* -/scripts/config -/scripts/local-posthook.sh -/scripts/local-prehook.sh +/php/config +/php/local-posthook.sh +/php/local-prehook.sh /php/data diff --git a/transl/scripts/Master.sh b/transl/php/Master.sh similarity index 100% rename from transl/scripts/Master.sh rename to transl/php/Master.sh diff --git a/transl/scripts/config-example b/transl/php/config-example similarity index 96% rename from transl/scripts/config-example rename to transl/php/config-example index 2409d13..7b73d8e 100644 --- a/transl/scripts/config-example +++ b/transl/php/config-example @@ -6,12 +6,12 @@ SOURCEROOT=/path/to/wine-src # Path to the Wine build tree (if different from SOURCEROOT) BUILDROOT=/path/to/wine-src
-# Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. +# Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. WRCROOT=/path/to/wine-src
# The directory where to store the generated langs/ and dumps/. Usually the # directory with the PHP scripts. -DESTDIR=../php +DESTDIR=.
# Temporary directory for some scratch files. Must be writable. WORKDIR=../work diff --git a/transl/scripts/parse_resfiles.php b/transl/php/parse_resfiles.php similarity index 99% rename from transl/scripts/parse_resfiles.php rename to transl/php/parse_resfiles.php index 41ed364..c6db13b 100644 --- a/transl/scripts/parse_resfiles.php +++ b/transl/php/parse_resfiles.php @@ -1,6 +1,6 @@ <?php -include("../php/lib.php"); -include("../php/lib_res.php"); +require("lib.php"); +require("lib_res.php");
function resource_name2($resource) { diff --git a/winetest/make-winetest b/winetest/make-winetest index 6494a5e..9211c38 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -132,7 +132,7 @@ umask 022
rm -rf data mkdir data data/res - php $toolsdir/transl/scripts/parse_resfiles.php -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log + php $toolsdir/transl/php/parse_resfiles.php -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log mv -f $transldir/data $transldir/data.old mv -f data $transldir/data rm -rf $transldir/data.old