diff -ur --exclude=.svn parrot/MANIFEST parrot.new/MANIFEST --- parrot/MANIFEST 2009-02-24 18:32:13.000000000 +0100 +++ parrot.new/MANIFEST 2009-02-24 18:37:57.000000000 +0100 @@ -11,7 +11,6 @@ ChangeLog [] Configure.pl [] DEPRECATED.pod [] -DEVELOPING [] DONORS.pod [] LICENSE [main]doc MANIFEST [] @@ -330,6 +329,8 @@ config/gen/makefiles/tge.in [] config/gen/opengl.pm [] config/gen/parrot_include.pm [] +config/gen/parrot_spec.pm [] +config/gen/parrot_spec/parrot_spec.in [] config/gen/platform.pm [] config/gen/platform/aix/asm.s [] config/gen/platform/ansi/dl.c [] @@ -2003,7 +2004,6 @@ lib/Pod/Simple/TranscodeSmart.pm [] lib/Pod/Simple/XHTML.pm [] lib/Pod/Simple/XMLOutStream.pm [] -parrot.spec [] parrotbug [] runtime/parrot/dynext/README []doc runtime/parrot/include/README []doc diff -ur --exclude=.svn parrot/config/auto/revision.pm parrot.new/config/auto/revision.pm --- parrot/config/auto/revision.pm 2009-02-24 18:31:59.000000000 +0100 +++ parrot.new/config/auto/revision.pm 2009-02-24 18:38:52.000000000 +0100 @@ -39,6 +39,12 @@ } $conf->data->set( revision => $revision ); + if ( $conf->data->get('DEVEL') ) { + $conf->data->set(_DEVEL_REVISION => '_devel_r' . $revision,); + } + else { + $conf->data->set(_DEVEL_REVISION => ''); + } if ( defined $revision and $revision >= 1 ) { $self->set_result("r$revision"); diff -ur --exclude=.svn parrot/config/gen/makefiles/root.in parrot.new/config/gen/makefiles/root.in --- parrot/config/gen/makefiles/root.in 2009-02-24 18:32:00.000000000 +0100 +++ parrot.new/config/gen/makefiles/root.in 2009-02-24 18:40:17.000000000 +0100 @@ -2162,18 +2162,18 @@ ############################################################################### release : MANIFEST MANIFEST.generated - [ -d parrot-$(VERSION) ] || ln -s $(CUR_DIR) parrot-$(VERSION) + [ -d parrot-@VERSION@@_DEVEL_REVISION@ ] || ln -s $(CUR_DIR) parrot-@VERSION@@_DEVEL_REVISION@ @$(RM_F) MANIFEST.real mv MANIFEST MANIFEST.real grep -v DEVELOPING MANIFEST.real > MANIFEST - $(PERL) -lane 'print"parrot-$(VERSION)/$$F[0]"unless!length||/#/' MANIFEST | \ - tar -zcv -T - -f parrot-$(VERSION).tar.gz + $(PERL) -lane 'print"parrot-@VERSION@@_DEVEL_REVISION@/$$F[0]"unless!length||/#/' MANIFEST | \ + tar -zcv -T - -f parrot-@VERSION@@_DEVEL_REVISION@.tar.gz mv MANIFEST.real MANIFEST - rm parrot-$(VERSION) + rm parrot-@VERSION@@_DEVEL_REVISION@ rpms : release mkdir -p rpmbuild/SOURCES rpmbuild/SPEC rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SRPMS - cp parrot-$(VERSION).tar.gz rpmbuild/SOURCES + cp parrot-@VERSION@@_DEVEL_REVISION@.tar.gz rpmbuild/SOURCES cp parrot.spec rpmbuild/SPEC echo '%_topdir '`pwd`'/rpmbuild' > .rpmmacros HOME=`pwd`; rpmbuild -ba parrot.spec Only in parrot.new/config/gen: parrot_spec Only in parrot.new/config/gen: parrot_spec.pm diff -ur --exclude=.svn parrot/lib/Parrot/Configure/Step/List.pm parrot.new/lib/Parrot/Configure/Step/List.pm --- parrot/lib/Parrot/Configure/Step/List.pm 2009-02-24 18:31:47.000000000 +0100 +++ parrot.new/lib/Parrot/Configure/Step/List.pm 2009-02-24 18:41:25.000000000 +0100 @@ -75,6 +75,7 @@ gen::makefiles gen::platform gen::config_pm + gen::parrot_spec ); sub get_steps_list { return @steps; } Only in parrot: parrot.spec