1 --- origsrc/parrot-1.0.0/MANIFEST.generated 2009-03-17 07:08:41.000000000 +0000
2 +++ src/parrot-1.0.0/MANIFEST.generated 2009-04-05 16:12:23.546875000 +0000
3 @@ -7,6 +7,8 @@ blib/lib/libparrot.a
4 blib/lib/libparrot.dylib [main]lib
5 blib/lib/libparrot.so.1.0.0 [main]lib
6 blib/lib/libparrot.so [main]lib
7 +cygparrot1_0_0.dll [main]bin
8 +libparrot.dll.a [main]lib
9 compilers/json/JSON/grammar.pbc [json]
10 compilers/json/JSON.pbc [json]
11 compilers/json/JSON/pge2pir.pbc [json]
12 @@ -46,6 +48,8 @@ include/parrot/platform.h
13 include/parrot/platform_interface.h [main]include
14 include/parrot/platform_limits.h [devel]include
15 include/parrot/vtable.h [main]include
16 +install_config.o [devel]src
17 +install_config.obj [devel]src
18 install_config.fpmc [main]lib
19 installable_parrot_config.exe [main]bin
20 installable_parrot_config [main]bin
21 @@ -57,8 +61,6 @@ installable_pbc_disassemble.exe
22 installable_pbc_disassemble [main]bin
23 installable_pbc_dump.exe [main]bin
24 installable_pbc_dump [main]bin
25 -installable_pbc_info.exe [main]bin
26 -installable_pbc_info [main]bin
27 installable_pbc_merge.exe [main]bin
28 installable_pbc_merge [main]bin
29 installable_pbc_to_exe.exe [main]bin
30 @@ -73,8 +75,6 @@ pbc_disassemble.exe
31 pbc_disassemble [main]bin
32 pbc_dump.exe [main]bin
34 -pbc_info.exe [main]bin
36 pbc_merge.exe [main]bin
38 pbc_to_exe.exe [main]bin
39 @@ -147,11 +147,16 @@ runtime/parrot/include/warnings.pasm
40 runtime/parrot/library/CGI/QueryHash.pbc [main]
41 runtime/parrot/library/config.pbc [main]
42 runtime/parrot/library/config.pir [main]
43 +runtime/parrot/library/Config/JSON.pbc [main]
44 +runtime/parrot/library/Crow.pbc [main]
45 runtime/parrot/library/Data/Dumper/Base.pbc [main]
46 runtime/parrot/library/Data/Dumper/Default.pbc [main]
47 runtime/parrot/library/Data/Dumper.pbc [main]
48 +runtime/parrot/library/Data/Replace.pbc [main]
49 +runtime/parrot/library/Digest/MD5.pbc [main]
50 runtime/parrot/library/dumper.pbc [main]
51 runtime/parrot/library/Getopt/Obj.pbc [main]
52 +runtime/parrot/library/libpcre.pbc [main]
53 runtime/parrot/library/Math/Random/mt19937ar.pbc [main]
54 runtime/parrot/library/Math/Rand.pbc [main]
55 runtime/parrot/library/MIME/Base64.pbc [main]
56 @@ -177,7 +182,9 @@ runtime/parrot/library/PGE.pbc
57 runtime/parrot/library/PGE/Perl6Grammar.pbc [main]
58 runtime/parrot/library/PGE/Text.pbc [main]
59 runtime/parrot/library/PGE/Util.pbc [main]
60 +runtime/parrot/library/postgres.pbc [main]
61 runtime/parrot/library/Protoobject.pbc [main]
62 +runtime/parrot/library/STM.pbc [main]
63 runtime/parrot/library/Stream/Base.pbc [main]
64 runtime/parrot/library/Stream/Combiner.pbc [main]
65 runtime/parrot/library/Stream/Coroutine.pbc [main]
66 @@ -187,12 +194,24 @@ runtime/parrot/library/Stream/ParrotIO.p
67 runtime/parrot/library/Stream/Replay.pbc [main]
68 runtime/parrot/library/Stream/Sub.pbc [main]
69 runtime/parrot/library/Stream/Writer.pbc [main]
70 +runtime/parrot/library/Test/Builder/Output.pbc [main]
71 +runtime/parrot/library/Test/Builder/Test.pbc [main]
72 +runtime/parrot/library/Test/Builder/Tester.pbc [main]
73 +runtime/parrot/library/Test/Builder/TestPlan.pbc [main]
74 +runtime/parrot/library/Test/Builder.pbc [main]
75 +runtime/parrot/library/Test/Class.pbc [main]
76 +runtime/parrot/library/Test/More.pbc [main]
77 +runtime/parrot/library/Tcl/Glob.pbc [main]
78 +runtime/parrot/library/uuid.pbc [main]
79 +runtime/parrot/library/yaml_dumper.pbc [main]
80 +runtime/parrot/library/YAML/Parser/Syck.pbc [main]
81 runtime/parrot/library/TGE.pbc [tge]
82 src/call_list.txt [devel]src
83 src/glut_callbacks.c []
88 +src/null_config.o [devel]src
89 src/ops/core_ops_cgp.c []
90 src/ops/core_ops_switch.c []
91 src/parrot_config.c []
92 @@ -226,5 +245,6 @@ src/pmc/string.dump
93 src/pmc/sub.dump [devel]src
94 src/pmc/undef.dump [devel]src
95 src/string_private_cstring.h []
96 -tools/build/dynpmc.pl []
97 -vtable.dump [devel]src
98 +tools/build/dynpmc.pl [devel]
99 +tools/build/dynoplibs.pl [devel]
101 --- origsrc/parrot-1.0.0/config/gen/makefiles/dynoplibs_pl.in 2009-03-08 20:32:48.000000000 +0000
102 +++ src/parrot-1.0.0/config/gen/makefiles/dynoplibs_pl.in 2009-04-03 17:03:48.015625000 +0000
103 @@ -30,6 +30,7 @@ our $PERL = q[@perl@];
104 our $LOAD_EXT = q[@load_ext@];
106 our $CFLAGS = q[@ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@];
107 +our $installed = "@build_dir@" ne "@prefix@";
109 our $LIBPARROT = q[];
110 #IF(parrot_is_shared):$LIBPARROT = q[@libparrot_ldflags@];
111 @@ -38,10 +39,17 @@ our $LIBPARROT = q[];
112 our $PATHQUOTE = $^O eq 'MSWin32' ? q["] : q[];
115 +our $installed = "@build_dir@" ne "@prefix@";
116 +our $toolsbuild = $installed ? "@lib_dir@@versiondir@@slash@tools@slash@build@slash@"
117 + : "@build_dir@@slash@tools@slash@build@slash@";
118 +our $PMC2C = "$PERL $PATHQUOTE" . $toolsbuild . q[pmc2c.pl] . $PATHQUOTE;
119 +our $incdir = $installed ? "@include_dir@@versiondir@"
120 + : "@build_dir@@slash@include";
121 +our $perllib = $installed ? "@lib_dir@/@versiondir@/tools/lib" : q[@build_dir@@slash@lib];
122 our $OPS2C = "$PERL -I $PATHQUOTE" .
123 - q[@build_dir@@slash@lib] .
125 "$PATHQUOTE $PATHQUOTE" .
126 - q[@build_dir@@slash@tools@slash@build@slash@ops2c.pl] .
127 + $toolsbuild . 'ops2c.pl' .
131 @@ -57,8 +65,9 @@ sub compile_cmd {
134 "@cc_o_out@" . $target . " " .
135 - "-I" . $PATHQUOTE . '@build_dir@@slash@include' . $PATHQUOTE . " " .
136 - "-I" . $PATHQUOTE . '@build_dir@@slash@src@slash@pmc' . $PATHQUOTE . " " .
137 + "-I" . $PATHQUOTE . $incdir . $PATHQUOTE . " " .
138 + "-I" . $PATHQUOTE . $incdir . ($installed ? '@slash@pmc' : '@slash@src@slash@pmc') .
143 --- origsrc/parrot-1.0.0/config/gen/makefiles/dynpmc_pl.in 2009-03-08 20:32:48.000000000 +0000
144 +++ src/parrot-1.0.0/config/gen/makefiles/dynpmc_pl.in 2009-04-03 17:02:45.640625000 +0000
145 @@ -18,6 +18,7 @@ use warnings;
147 use lib "$FindBin::Bin/../..";
148 use lib "$FindBin::Bin/../../lib";
149 +use lib "@lib_dir@/@versiondir@/tools/lib";
151 use File::Copy qw(copy);
153 @@ -42,7 +43,12 @@ our $LIBPARROT = q[];
154 our $PATHQUOTE = $^O eq 'MSWin32' ? q["] : q[];
157 -our $PMC2C = "$PERL $PATHQUOTE" . q[@build_dir@@slash@tools@slash@build@slash@pmc2c.pl] . $PATHQUOTE;
158 +our $installed = "@build_dir@" ne "@prefix@";
159 +our $toolsbuild = $installed ? "@lib_dir@@versiondir@@slash@tools@slash@build@slash@"
160 + : "@build_dir@@slash@tools@slash@build@slash@";
161 +our $PMC2C = "$PERL $PATHQUOTE" . $toolsbuild . q[pmc2c.pl] . $PATHQUOTE;
162 +our $incdir = $installed ? "@include_dir@@versiondir@"
163 + : "@build_dir@@slash@include";
167 @@ -61,8 +67,9 @@ sub compile_cmd {
170 '@cc_o_out@' . $target . " " .
171 - "-I" . $PATHQUOTE . '@build_dir@@slash@include' . $PATHQUOTE . " " .
172 - "-I" . $PATHQUOTE . '@build_dir@@slash@src@slash@pmc' . $PATHQUOTE . " " .
173 + "-I" . $PATHQUOTE . $incdir . $PATHQUOTE . " " .
174 + "-I" . $PATHQUOTE . $incdir . ($installed ? '@slash@pmc' : '@slash@src@slash@pmc') .
176 $dynpmc_include . " " .
179 @@ -88,10 +95,10 @@ sub partial_link_cmd {
181 # Also note that we may need to look in the Parrot blib directory.
183 - $liblist .= qq{ -Wl,-L "@build_dir@/blib/lib"};
184 + $liblist .= $installed ? qq{ -Wl,-L "@lib_dir@"} : qq{ -Wl,-L "@build_dir@/blib/lib"};
187 - $liblist .= qq{ /LIBPATH:"@build_dir@/blib/lib"};
188 + $liblist .= $installed ? qq{ /LIBPATH:"@lib_dir@"} : qq{ /LIBPATH:"@build_dir@/blib/lib"};
192 --- origsrc/parrot-1.0.0/config/init/install.pm 2009-03-07 19:53:39.000000000 +0000
193 +++ src/parrot-1.0.0/config/init/install.pm 2009-04-03 17:50:56.984375000 +0000
194 @@ -85,7 +85,7 @@ sub runstep {
195 my $mandir = assign_dir( $conf, 'mandir', $prefix, '/man' );
197 # --srcdir=DIR source code files PREFIX/src]
198 - my $srcdir = assign_dir( $conf, 'srcdir', $prefix, '/src' );
199 + my $srcdir = assign_dir( $conf, 'srcdir', $prefix, "/lib$versiondir/src" );
203 --- origsrc/parrot-1.0.0/runtime/parrot/library/OpenGL.pir 2009-03-12 05:45:58.000000000 +0000
204 +++ src/parrot-1.0.0/runtime/parrot/library/OpenGL.pir 2009-04-01 16:46:51.728625000 +0000
205 @@ -108,6 +108,7 @@ the known different filenames for each l
206 libnames = new 'ResizableStringArray'
207 push libnames, 'libGL'
208 push libnames, 'opengl32'
209 + push libnames, '/usr/bin/cygGL-1.dll'
210 push libnames, '/System/Library/Frameworks/OpenGL.framework/OpenGL'
211 libgl = _load_lib_with_fallbacks('GL', libnames)
212 set_global '_libgl', libgl
213 @@ -115,6 +116,7 @@ the known different filenames for each l
214 libnames = new 'ResizableStringArray'
215 push libnames, 'libGLU'
216 push libnames, 'glu32'
217 + push libnames, '/usr/bin/cygGLU-1.dll'
218 push libnames, '/System/Library/Frameworks/OpenGL.framework/OpenGL'
219 libglu = _load_lib_with_fallbacks('GLU', libnames)
220 set_global '_libglu', libglu
221 @@ -122,6 +124,7 @@ the known different filenames for each l
222 libnames = new 'ResizableStringArray'
223 push libnames, 'libglut'
224 push libnames, 'glut32'
225 + push libnames, '/usr/bin/cygglut-3.dll'
226 push libnames, '/System/Library/Frameworks/GLUT.framework/GLUT'
227 libglut = _load_lib_with_fallbacks('GLUT', libnames)
228 set_global '_libglut', libglut
229 --- origsrc/parrot-1.0.0/src/library.c 2009-03-08 21:11:36.000000000 +0000
230 +++ src/parrot-1.0.0/src/library.c 2009-03-31 17:14:56.213000000 +0000
231 @@ -189,6 +189,7 @@ parrot_init_library_paths(PARROT_INTERP)
232 versionlib = VTABLE_get_string_keyed_str(interp, config_hash, libkey);
233 entry = VTABLE_get_string_keyed_str(interp, config_hash, verkey);
234 versionlib = Parrot_str_append(interp, versionlib, entry);
235 + VTABLE_push_string(interp, paths, versionlib);
236 entry = Parrot_str_concat(interp, versionlib, CONST_STRING(interp, "/include/"), 0);
237 VTABLE_push_string(interp, paths, entry);
239 @@ -205,6 +206,7 @@ parrot_init_library_paths(PARROT_INTERP)
240 entry = CONST_STRING(interp, "./");
241 VTABLE_push_string(interp, paths, entry);
242 if (!STRING_IS_NULL(versionlib)) {
243 + VTABLE_push_string(interp, paths, versionlib);
244 entry = Parrot_str_concat(interp, versionlib, CONST_STRING(interp, "/library/"), 0);
245 VTABLE_push_string(interp, paths, entry);
247 --- origsrc/parrot-1.0.0/t/native_pbc/header.t 2009-03-13 07:04:51.000000000 +0000
248 +++ src/parrot-1.0.0/t/native_pbc/header.t 2009-03-24 16:11:28.239125000 +0000
249 @@ -6,7 +6,9 @@ use strict;
251 use lib qw( . lib ../lib ../../lib );
253 -use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
255 +#use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
256 +use Parrot::Test tests => 9;
260 --- origsrc/parrot-1.0.0/t/native_pbc/integer.t 2009-03-16 18:13:23.000000000 +0000
261 +++ src/parrot-1.0.0/t/native_pbc/integer.t 2009-03-24 16:11:28.239125000 +0000
262 @@ -9,8 +9,8 @@ use Test::More;
264 use Parrot::BuildUtil;
266 -use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
267 -#use Parrot::Test tests => 7;
268 +#use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
269 +use Parrot::Test tests => 7;
273 --- origsrc/parrot-1.0.0/t/native_pbc/number.t 2009-03-16 18:13:23.000000000 +0000
274 +++ src/parrot-1.0.0/t/native_pbc/number.t 2009-03-24 16:11:28.239125000 +0000
275 @@ -9,8 +9,8 @@ use Test::More;
277 use Parrot::BuildUtil;
279 -use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
280 -#use Parrot::Test tests => 7;
281 +#use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
282 +use Parrot::Test tests => 7;
286 --- origsrc/parrot-1.0.0/t/native_pbc/string.t 2009-03-13 20:56:39.000000000 +0000
287 +++ src/parrot-1.0.0/t/native_pbc/string.t 2009-03-24 16:11:28.239125000 +0000
288 @@ -9,8 +9,8 @@ use Test::More;
290 use Parrot::BuildUtil;
292 -use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
293 -#use Parrot::Test tests => 6;
294 +#use Parrot::Test skip_all => 'pending robust testing strategy, TT #357';
295 +use Parrot::Test tests => 6;
299 --- origsrc/parrot-1.0.0/tools/dev/install_dev_files.pl 2009-02-23 21:33:23.000000000 +0000
300 +++ src/parrot-1.0.0/tools/dev/install_dev_files.pl 2009-04-03 17:31:42.718750000 +0000
301 @@ -73,7 +73,6 @@ my %options = (
302 includedir => '/usr/include', # parrot/ subdir added below
303 docdir => '/usr/share/doc', # parrot/ subdir added below
304 datadir => '/usr/share/', # parrot/ subdir added below
305 - srcdir => '/usr/src/', # parrot/ subdir added below
309 @@ -88,6 +87,7 @@ foreach (@ARGV) {
312 my $parrotdir = $options{versiondir};
313 +$options{srcdir} = '/usr/lib' . $parrotdir . '/src/' unless $options{srcdir};
315 # We'll report multiple occurrences of the same file
317 @@ -135,7 +135,7 @@ while (<>) {
319 elsif ( $meta{src} ) {
320 $dest =~ s/^src//; # strip off leading src/ dir
321 - $dest = File::Spec->catdir( $options{srcdir}, $parrotdir, $dest );
322 + $dest = File::Spec->catdir( $options{srcdir}, $dest );
324 elsif ( $meta{doc} ) {
325 $dest =~ s/^docs/pod/; # docs dir are actually raw Pod
326 @@ -151,6 +151,9 @@ while (<>) {
327 elsif ( /^VERSION/ ) {
328 $dest = File::Spec->catdir( $options{libdir}, $parrotdir, $dest );
330 + elsif ( /^(vtable|call_list)/ ) {
331 + $dest = File::Spec->catdir( $options{libdir}, $parrotdir, $dest );
333 elsif ( /^compilers/ ) {
334 $dest =~ s/^compilers/languages/;
335 $dest = File::Spec->catdir( $options{libdir}, $parrotdir, $dest );
336 --- origsrc/parrot-1.0.0/tools/dev/install_files.pl 2009-03-10 23:35:20.000000000 +0000
337 +++ src/parrot-1.0.0/tools/dev/install_files.pl 2009-04-05 16:04:40.093750000 +0000
338 @@ -217,7 +217,7 @@ while (<>) {
339 # as it is typically done with automake installed packages. If there
340 # is a use case to make this configurable we'll add a seperate
341 # --pkgconfigdir option.
342 - $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $parrotdir, $dest );
343 + $dest = File::Spec->catdir( $options{libdir}, 'pkgconfig', $dest );
345 elsif ( /^compilers/ ) {
346 $dest =~ s/^compilers/languages/;
347 --- origsrc/parrot-1.0.0/tools/dev/pbc_to_exe.pir 2009-02-17 20:03:48.000000000 +0000
348 +++ src/parrot-1.0.0/tools/dev/pbc_to_exe.pir 2009-04-04 15:31:46.750000000 +0000
349 @@ -26,8 +26,9 @@ Warning! With --install there must be no
350 .local string exefile
352 .local int closeresult
353 + .local int installed
355 - (infile, cfile, objfile, exefile) = 'handle_args'(argv)
356 + (infile, cfile, objfile, exefile, installed) = 'handle_args'(argv)
357 unless infile > '' goto err_infile
359 .local string codestring
360 @@ -83,8 +84,18 @@ MAIN
361 closeresult = outfh.'close'()
362 unless closeresult == 0 goto err_close
364 - 'compile_file'(cfile, objfile)
365 - 'link_file'(objfile, exefile)
366 + $P0 = new 'ResizablePMCArray'
370 + $S0 = sprintf " compile_file(\"%s\", \"%s\", %d):", $P0
372 + 'compile_file'(cfile, objfile, installed)
375 + $S0 = sprintf " link_file(\"%s\", \"%s\", %d):", $P0
377 + 'link_file'(objfile, exefile, installed)
381 @@ -98,6 +109,8 @@ MAIN
385 + .local int installed
390 @@ -120,11 +133,19 @@ MAIN
393 .local string cfile, objfile, obj, exefile, exe
394 + .local string prefix, build_dir
399 + prefix = $P0['prefix']
400 + build_dir = $P0['build_dir']
401 + if prefix == build_dir goto lab_installed
405 + print " installed="
407 .local int infile_len
408 infile_len = length infile
410 @@ -138,15 +159,23 @@ MAIN
414 - .return(infile, cfile, objfile, exefile)
415 + .return(infile, cfile, objfile, exefile, installed)
418 .local string infile, cfile, objfile, obj, exefile, exe
419 + .local string prefix, build_dir
424 + prefix = $P0['prefix']
425 + build_dir = $P0['build_dir']
426 + if prefix == build_dir goto lab_installed1
430 + print " installed="
435 @@ -167,7 +196,7 @@ MAIN
436 # remove .c for executable
438 # TODO this should complain about results/returns mismatch
439 - .return(infile, cfile, objfile, exefile)
440 + .return(infile, cfile, objfile, exefile, installed)
444 @@ -223,7 +252,7 @@ MAIN
447 .param string objfile
448 - .param int install :optional
449 + .param int installed
452 .local string cc, ccflags, cc_o_out, osname, build_dir, slash
453 @@ -237,6 +266,16 @@ MAIN
454 .local string includedir, pathquote
455 includedir = concat build_dir, slash
456 includedir = concat includedir, 'include'
458 + unless installed goto inc_notinstalled
459 + .local string include_dir, versiondir
460 + include_dir = $P0['include_dir']
461 + versiondir = $P0['versiondir']
462 + includedir = concat include_dir, versiondir
465 + print " includedir="
468 unless osname == 'MSWin32' goto not_windows
470 @@ -272,7 +311,7 @@ MAIN
472 .param string objfile
473 .param string exefile
474 - .param int install :optional
475 + .param int installed
478 .local string cc, link, link_dynamic, linkflags, ld_out, libparrot, libs, o
479 @@ -293,16 +332,29 @@ MAIN
481 .local string config, pathquote, exeprefix
482 exeprefix = substr exefile, 0, 12
483 + if installed goto config_installed
484 + # special build_time paths
485 config = concat build_dir, slash
488 + goto check_installable
490 + .local string lib_dir, versiondir
491 + lib_dir = $P0['lib_dir']
492 + versiondir = $P0['versiondir']
493 + config = concat lib_dir, versiondir
497 + goto config_install
499 if exeprefix == 'installable_' goto config_install
500 config .= 'parrot_config'
504 config .= 'install_config'
505 rpath = $P0['rpath_lib']
510 unless osname == 'MSWin32' goto not_windows