[svn:parrot] r11119 - in trunk: config/gen config/gen/makefiles tools/dev

[fperrad]

Author: fperrad
Date: Wed Jan 11 23:14:54 2006
New Revision: 11119

Modified:
   trunk/config/gen/icu.pm
   trunk/config/gen/makefiles/root.in
   trunk/tools/dev/mk_inno.pl
Log:
Inno Setup (Win32) needs to known where are ICU files.

Modified: trunk/config/gen/icu.pm
==============================================================================
--- trunk/config/gen/icu.pm     (original)
+++ trunk/config/gen/icu.pm     Wed Jan 11 23:14:54 2006
@@ -1,4 +1,4 @@
-# Copyright: 2001-2005 The Perl Foundation.  All Rights Reserved.
+# Copyright: 2001-2006 The Perl Foundation.  All Rights Reserved.
 # $Id$
 
 =head1 NAME
@@ -20,6 +20,7 @@ use base qw(Parrot::Configure::Step::Bas
 
 use Config;
 use Cwd qw(cwd);
+use File::Basename;
 use Parrot::Configure::Step qw(capture_output cc_gen cc_clean);
 
 $description = "Determining whether ICU is installed";
@@ -92,6 +93,7 @@ sub runstep
         $conf->data->set(
             has_icu    => 0,
             icu_shared => '', # used for generating src/dynclasses/Makefile
+            icu_dir    => '',
         );
         $result = "no" unless defined $gen::icu::result;
         return;
@@ -131,9 +133,12 @@ HELP
 
     #'
 
+    my $icudir = dirname($icuheaders);
+
     $conf->data->set(
         has_icu    => 1,
         icu_shared => $icushared,
+        icu_dir    => $icudir,
     );
 
     # Add -I $Icuheaders if necessary

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in  (original)
+++ trunk/config/gen/makefiles/root.in  Wed Jan 11 23:14:54 2006
@@ -1627,7 +1627,7 @@ rpms : release
        cd /usr/src/*/SPECS @make_and@ sudo rpm -ba parrot.spec
 
 win32-inno-installer : world install
-       $(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX) 
+       $(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX) 
[EMAIL PROTECTED]@ 
        $(INNO_SETUP) parrot.iss
 
 ###############################################################################

Modified: trunk/tools/dev/mk_inno.pl
==============================================================================
--- trunk/tools/dev/mk_inno.pl  (original)
+++ trunk/tools/dev/mk_inno.pl  Wed Jan 11 23:14:54 2006
@@ -1,6 +1,6 @@
 #! perl -w
 
################################################################################
-# Copyright: 2005 The Perl Foundation.  All Rights Reserved.
+# Copyright: 2005-2006 The Perl Foundation.  All Rights Reserved.
 # $Id$
 
################################################################################
 
@@ -26,9 +26,9 @@ The install prefix.
 
 The parrot version.
 
-=item C<icudatadir>
+=item C<icudir>
 
-The directory to locate ICU's data file(s).
+The directory to locate ICU.
 
 =back
 
@@ -45,7 +45,7 @@ use strict;
 my %options = (
                version => 'x.y.z',
                prefix => '\usr\local\parrot',
-               icudatadir => '',
+               icudir => '',
 );
 
 foreach (@ARGV) {
@@ -55,15 +55,13 @@ foreach (@ARGV) {
 }
 
 $options{prefix} =~ s/\//\\/g;
-$options{icudatadir} =~ s/\//\\/g;
+$options{icudir} =~ s/\//\\/g;
 
 my $icu_section = '';
-if ($options{icudatadir}) {
-       my $icuroot = $options{icudatadir};
-       $icuroot =~ s/\\\w+$//;
+if ($options{icudir}) {
        $icu_section = qq{
-Source: "$icuroot\\license.html"; DestDir: "{app}\\icu"; Flags:
-Source: "$icuroot\\bin\\icu*.dll"; DestDir: "{app}\\bin"; Flags:
+Source: "$options{icudir}\\license.html"; DestDir: "{app}\\icu"; Flags:
+Source: "$options{icudir}\\bin\\icu*.dll"; DestDir: "{app}\\bin"; Flags:
 };
 }