Ticket #238: tt238-install-devel.patch
| File tt238-install-devel.patch, 4.5 KB (added by rurban, 13 years ago) |
|---|
-
MANIFEST.generated
old new 73 73 installable_pbc_merge [main]bin 74 74 installable_pbc_merge.exe [main]bin 75 75 libparrot.dll [main]bin 76 libparrot.lib [main]lib 76 77 parrot.pc [main]pkgconfig 77 78 pbc_disassemble [main]bin 78 79 pbc_disassemble.exe [main]bin … … 84 85 pbc_merge.exe [main]bin 85 86 pbc_to_exe [main]bin 86 87 pbc_to_exe.exe [main]bin 87 p db[main]bin88 p db.exe[main]bin88 parrot_debugger [main]bin 89 parrot_debugger.exe [main]bin 89 90 pirc [main]bin 90 91 pirc.exe [main]bin 91 92 runtime/parrot/dynext/apl_group.bundle [library] … … 260 261 src/parrot_config.c [main] 261 262 src/string_private_cstring.h [main]include 262 263 tools/build/dynpmc.pl [devel] 264 tools/build/dynoplibs.pl [devel] 263 265 tools/install/smoke.pl [main] -
tools/dev/install_files.pl
old new 20 20 21 21 =over 4 22 22 23 =item C<buildprefix> 23 =item C<--devel> 24 25 Install developer tools to build dynpmc and dynoplibs. 26 27 =item C<--destdir> 28 29 Installation prefix. Defaults to ''. 30 31 =item C<--buildprefix> 24 32 25 33 The build prefix. Defaults to ''. 26 34 27 =item C< prefix>35 =item C<--prefix> 28 36 29 37 The install prefix. Defaults to '/usr'. 30 38 31 =item C< exec_prefix>39 =item C<--exec_prefix> 32 40 33 41 The exec prefix. Defaults to '/usr'. 34 42 35 =item C< bindir>43 =item C<--bindir> 36 44 37 45 The executables directory. Defaults to '/usr/bin'. 38 46 39 =item C< libdir>47 =item C<--libdir> 40 48 41 49 The library directory. Defaults to '/usr/lib'. 42 50 43 =item C< includedir>51 =item C<--includedir> 44 52 45 53 The header directory. Defaults to '/usr/include'. 46 54 … … 127 135 libdir => '/usr/lib/parrot', 128 136 includedir => '/usr/include/parrot', 129 137 docdir => '/usr/share/doc/parrot', 138 devel => 0, 130 139 'dry-run' => 0, 131 140 ); 132 141 … … 167 176 $meta =~ s/^\[(.*?)\]//; 168 177 next unless $package; # Skip if this file belongs to no package 169 178 170 next unless $package =~ /main|library/;179 next unless $package =~ $options{devel} ? /main|library|devel/ : /main|library/; 171 180 172 181 my %meta; 173 182 @meta{ split( /,/, $meta ) } = (); … … 205 214 elsif ( /\[library]/ ) { 206 215 $dest =~ s/^runtime/$options{libdir}/; 207 216 } 217 elsif ( /\[devel]/ ) { 218 $dest =~ s/^tools//; 219 $dest = File::Spec->catdir( $options{libdir}, $dest ); 220 } 208 221 else { 209 222 $dest = File::Spec->catdir( $options{prefix}, $dest ); 210 223 } -
config/gen/makefiles/root.in
old new 651 651 @echo "" 652 652 @echo "Installation:" 653 653 @echo " install: Install under '$(PREFIX)' on Unix systems" 654 @echo " install-devel: Install including '$(LIBDIR)/parrot/tools'" 654 655 @echo "" 655 656 @echo "Documentation:" 656 657 @echo " help: Print this help message." … … 2114 2115 --docdir=$(DOC_DIR) \ 2115 2116 MANIFEST MANIFEST.generated 2116 2117 2118 install-devel: installable 2119 $(PERL) tools/dev/install_files.pl --devel \ 2120 --buildprefix=$(BUILDPREFIX) \ 2121 --prefix=$(PREFIX) \ 2122 --exec-prefix=$(EXEC_PREFIX) \ 2123 --bindir=$(BIN_DIR) \ 2124 --libdir=$(LIB_DIR) \ 2125 --includedir=$(INCLUDE_DIR) \ 2126 --destdir=$(DESTDIR) \ 2127 --docdir=$(DOC_DIR) \ 2128 MANIFEST MANIFEST.generated 2129 2117 2130 ############################################################################### 2118 2131 # 2119 2132 # release targets
