Author: leo
Date: Mon Apr 25 01:13:45 2005
New Revision: 7924
Modified:
trunk/config/gen/makefiles/root.in
trunk/docs/pdds/pdd04_datatypes.pod
trunk/tools/dev/mk_inno.pl
Log:
[perl #35084] [PATCH] win32-inno-installer with ICU 3.2
This patch allows the inclusion of ICU DLL in the installer.
Courtesy of François Perrad <[EMAIL PROTECTED]>
---
[PATCH] ppd04 fix
This patch fills in two holes in pdd04 (internal data types). The information
came from include/parrot/pobj.h.
Courtesy of Christoph Otto <[EMAIL PROTECTED]>
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Mon Apr 25 01:13:45 2005
@@ -1343,8 +1343,8 @@
sudo cp parrot.spec /usr/src/*/SPECS
cd /usr/src/*/SPECS ${make_and} sudo rpm -ba parrot.spec
-win32-inno-installer : install
- $(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX)
+win32-inno-installer : world install
+ $(PERL) tools/dev/mk_inno.pl --version=$(VERSION) --prefix=$(PREFIX)
--icudatadir=${icu_datadir}
$(INNO_SETUP) /Q parrot.iss
###############################################################################
Modified: trunk/docs/pdds/pdd04_datatypes.pod
==============================================================================
--- trunk/docs/pdds/pdd04_datatypes.pod (original)
+++ trunk/docs/pdds/pdd04_datatypes.pod Mon Apr 25 01:13:45 2005
@@ -267,9 +267,10 @@
C<_metadata> holds internal PMC metadata. The specification for this has not
yet been finalized.
-XXX: what does C<_synchronize> do?
+C<_synchronize> is for access synchronization between shared PMCs.
-XXX: ditto C<_next_for_GC>...
+C<_next_for_GC> determines the next PMC in the 'used' list during dead object
+detection in the GC.
PMCs are not required to have a C<PMC_EXT> structure (i.e. C<pmc_ext> can
be null).
Modified: trunk/tools/dev/mk_inno.pl
==============================================================================
--- trunk/tools/dev/mk_inno.pl (original)
+++ trunk/tools/dev/mk_inno.pl Mon Apr 25 01:13:45 2005
@@ -26,6 +26,10 @@
The parrot version.
+=item C<icudatadir>
+
+The directory to locate ICU's data file(s).
+
=back
=head1 SEE ALSO
@@ -36,9 +40,12 @@
################################################################################
+use strict;
+
my %options = (
version => 'x.y.z',
prefix => '\usr\local\parrot',
+ icudatadir => '',
);
foreach (@ARGV) {
@@ -48,6 +55,17 @@
}
$options{prefix} =~ s/\//\\/g;
+$options{icudatadir} =~ s/\//\\/g;
+
+my $icu_section = '';
+if ($options{icudatadir}) {
+ my $icuroot = $options{icudatadir};
+ $icuroot =~ s/\\\w+$//;
+ $icu_section = qq{
+Source: "$icuroot\\share\\icu\\3.2\\license.html"; DestDir: "{app}\\icu";
Flags:
+Source: "$icuroot\\lib\\icu*.dll"; DestDir: "{app}\\bin"; Flags:
+};
+}
open OUT, "> parrot.iss" or die "Can't open parrot.iss";
@@ -73,6 +91,7 @@
[Files]
Source: "$options{prefix}\\*"; DestDir: "{app}"; Flags: ignoreversion
recursesubdirs
+${icu_section}
[Icons]
Name: "{group}\\{cm:UninstallProgram,parrot}"; Filename: "{uninstallexe}"
