Passing $(DEVELOPER_PATH) to the compile-xib script to select the right ibtool.

svn path=/trunk/netsurf/; revision=12048
This commit is contained in:
Sven Weidauer 2011-03-14 18:36:41 +00:00
parent 050eba408d
commit 7acc13d863
2 changed files with 8 additions and 8 deletions

View File

@ -158,7 +158,7 @@ $$(OBJROOT)/$(2).lproj: $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(1) $$(OBJROOT)/created
$(VQ)echo Compiling XIB $(1) for language $(2)
$(Q)mkdir -p $$(OBJROOT)/$(2).lproj
$(Q)cocoa/compile-xib.sh cocoa/res/$(1) $(2) $$@
$(Q)cocoa/compile-xib.sh $(DEVELOPER_PATH) cocoa/res/$(1) $(2) $$@
ifeq ($(wildcard cocoa/res/$(2).lproj/$(1).strings),cocoa/res/$(2).lproj/$(1).strings)
$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(2).lproj/$(1).strings

View File

@ -1,20 +1,20 @@
#!/bin/sh
# call: compile-xib.sh [xib file] [language] [(optional output nib file)]
DIR=`dirname "$1"`
XIB=`basename -s .xib "$1"`
DIR=`dirname "$2"`
XIB=`basename -s .xib "$2"`
STRINGS_FILE="$DIR/$2.lproj/$XIB.xib.strings"
STRINGS_FILE="$DIR/$3.lproj/$XIB.xib.strings"
TRANSLATE=""
if [ -f $STRINGS_FILE ]
then
TRANSLATE="--strings-file $STRINGS_FILE"
fi
OUTPUT="$2.$XIB.nib"
OUTPUT="$3.$XIB.nib"
if [ "x$3" != "x" ]
if [ "x$4" != "x" ]
then
OUTPUT="$3"
OUTPUT="$4"
fi
exec ibtool $TRANSLATE --compile $OUTPUT $1
exec $1/usr/bin/ibtool $TRANSLATE --compile $OUTPUT $2