[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1219
Date       : Wed May 31 10:52:41 BST 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/build-resources.pl
   M /Trunk/XaraLX/wxOil/Makefile.am

Hopefully fix the last of the wxrc problems


Diff:
Index: Trunk/XaraLX/Scripts/build-resources.pl
===================================================================
--- Trunk/XaraLX/Scripts/build-resources.pl	(revision 1218)
+++ Trunk/XaraLX/Scripts/build-resources.pl	(revision 1219)
@@ -357,15 +357,28 @@
     }
     close(STRINGS);
     
-    open(DIALOGS,"$wxrc -g $outputdir/xrc/dialogs.xrc|") || die "Could not read dialogs for translation: $!";
+    my $wxrccommand;
+    $wxrccommand=$wxrc." -g $outputdir/xrc/dialogs.xrc";
+    if ($wxrc=~/ /)
+    {
+	# Some installations have an "eval" type command to set LD_PATH
+	$wxrccommand="/bin/sh -c '".$wxrccommand."'";
+    }
+
+    my $dlines=0;
+    open(DIALOGS,"$wxrccommand|") || die "Could not read dialogs for translation: $!";
     while (<DIALOGS>)
     {
 	# Note wxrc removes XML escaping
 	chomp;
 	print STDERR "Dialog: $_
" if ($verbose>2);
 	push @strings,$_;
+	$dlines++;
     }
+    close(DIALOGS);
     
+    die "Could not read dialogs for translation (empty or bad wxrc)" if ($dlines<2);
+
     my @uniqstrings;
     my $last="";
     foreach $i (sort @strings)
Index: Trunk/XaraLX/wxOil/Makefile.am
===================================================================
--- Trunk/XaraLX/wxOil/Makefile.am	(revision 1218)
+++ Trunk/XaraLX/wxOil/Makefile.am	(revision 1219)
@@ -44,5 +44,5 @@
 # Ensure wxrc is set to something. If wxconfig can't find it, it becomes an empty string which will upset build-resources.pl
 WXRC := ${if @WXRC@,@WXRC@,echo}
 
-RESOURCEDUMMY := ${if ${strip ${shell $(TOPDIR)/Scripts/build-resources.pl -i -t $(TOPDIR) -o . --version $(VERSION) -x $(XARALANGUAGE) -u $(USER) --wxrc $(WXRC) } }, ,${error "Resource build failed"}}
+RESOURCEDUMMY := ${if ${strip ${shell $(TOPDIR)/Scripts/build-resources.pl -i -t $(TOPDIR) -o . --version $(VERSION) -x $(XARALANGUAGE) -u $(USER) --wxrc "$(WXRC)" } }, ,${error "Resource build failed"}}
 


Xara