Changeset 70810dc in rtems for tools


Ignore:
Timestamp:
Feb 8, 2000, 10:33:25 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
fb196c3c
Parents:
a976681e
Message:

Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@…>
that contains:

  • Removes remaining (now illegal) references to $(SRC) from a couple of Makefile.ams
  • Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in
  • Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR from most configure scripts, i.e. LIBCDIR becomes less visible)
  • Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to libbsp/*/configure.ins (A minor bug in previous implementations, which only has an impact when switching to GNU/Cygnus canonicalization)
  • Cleans up several bogus comments.
  • Removes MKLIB
  • Switches the version number to 4.5.0 (for testing version number handling)
Location:
tools
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • tools/build/configure.in

    ra976681e r70810dc  
    2121AM_CONFIG_HEADER(config.h)
    2222
     23# Explicitly list all Makefiles here
    2324AC_OUTPUT(
    2425Makefile
  • tools/cpu/configure.in

    ra976681e r70810dc  
    2222fi
    2323
     24# Explicitly list all Makefiles here
    2425AC_OUTPUT(Makefile)
  • tools/cpu/generic/configure.in

    ra976681e r70810dc  
    99RTEMS_CANONICAL_TARGET_CPU
    1010
    11 AM_INIT_AUTOMAKE(rtems-cpu-tools-generic,$RTEMS_VERSION,no)
     11AM_INIT_AUTOMAKE(rtems-tools-cpu-generic,$RTEMS_VERSION,no)
    1212AM_MAINTAINER_MODE
    1313
     
    1717AC_SUBST(program_prefix)
    1818
     19# Explicitly list all Makefiles here
    1920AC_OUTPUT(Makefile
    2021size_rtems)
  • tools/cpu/hppa1.1/configure.in

    ra976681e r70810dc  
    99RTEMS_CANONICAL_TARGET_CPU
    1010
    11 AM_INIT_AUTOMAKE(rtems-cpu-tools-hppa,$RTEMS_VERSION,no)
     11AM_INIT_AUTOMAKE(rtems-tools-cpu-hppa1.1,$RTEMS_VERSION,no)
    1212AM_MAINTAINER_MODE
    1313AC_EXEEXT
     
    1717RTEMS_TOOLPATHS
    1818
     19# Explicitly list all Makefiles here
    1920AC_OUTPUT(Makefile)
  • tools/cpu/sh/configure.in

    ra976681e r70810dc  
    99RTEMS_CANONICAL_TARGET_CPU
    1010
    11 AM_INIT_AUTOMAKE(rtems-cpu-tools-sh,$RTEMS_VERSION,no)
     11AM_INIT_AUTOMAKE(rtems-tools-cpu-sh,$RTEMS_VERSION,no)
    1212AM_MAINTAINER_MODE
    1313AC_EXEEXT
     
    1818RTEMS_TOOLPATHS
    1919
     20# Explicitly list all Makefiles here
    2021AC_OUTPUT(Makefile)
  • tools/cpu/unix/configure.in

    ra976681e r70810dc  
    99RTEMS_CANONICAL_TARGET_CPU
    1010
    11 AM_INIT_AUTOMAKE(rtems-cpu-tools-unix,$RTEMS_VERSION,no)
     11AM_INIT_AUTOMAKE(rtems-tools-cpu-unix,$RTEMS_VERSION,no)
    1212AM_MAINTAINER_MODE
    1313AC_EXEEXT
     
    1717RTEMS_TOOLPATHS
    1818
     19# Explicitly list all Makefiles here
    1920AC_OUTPUT(Makefile)
  • tools/update/cipolish

    ra976681e r70810dc  
    1010# mv configure.in~ configure.in
    1111#
    12 # ATTENTION: This file contains embedded tabs
    13 
    14 my $nl_seen = 0 ;
     12
     13# $Id$
     14
     15# find relative up-path to configure.in
     16my $rtems_cfg = &find_file(".","VERSION");
     17my $rtems_root = &find_root() ;
     18$rtems_root =~ tr/\//\-/ ;
     19my $rtems_name = "rtems" ;
     20$rtems_name .=  "-" . "$rtems_root" if (length($rtems_root) > 0 ) ;
     21
     22my @buffer = () ;
     23
     24while ( <> )
     25{
     26  push @buffer, "$_" ;
     27}
     28
     29{
     30  my @tbuf = () ;
     31
     32  foreach ( @buffer )
     33  {
     34    if ( /^#.*list.*Makefile.*$/o ) {}
     35    elsif ( /^dnl[\s]+check.*target.*cc.*$/o ) {}
     36    elsif ( /^[\s]*AC_CONFIG_AUX_DIR\(.*\)[\s]*$/o )
     37    {
     38      push @tbuf, "AC_CONFIG_AUX_DIR($rtems_cfg)\n" ;
     39    }
     40    elsif ( /^[\s]*RTEMS_TOP\(.*\)[\s]*$/o )
     41    {
     42      push @tbuf, "RTEMS_TOP($rtems_cfg)\n" ;
     43    }
     44    elsif ( /^[\s]*AM_INIT_AUTOMAKE\(.*\)[\s]*$/o )
     45    {
     46      push @tbuf, "AM_INIT_AUTOMAKE($rtems_name,\$RTEMS_VERSION,no)\n" ;
     47    }
     48    elsif ( /^[\s]*AC_SUBST\(RTEMS_HAS_POSIX_API\)[\s]*$/o )
     49    {
     50      #remove the line
     51    }
     52    elsif ( /^[\s]*AC_SUBST\(RTEMS_HAS_ITRON_API\)[\s]*$/o )
     53    {
     54      #remove the line
     55    }
     56    elsif ( /^[\s]*AC_SUBST\(RTEMS_HAS_HWAPI\)[\s]*$/o )
     57    {
     58      #remove the line
     59    }
     60    elsif ( /^[\s]*AC_SUBST\(RTEMS_USE_MACROS\)[\s]*$/o )
     61    {
     62      #remove the line
     63    }
     64    elsif ( /^[\s]*AC_SUBST\(RTEMS_HAS_MULTIPROCESSING\)[\s]*$/o )
     65    {
     66      #remove the line
     67    }
     68    elsif ( /^[\s]*AC_SUBST\(RTEMS_HAS_RDBG\)[\s]*$/o )
     69    {
     70      #remove the line
     71    }
     72    elsif ( /^[\s\t]*AC_SUBST\(RTEMS_USE_OWN_PDIR\)[\s]*$/o )
     73    { # obsolete option
     74      #remove the line
     75    }
     76    elsif ( /^[\s\t]*RTEMS_ENABLE_GMAKE_PRINT[     ]*$/o )
     77    { # obsolete macro
     78      #remove the line
     79    }
     80    elsif ( /^[\s]*AC_SUBST\(RTEMS_HAS_NETWORKING\)[\s]*$/o )
     81    {
     82      #remove the line
     83    }
     84    elsif ( /^[\s]*AC_SUBST\(RTEMS_LIBC_DIR\)[\s]*$/o )
     85    {
     86      #remove the line
     87    }
     88    elsif ( /^[\s]*AC_SUBST\(PROJECT_ROOT\)[\s]*$/o )
     89    {
     90      #remove the line
     91    }
     92    elsif ( /^[\s]*AC_SUBST\(RTEMS_GAS_CODE16\)[\s]*$/o )
     93    {
     94      #remove the line
     95    }
     96    elsif ( /^[\s]*PROJECT_ROOT[\s]*=.*$/o )
     97    {
     98      #remove the line
     99    }
     100    elsif ( /^[\s]*(RTEMS_ENABLE_LIBCDIR).*$/o )
     101    { #remove the line
     102      &define_variable("$1","");
     103      push @tbuf, "$_" ;
     104    }
     105    elsif ( /^[\s]*(RTEMS_PROG_CC_FOR_TARGET).*$/o )
     106    {
     107      &define_variable("$1","");
     108      push @tbuf, "$_" ;
     109    }
     110    elsif ( /^[\s]*(RTEMS_PROG_CXX_FOR_TARGET).*$/o )
     111    {
     112      &define_variable("$1","");
     113      push @tbuf, "$_" ;
     114    }
     115    else
     116    {
     117      push @tbuf, "$_" ;
     118    }
     119  } # foreach
     120  @buffer = @tbuf ;
     121}
     122
     123{
     124  my @tbuf = () ;
     125  foreach ( @buffer )
     126  {
     127    if ( /^[\s]*(RTEMS_ENABLE_LIBCDIR).*$/o )
     128    {
     129      if (  ( not defined $var_RTEMS_PROG_CC_FOR_TARGET )
     130        and ( not defined $var_RTEMS_PROG_CXX_FOR_TARGET )
     131      )
     132      {
     133        push @tbuf, "$_" ;
     134      }
     135    }
     136    elsif ( /^AC_OUTPUT.*$/o )
     137    {
     138      push @tbuf, "# Explicitly list all Makefiles here\n" ;
     139      push @tbuf, "$_" ;
     140    }
     141    else
     142    {
     143      push @tbuf, "$_" ;
     144    }
     145  }
     146  @buffer = @tbuf ;
     147}
     148
     149{ ## pretty print
     150  my $out = join ('',@buffer) ;
     151  $out =~ s/\s\#\n(\#\n)+/\n/g ;
     152  $out =~ s/\n\n\#\n\n/\n/g ;
     153  $out =~ s/\n\n[\n]*/\n\n/g ;
     154  print $out ;
     155}
     156
     157exit 1 ;
    15158
    16159# find a relative up-path to a file $file, starting at directory $pre
    17 sub find_file
     160sub find_file($$)
    18161{
    19162  my $pre = $_[0] ;
     
    43186}
    44187
    45 # find relative up-path to configure.in
    46 my $rtems_cfg = find_file(".","VERSION");
    47 
    48 
    49 while( <> )
    50 {
    51   if ( /^[      ]*$/o )
    52   {
    53     $nl_seen = $nl_seen+1;
    54   }
    55 
    56   if ( /^[      ]*AC_CONFIG_AUX_DIR\(.*\)[      ]*$/o )
    57   {
    58     print "AC_CONFIG_AUX_DIR($rtems_cfg)\n" ;
    59   }
    60   elsif ( /^[   ]*RTEMS_TOP\(.*\)[      ]*$/o )
    61   {
    62     print "RTEMS_TOP($rtems_cfg)\n" ;
    63   }
    64   elsif ( /^[   ]*AC_SUBST\(RTEMS_HAS_POSIX_API\)[      ]*$/o )
    65   {
    66     #remove the line
    67   }
    68   elsif ( /^[   ]*AC_SUBST\(RTEMS_HAS_ITRON_API\)[      ]*$/o )
    69   {
    70     #remove the line
    71   }
    72   elsif ( /^[   ]*AC_SUBST\(RTEMS_HAS_HWAPI\)[  ]*$/o )
    73   {
    74     #remove the line
    75   }
    76   elsif ( /^[   ]*AC_SUBST\(RTEMS_USE_MACROS\)[         ]*$/o )
    77   {
    78     #remove the line
    79   }
    80   elsif ( /^[   ]*AC_SUBST\(RTEMS_HAS_MULTIPROCESSING\)[        ]*$/o )
    81   {
    82     #remove the line
    83   }
    84   elsif ( /^[   ]*AC_SUBST\(RTEMS_HAS_RDBG\)[   ]*$/o )
    85   {
    86     #remove the line
    87   }
    88   elsif ( /^[\s\t]*AC_SUBST\(RTEMS_USE_OWN_PDIR\)[      ]*$/o )
    89   { # obsolete option
    90     #remove the line
    91   }
    92   elsif ( /^[\s\t]*RTEMS_ENABLE_GMAKE_PRINT[     ]*$/o )
    93   { # obsolete macro
    94     #remove the line
    95   }
    96   elsif ( /^[   ]*AC_SUBST\(RTEMS_HAS_NETWORKING\)[     ]*$/o )
    97   {
    98     #remove the line
    99   }
    100   elsif ( /^[   ]*AC_SUBST\(RTEMS_LIBC_DIR\)[   ]*$/o )
    101   {
    102     #remove the line
    103   }
    104   elsif ( /^[   ]*AC_SUBST\(PROJECT_ROOT\)[     ]*$/o )
    105   {
    106     #remove the line
    107   }
    108   elsif ( /^[   ]*AC_SUBST\(RTEMS_GAS_CODE16\)[         ]*$/o )
    109   {
    110     #remove the line
    111   }
    112   elsif ( /^[   ]*PROJECT_ROOT[         ]*=.*$/o )
    113   {
    114     #remove the line
    115   }
    116   elsif ( /^[   ]*$/o )
    117   {
    118     print "$_" if $nl_seen < 2 ;
     188sub find_root()
     189{
     190  my $top_builddir = "." ;
     191  my $subdir="";
     192  my $pwd = `pwd`; chomp $pwd;
     193  $pwd .= "/" ;
     194  my $len ;
     195
     196  if ( -f "VERSION" )  { return $subdir ; }
     197  my $i = rindex($pwd,'/');
     198
     199  $len = $i;
     200  $pwd = substr($pwd,0,$len);
     201  $i = rindex($pwd,'/');
     202  $subdir = substr($pwd,$i+1,$len - 1);
     203  $top_builddir = ".." ; 
     204
     205  while( -d "$top_builddir" )
     206  {
     207    if ( -f "${top_builddir}/VERSION" ) 
     208    {
     209      return $subdir ;
     210    }
     211    $len=$i;
     212    $pwd = substr($pwd,0,$len);
     213    $i = rindex($pwd,'/');
     214    $subdir = substr($pwd,$i+1,$len - 1) . "/$subdir";
     215    $top_builddir .= "/.." ; 
     216  } ;
     217  die "Can't find VERSION\n" ;
     218}
     219
     220sub define_variable
     221{
     222  my ($name,$value) = @_ ;
     223
     224  if ( not defined ${"var_$name"} )
     225  {
     226# print STDERR "DEFINING $name = $value\n" ;
     227    push @vars, "$name" ;
     228    ${"var_$name"} = "$value" ;
    119229  }
    120230  else
    121231  {
    122     print "$_" ;
    123     $nl_seen = 0;
     232# print STDERR "APPENDING <$name> <- <$value>\n" ;
     233    ${"var_$name"} .= " $value" ;
    124234  }
    125 } # while
    126 
    127 ;1
     235}
     236
  • tools/update/configure.in

    ra976681e r70810dc  
    1919
    2020RTEMS_TOOLPATHS
     21# Explicitly list all Makefiles here
    2122AC_OUTPUT(
    2223Makefile
Note: See TracChangeset for help on using the changeset viewer.