cvs commit: ALFS/profiles/BLFS/chapter12 gcc-full.xml j2sdk.xml perlmodules.xml tcl.xml tk.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 19:45:18 PDT 2004


kpfleming    04/07/03 20:45:18

  Modified:    profiles/BLFS/chapter12 gcc-full.xml j2sdk.xml
                        perlmodules.xml tcl.xml tk.xml
  Log:
  use unpack for zip files instead of running unzip directly
  tcl/tk major-minor version entities used instead of hardcoding in profile
  use ALFS elements properly
  
  Revision  Changes    Path
  1.7       +7 -2      ALFS/profiles/BLFS/chapter12/gcc-full.xml
  
  Index: gcc-full.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/gcc-full.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- gcc-full.xml	3 Jul 2004 20:45:31 -0000	1.6
  +++ gcc-full.xml	4 Jul 2004 02:45:18 -0000	1.7
  @@ -41,9 +41,14 @@
   		</search_replace>
   
   		<execute base="&build_dir;/&gcc-full-directory;/gcc/ada"
  -		        command="touch treeprs.ads [es]info.h nmake.ad[bs]" />
  +		        command="touch">
  +			<param>treeprs.ads</param>
  +			<param>[es]info.h</param>
  +			<param>nmake.ad[bs]</param>
  +		</execute>
   
  -		<configure command="CC=/usr/bin/gcc ../&gcc-full-directory;/configure">
  +		<configure command="../&gcc-full-directory;/configure">
  +			<prefix>CC=/usr/bin/gcc</prefix>
   		        <param>--prefix=/usr</param>
   			<param>--enable-shared</param>
   			<param>--enable-languages=c,c++,objc,f77,ada,java</param>
  
  
  
  1.6       +17 -9     ALFS/profiles/BLFS/chapter12/j2sdk.xml
  
  Index: j2sdk.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/j2sdk.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- j2sdk.xml	3 Jul 2004 16:11:15 -0000	1.5
  +++ j2sdk.xml	4 Jul 2004 02:45:18 -0000	1.6
  @@ -21,7 +21,11 @@
   			<base>&build_dir;/java-build</base>
   		</stageinfo>
   
  -		<execute command="sed -i "s:^PATH=.*::" &j2sdk-binary-package;" />
  +		<execute command="sed">
  +			<param>-i</param>
  +			<param>"s:^PATH=.*::"</param>
  +			<param>&j2sdk-binary-package;</param>
  +		</execute>
   
   		<permissions mode="711">
   		        <name>&j2sdk-binary-package;</name>
  @@ -63,14 +67,18 @@
   <package name="j2sdk-src" version="&j2sdk-src-version;">
   
   	<stage name="Unpacking">
  -		<stageinfo>
  -			<base>&build_dir;/java-build</base>
  -		</stageinfo>
  -
  -		<execute command="unzip &packages_dir;/&j2sdk-src-package;" />
  -		<execute command="unzip &packages_dir;/&j2sdk-src-bin-package;" />
  -		<execute command="unzip &packages_dir;/&j2sdk-src-mozilla-headers-package;" />
  -
  +		<unpack>
  +			<archive>&packages_dir;/&j2sdk-src-package;</archive>
  +			<destination>&build_dir;/java-build</destination>
  +		</unpack>
  +		<unpack>
  +			<archive>&packages_dir;/&j2sdk-src-bin-package;</archive>
  +			<destination>&build_dir;/java-build</destination>
  +		</unpack>
  +		<unpack>
  +			<archive>&packages_dir;/&j2sdk-src-mozilla-headers-package;</archive>
  +			<destination>&build_dir;/java-build</destination>
  +		</unpack>
   	</stage>
   
   	<stage name="Installing">
  
  
  
  1.5       +6 -6      ALFS/profiles/BLFS/chapter12/perlmodules.xml
  
  Index: perlmodules.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/perlmodules.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- perlmodules.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ perlmodules.xml	4 Jul 2004 02:45:18 -0000	1.5
  @@ -9,7 +9,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing package astro-FITS-Header">
  +	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&Astro-FITS-Header-directory;</base>
   		</stageinfo>
  @@ -41,7 +41,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing package PDL">
  +	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&PDL-directory;</base>
   		</stageinfo>
  @@ -69,7 +69,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing package XML-Writer">
  +	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&XML-Writer-directory;</base>
   		</stageinfo>
  @@ -97,7 +97,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing package XML-Parser">
  +	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&XML-Parser-directory;</base>
   		</stageinfo>
  @@ -130,7 +130,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing package Gtk-Perl">
  +	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&Gtk-Perl-directory;</base>
   		</stageinfo>
  @@ -158,7 +158,7 @@
   		</unpack>
   	</stage>
   
  -	<stage name="Installing package Parse-RecDescent">
  +	<stage name="Installing">
   		<stageinfo>
   			<base>&build_dir;/&Parse-RecDescent-directory;</base>
   		</stageinfo>
  
  
  
  1.7       +35 -16    ALFS/profiles/BLFS/chapter12/tcl.xml
  
  Index: tcl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/tcl.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- tcl.xml	3 Jul 2004 16:11:15 -0000	1.6
  +++ tcl.xml	4 Jul 2004 02:45:18 -0000	1.7
  @@ -11,7 +11,6 @@
   		<stageinfo>
   			<environment>
   			    <variable name="VERSION">&tcl-version;</variable>
  -			    <variable name="V">8.4</variable>
   			</environment>
   			<base>&build_dir;/&tcl-directory;/unix</base>
   		</stageinfo>
  @@ -31,13 +30,13 @@
   		<search_replace>
   		       <file>tclConfig.sh</file>
   		       <find>&build_dir;/&tcl-directory;</find>
  -		       <replace>/usr/include/tcl8.4</replace>
  +		       <replace>/usr/include/tcl&tcl-major-minor;</replace>
   		</search_replace>
   
   		<search_replace>
   		       <file>tclConfig.sh</file>
  -		       <find>TCL_LIB_FILE='libtcl8.4${TCL_DBGX}.so'</find>
  -		       <replace>TCL_LIB_FILE="libtcl8.4${TCL_DBGX}.so"</replace>
  +		       <find>TCL_LIB_FILE='libtcl&tcl-major-minor;${TCL_DBGX}.so'</find>
  +		       <replace>TCL_LIB_FILE="libtcl&tcl-major-minor;${TCL_DBGX}.so"</replace>
   		</search_replace>
   
   		<move base="&build_dir;/&tcl-directory;/doc">
  @@ -55,31 +54,51 @@
   			<param>install</param>
   		</make>
   
  -		<execute command="install -d /usr/include/tcl${V}/unix" />
  -		<execute command="install -m644 *.h /usr/include/tcl${V}/unix/" />
  -		<execute command="install -d /usr/include/tcl${V}/generic" />
  -		<execute command="install -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/" />
  -
  -		<remove>/usr/include/tcl${V}/generic/tcl.h</remove>
  -		<remove>/usr/include/tcl${V}/generic/tclDecls.h</remove>
  -		<remove>/usr/include/tcl${V}/generic/tclPlatDecls.h</remove>
  +		<mkdir>
  +			<option>parents</option>
  +			<name>/usr/include/tcl&tcl-major-minor;/unix</name>
  +		</mkdir>
  +
  +		<copy>
  +			<source>*.h</source>
  +			<destination>/usr/include/tcl&tcl-major-minor;/unix</destination>
  +		</copy>
  +
  +		<mkdir>
  +			<option>parents</option>
  +			<name>/usr/include/tcl&tcl-major-minor;/generic</name>
  +		</mkdir>
  +
  +		<copy>
  +			<source>../generic/*.h</source>
  +			<destination>/usr/include/tcl&tcl-major-minor;/generic</destination>
  +		</copy>
  +
  +		<permissions mode="0644">
  +			<name>/usr/include/tcl&tcl-major-minor;/unix/*.h</name>
  +			<name>/usr/include/tcl&tcl-major-minor;/generic/*.h</name>
  +		</permissions>
  +
  +		<remove>/usr/include/tcl&tcl-major-minor;/generic/tcl.h</remove>
  +		<remove>/usr/include/tcl&tcl-major-minor;/generic/tclDecls.h</remove>
  +		<remove>/usr/include/tcl&tcl-major-minor;/generic/tclPlatDecls.h</remove>
   		
   		<link>
   		        <option>force</option>
   			<option>no-dereference</option>
  -			<target>/usr/include/tcl${V}</target>
  -			<name>/usr/lib/tcl${V}/include</name>
  +			<target>/usr/include/tcl&tcl-major-minor;</target>
  +			<name>/usr/lib/tcl&tcl-major-minor;/include</name>
   		</link>
   
   		<link>
   		        <option>force</option>
  -			<target>libtcl${V}.so</target>
  +			<target>libtcl&tcl-major-minor;.so</target>
   			<name>/usr/lib/libtcl.so</name>
   		</link>
   
   		<link>
   		        <option>force</option>
  -			<target>tclsh${V}</target>
  +			<target>tclsh&tcl-major-minor;</target>
   			<name>/usr/bin/tclsh</name>
   		</link>
   	</stage>
  
  
  
  1.7       +33 -14    ALFS/profiles/BLFS/chapter12/tk.xml
  
  Index: tk.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/tk.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- tk.xml	3 Jul 2004 16:11:15 -0000	1.6
  +++ tk.xml	4 Jul 2004 02:45:18 -0000	1.7
  @@ -16,7 +16,6 @@
   		<stageinfo>
   			<environment>
   			    <variable name="VERSION">&tk-version;</variable>
  -			    <variable name="V">8.4</variable>
   			</environment>
   			<base>&build_dir;/&tk-directory;/unix</base>
   		</stageinfo>
  @@ -36,38 +35,58 @@
   		<search_replace>
   		       <file>tkConfig.sh</file>
   		       <find>&build_dir;/&tk-directory;</find>
  -		       <replace>/usr/include/tk8.4</replace>
  +		       <replace>/usr/include/&tk-major-minor;</replace>
   		</search_replace>
   
   		<make>
   			<param>install</param>
   		</make>
   
  -		<execute command="install -d /usr/include/tk${V}/unix" />
  -		<execute command="install -m644 *.h /usr/include/tk${V}/unix/" />
  -		<execute command="install -d /usr/include/tk${V}/generic" />
  -		<execute command="install -c -m644 ../generic/*.h /usr/include/tk${V}/generic/" />
  -
  -		<remove>/usr/include/tk${V}/generic/tk.h</remove>
  -		<remove>/usr/include/tk${V}/generic/tkDecls.h</remove>
  -		<remove>/usr/include/tk${V}/generic/tkPlatDecls.h</remove>
  +		<mkdir>
  +			<option>parents</option>
  +			<name>/usr/include/tk&tk-major-minor;/unix</name>
  +		</mkdir>
  +
  +		<copy>
  +			<source>*.h</source>
  +			<destination>/usr/include/tk&tk-major-minor;/unix</destination>
  +		</copy>
  +
  +		<mkdir>
  +			<option>parents</option>
  +			<name>/usr/include/tk&tk-major-minor;/generic</name>
  +		</mkdir>
  +
  +		<copy>
  +			<source>../generic/*.h</source>
  +			<destination>/usr/include/tk&tk-major-minor;/generic</destination>
  +		</copy>
  +
  +		<permissions mode="0644">
  +			<name>/usr/include/tk&tk-major-minor;/unix/*.h</name>
  +			<name>/usr/include/tk&tk-major-minor;/generic/*.h</name>
  +		</permissions>
  +
  +		<remove>/usr/include/tk&tk-major-minor;/generic/tk.h</remove>
  +		<remove>/usr/include/tk&tk-major-minor;/generic/tkDecls.h</remove>
  +		<remove>/usr/include/tk&tk-major-minor;/generic/tkPlatDecls.h</remove>
   		
   		<link>
   		        <option>force</option>
   			<option>no-dereference</option>
  -			<target>/usr/include/tk${V}</target>
  -			<name>/usr/lib/tk${V}/include</name>
  +			<target>/usr/include/tk&tk-major-minor;</target>
  +			<name>/usr/lib/tk&tk-major-minor;/include</name>
   		</link>
   
   		<link>
   		        <option>force</option>
  -			<target>libtk${V}.so</target>
  +			<target>libtk&tk-major-minor;.so</target>
   			<name>/usr/lib/libtk.so</name>
   		</link>
   
   		<link>
   		        <option>force</option>
  -			<target>wish${V}</target>
  +			<target>wish&tk-major-minor;</target>
   			<name>/usr/bin/wish</name>
   		</link>
   	</stage>
  
  
  



More information about the alfs-log mailing list