[commits] (bear) [11263] Posting markku's changes to the script to use wxrc that is now located in the Chandler bin directory

[commits]

Title: [commits] (bear) [11263] Posting markku's changes to the script to use wxrc that is now located in the Chandler bin directory

Revision

11263

Author

bear

Date

2006-07-26 14:54:41 -0700 (Wed, 26 Jul 2006)

Log Message

Posting markku's changes to the script to use wxrc that is now located in the Chandler bin directory
bug 5972, r=bear

Modified Paths

• trunk/chandler/tools/createxrcpot.sh

Diff

Modified: trunk/chandler/tools/createxrcpot.sh (11262 => 11263)

--- trunk/chandler/tools/createxrcpot.sh	2006-07-26 19:04:51 UTC (rev 11262)
+++ trunk/chandler/tools/createxrcpot.sh	2006-07-26 21:54:41 UTC (rev 11263)
@@ -17,6 +17,24 @@
 C_DIR=`pwd`
 C_DIR=`dirname $C_DIR`
 
+if [ -d "$C_DIR/release" ]; then
+  MODE_VALUE=release
+else
+  MODE_VALUE=debug
+fi
+if [ "$OSTYPE" = "cygwin" ]; then
+  WXRCCMD=$C_DIR/$MODE_VALUE/bin/wxrc.exe
+else
+  WXRCCMD=$C_DIR/$MODE_VALUE/bin/wxrc
+fi
+
+echo [$C_DIR] [$WXRCCMD]
+
+if [ ! -e $WXRCCMD ]; then
+  echo "ERROR: Unable to find wxrc tool."
+  exit 1
+fi
+
 SCAN_DIR=$C_DIR
 OUT_FILE=ChandlerXRC.pot
 MERGE_FILE=chandler.pot
@@ -37,7 +55,7 @@
   MERGE_FILE=`cygpath -aw $MERGE_FILE`
 fi
 
-XRC_FILES=`find $SCAN_DIR -type f -name *.xrc -print`
+XRC_FILES=`find $SCAN_DIR -type d \( -name debug -o -name release \) -prune -o -type f -name '*.xrc' | grep .xrc`
 CPP_FILES=
 
 for item in $XRC_FILES ; do
@@ -47,11 +65,19 @@
     XRCNAME=`cygpath -aw $XRCNAME`
     CPPNAME=`cygpath -aw $CPPNAME`
   fi
-  wxrc -g -o $CPPNAME $XRCNAME
+  $WXRCCMD -g -o $CPPNAME $XRCNAME
+  if [ $? != 0 ]; then
+    echo "ERROR (wxrc): Unable to convert an XRC file to a C++ source file."
+    exit 2
+  fi
   CPP_FILES="$CPP_FILES $CPPNAME"
 done
 
 xgettext -C -a -o $OUT_FILE $CPP_FILES
+if [ $? != 0 ]; then
+  echo "ERROR (xgettext): Extracting _() blocks from C++ source files was unsuccesful."
+  exit 3
+fi
 
 for item in $XRC_FILES ; do
   rm `basename $item .xrc`.cpp
@@ -62,5 +88,8 @@
   rm $MERGE_FILE
   mv tmp.pot $MERGE_FILE
 else
-  echo $MERGE_FILE "does not exist."
-fi
\ No newline at end of file
+  echo "WARNING: $MERGE_FILE does not exist so we could not merge with it."
+  exit 4
+fi
+
+exit 0

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits