httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org (Ralf S. Engelschall)
Subject cvs commit: apache-1.3/src Makefile.tmpl
Date Tue, 03 Mar 1998 13:47:45 GMT
rse         98/03/03 05:47:44

  Modified:    src/include hide.h
               src/helpers UpdateHide
               src      Makefile.tmpl
  Log:
  Made the generation of src/include/hide.h more robust and complete
  and commit an updated version of this header file.
  
  Revision  Changes    Path
  1.2       +3 -11     apache-1.3/src/include/hide.h
  
  Index: hide.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hide.h	1998/02/28 15:39:32	1.1
  +++ hide.h	1998/03/03 13:47:41	1.2
  @@ -76,8 +76,6 @@
   #define daemons_max_free               AP_daemons_max_free
   #define daemons_min_free               AP_daemons_min_free
   #define daemons_to_start               AP_daemons_to_start
  -#define end                            AP_end
  -#define environ                        AP_environ
   #define excess_requests_per_child      AP_excess_requests_per_child
   #define group_id                       AP_group_id
   #define jmpbuffer                      AP_jmpbuffer
  @@ -129,7 +127,6 @@
   #define digest_module                  AP_digest_module
   #define dir_module                     AP_dir_module
   #define dummy_mutex                    AP_dummy_mutex
  -#define edata                          AP_edata
   #define env_module                     AP_env_module
   #define example_cmds                   AP_example_cmds
   #define example_handlers               AP_example_handlers
  @@ -231,7 +228,6 @@
   #define check_alarm                    AP_check_alarm
   #define check_auth                     AP_check_auth
   #define check_cmd_context              AP_check_cmd_context
  -#define check_fulluri                  AP_check_fulluri
   #define check_serverpath               AP_check_serverpath
   #define check_symlinks                 AP_check_symlinks
   #define check_user_id                  AP_check_user_id
  @@ -265,6 +261,7 @@
   #define create_request_config          AP_create_request_config
   #define create_server_config           AP_create_server_config
   #define default_handler                AP_default_handler
  +#define default_port_for_request       AP_default_port_for_request
   #define default_port_for_scheme        AP_default_port_for_scheme
   #define default_type                   AP_default_type
   #define destroy_pool                   AP_destroy_pool
  @@ -274,10 +271,6 @@
   #define directory_walk                 AP_directory_walk
   #define dirsection                     AP_dirsection
   #define discard_request_body           AP_discard_request_body
  -#define dlclose                        AP_dlclose
  -#define dlerror                        AP_dlerror
  -#define dlopen                         AP_dlopen
  -#define dlsym                          AP_dlsym
   #define do_nothing                     AP_do_nothing
   #define document_root                  AP_document_root
   #define each_byterange                 AP_each_byterange
  @@ -287,7 +280,6 @@
   #define escape_html                    AP_escape_html
   #define escape_path_segment            AP_escape_path_segment
   #define escape_shell_cmd               AP_escape_shell_cmd
  -#define etext                          AP_etext
   #define exists_scoreboard_image        AP_exists_scoreboard_image
   #define file_walk                      AP_file_walk
   #define filesection                    AP_filesection
  @@ -379,6 +371,7 @@
   #define make_sub_request               AP_make_sub_request
   #define make_table                     AP_make_table
   #define malloc_block                   AP_malloc_block
  +#define matches_request_vhost          AP_matches_request_vhost
   #define meets_conditions               AP_meets_conditions
   #define merge_core_dir_configs         AP_merge_core_dir_configs
   #define merge_core_server_configs      AP_merge_core_server_configs
  @@ -407,7 +400,6 @@
   #define parse_htaccess                 AP_parse_htaccess
   #define parse_uri                      AP_parse_uri
   #define parse_uri_components           AP_parse_uri_components
  -#define parse_uri_components_regex     AP_parse_uri_components_regex
   #define parse_vhost_addrs              AP_parse_vhost_addrs
   #define pcalloc                        AP_pcalloc
   #define pcfg_open_custom               AP_pcfg_open_custom
  @@ -554,6 +546,7 @@
   #define set_pidfile                    AP_set_pidfile
   #define set_scoreboard                 AP_set_scoreboard
   #define set_send_buffer_size           AP_set_send_buffer_size
  +#define set_server_alias               AP_set_server_alias
   #define set_server_limit               AP_set_server_limit
   #define set_server_root                AP_set_server_root
   #define set_server_string_slot         AP_set_server_string_slot
  @@ -580,7 +573,6 @@
   #define spawn_child_err_buff           AP_spawn_child_err_buff
   #define srm_command_loop               AP_srm_command_loop
   #define standalone_main                AP_standalone_main
  -#define start                          AP_start
   #define start_ifmod                    AP_start_ifmod
   #define start_restart                  AP_start_restart
   #define start_shutdown                 AP_start_shutdown
  
  
  
  1.2       +40 -9     apache-1.3/src/helpers/UpdateHide
  
  Index: UpdateHide
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UpdateHide	1998/02/28 15:39:38	1.1
  +++ UpdateHide	1998/03/03 13:47:43	1.2
  @@ -9,16 +9,40 @@
   #   the parameters
   $httpdbinary = $ARGV[0];
   $headerfile  = $ARGV[1];
  +$gnutriple   = $ARGV[2];
   
   #   configuration
   $listbegin  = '\n#ifdef HIDE\n';
   $listend    = '\n#endif\n';
  -@excluded   = (
  -    'main', 
  -    'errno', 
  -    'optarg',
  +@excluded   = qw(
  +    main errno environ optarg
  +    dlclose dlerror dlopen dlsym
  +    start end atexit exit etext edata
  +);
  +@included   = qw(
  +    D:db_auth_module
  +    D:dbm_auth_module
   );
   
  +#   determine os-dependend stuff
  +if ($gnutriple =~ m|.*-freebsd2.*|) {
  +    $nm_cmd   = '/usr/bin/nm -g';
  +    $us_strip = 1;
  +}
  +elsif ($gnutriple =~ m|.*-solaris2.*|) {
  +    $nm_cmd   = '/usr/ccs/bin/nm -p -g';
  +    $us_strip = 0;
  +}
  +elsif ($gnutriple =~ m|.*-hpux.*|) {
  +    $nm_cmd   = '/usr/ccs/bin/nm -p -g';
  +    $us_strip = 0;
  +}
  +else {
  +    print STDERR "Sorry, UpdateHide currently can be used only under\n";
  +    print STDERR "the following OS: FreeBSD, Solaris, HPUX\n";
  +    exit(1);
  +}
  +
   #   read current file as template
   open(FP, "<$headerfile");
   $header = '';
  @@ -31,20 +55,20 @@
   %SB = ();
   %SD = ();
   %ST = ();
  -@L = `nm $httpdbinary`;
  +@L = `$nm_cmd $httpdbinary`;
   foreach $l (@L) {
  -    if ($l =~ m|^.+\s+([BDT])\s+(.+)\s*$|) {
  +    if ($l =~ m|^.*\s+([BDT])\s+(\S+)\s*$|) {
           ($type, $name) = ($1, $2);
   
           #   remove leading underscore (C linker convention)
  -        $name =~ s|^_||;    
  +        $name =~ s|^_|| if $us_strip;
           #   remove perhaps already existing AP_ prefix
           #   (when running this script while httpd was
           #    already compiled with HIDE defined)
           $name =~ s|^AP_||;  
           #   skip any compiler- or system-private symbols
  -        next if ($name =~ m|^_|);
  -        #   skip any global compiler or system symbols
  +        next if ($name !~ m|^[a-zA-Z]+|);
  +        #   skip any symbols in our exclusion list
           next if (grep(/$name/, @excluded));
   
           #   insert the symbol into our lists
  @@ -52,6 +76,13 @@
           $SD{$name}++ if $type eq 'D';
           $ST{$name}++ if $type eq 'T';
       }
  +}
  +#   additionally add entries from static include list
  +foreach $i (@included) {
  +    ($type, $name) = ($i =~ m|^([BDT]):(.+)$|);
  +    $SB{$name}++ if $type eq 'B';
  +    $SD{$name}++ if $type eq 'D';
  +    $ST{$name}++ if $type eq 'T';
   }
   
   #   generate new redefinition list
  
  
  
  1.83      +7 -6      apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- Makefile.tmpl	1998/03/02 07:07:16	1.82
  +++ Makefile.tmpl	1998/03/03 13:47:43	1.83
  @@ -66,16 +66,17 @@
   # httpd binary with all modules built in and then updates the
   # $(INCDIR)/hide.h file according to the exported symbols of this
   # binary. So run this target once after a new function was added
  -# to the source.
  +# to the source. But never trust this operation. You really 
  +# have to review the changes manually afterwards.
   updatehide:
   	cat Configuration.tmpl |\
           sed -e 's/^#*[ 	]*\(AddModule\)/\1/g' |\
  -        cat >Configuration.for-hide
  -	$(MAKE) clean 
  +        sed -e 's/^\(AddModule.*auth_db.*\)/# \1/g' \
  +        >Configuration.for-hide
   	./Configure -file Configuration.for-hide
  -	$(MAKE) httpd
  -	./helpers/UpdateHide httpd $(INCDIR)/hide.h
  -	$(MAKE) clean
  +	$(MAKE) clean httpd
  +	./helpers/UpdateHide httpd $(INCDIR)/hide.h `helpers/GuessOS`
  +	$(MAKE) clean 
   	rm -f Configuration.for-hide
   
   #Dependencies
  
  
  

Mime
View raw message