Changeset 19036

Show
Ignore:
Timestamp:
17.04.2009 15:50:29 (10 years ago)
Author:
ak19
Message:

Last remaining occurrences of original compilation pathnames in apache web server files now removed (replaced with placeholder) upon running the target make apache-for-dist, and these are replaced with the installation pathname upon installation. Now there are no tell-tale pathnames when the Installer runs, as these are replaced once again with **APACHE_OS_HOME** BEFORE the installer gets the files.

Location:
gsdl/trunk/runtime-src/packages
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/runtime-src/packages/Makefile.in

    r18872 r19036  
    7272PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA)  $(HTTPD) 
    7373 
     74REPLACELIST = conf/extra/httpd-dav.conf \ 
     75    conf/extra/httpd-manual.conf \ 
     76    conf/extra/httpd-autoindex.conf \ 
     77    conf/extra/httpd-vhosts.conf \ 
     78    conf/extra/httpd-ssl.conf \ 
     79    conf/extra/httpd-multilang-errordoc.conf \ 
     80    conf/original/extra/httpd-dav.conf \ 
     81    conf/original/extra/httpd-manual.conf \ 
     82    conf/original/extra/httpd-autoindex.conf \ 
     83    conf/original/extra/httpd-vhosts.conf \ 
     84    conf/original/extra/httpd-ssl.conf \ 
     85    conf/original/extra/httpd-multilang-errordoc.conf \ 
     86    conf/original/httpd.conf\ 
     87    lib/apr-util-1/apr_dbd_odbc.la \ 
     88    lib/apr-util-1/apr_dbd_sqlite3.la \ 
     89    lib/pkgconfig/apr-util-1.pc \ 
     90    lib/pkgconfig/apr-1.pc \ 
     91    lib/libaprutil-1.la \ 
     92    lib/libapr-1.la \ 
     93    build/config_vars.mk \ 
     94    build/config.nice \ 
     95    build/apr_rules.mk \ 
     96    bin/apu-1-config \ 
     97    bin/apr-1-config \ 
     98    include/ap_config_auto.h \ 
     99    include/ap_config_layout.h 
    74100 
    75101all: 
     
    133159      chmod 755 ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \ 
    134160      gsdldir=`cd ../.. ; pwd` ; \ 
     161      pre="$$gsdldir/apache-httpd/$(GSDLOS)" ; \ 
    135162      for one_file in apachectl envvars envvars-std; do \ 
    136         sed -e "s%$$gsdldir/apache-httpd/$(GSDLOS)%*\*\APACHE_HOME_OS\*\*%" ../../apache-httpd/$(GSDLOS)/bin/$$one_file > ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ; \ 
    137         mv ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ../../apache-httpd/$(GSDLOS)/bin/$$one_file ; \ 
    138       done ; ) 
     163        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" $$pre/bin/$$one_file > $$pre/bin/$$one_file.tmp ; \ 
     164        mv $$pre/bin/$$one_file.tmp $$pre/bin/$$one_file ; \ 
     165      done ; \ 
     166      for one_file in $(REPLACELIST); do \ 
     167        sed -e "s%$$pre%*\*\APACHE_HOME_OS\*\*%" "$$pre/$$one_file" > "$$pre/$$one_file.tmp" ; \ 
     168        mv "$$pre/$$one_file.tmp" "$$pre/$$one_file" ; \ 
     169      done ; \ 
     170      cat "$$pre/bin/apr-1-config" \ 
     171        | sed -e "s%^APR_SOURCE_DIR=.*%APR_SOURCE_DIR=%" \ 
     172        | sed -e "s%^APR_BUILD_DIR=.*%APR_BUILD_DIR=%" \ 
     173        > "$$pre/bin/apr-1-config.tmp" ; \ 
     174      mv "$$pre/bin/apr-1-config.tmp" "$$pre/bin/apr-1-config" ; \ 
     175      cat "$$pre/bin/apu-1-config" \ 
     176        | sed -e "s%^APU_SOURCE_DIR=.*%APU_SOURCE_DIR=%" \ 
     177        | sed -e "s%^APU_BUILD_DIR=.*%APU_BUILD_DIR=%" \ 
     178        > "$$pre/bin/apu-1-config.tmp" ; \ 
     179      mv "$$pre/bin/apu-1-config.tmp" "$$pre/bin/apu-1-config" ; \ 
     180      sed -e "s%^EXTRA_INCLUDES\s*=.*%EXTRA_INCLUDES=%" "$$pre/build/config_vars.mk" > "$$pre/build/config_vars.mk.tmp" ; \ 
     181      mv "$$pre/build/config_vars.mk.tmp" "$$pre/build/config_vars.mk" ; ) 
  • gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh

    r19018 r19036  
    7474 
    7575# usually we're updating existing files, so need to copy them over into tmp files first 
    76 PRE=`grep "^prefix = " build/config_vars.mk` 
    77 PRE=`echo $PRE | sed -e "s;prefix = ;;"` 
    78 sed -e "s;$PRE;\"$SR\";" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 
     76#PRE=`grep "^prefix = " build/config_vars.mk` 
     77#PRE=`echo $PRE | sed -e "s;prefix = ;;"` 
     78sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 
    7979mv "$SR/build/config_vars.mk.tmp" "$SR/build/config_vars.mk" 
    8080chmod u+rwx "$SR/build/config_vars.mk" 
     
    102102# Non-crucial files (replacements not essential) 
    103103# but replacing the occurrences of $PRE in them with $SR anyway: 
    104 cd "$currentdir/conf/extra/" 
    105 for one_file in httpd-dav.conf httpd-manual.conf httpd-autoindex.conf httpd-vhosts.conf httpd-ssl.conf httpd-multilang-errordoc.conf; do 
    106     sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 
     104REPLACELIST="conf/extra/httpd-dav.conf conf/extra/httpd-manual.conf conf/extra/httpd-autoindex.conf conf/extra/httpd-vhosts.conf conf/extra/httpd-ssl.conf conf/extra/httpd-multilang-errordoc.conf conf/original/extra/httpd-dav.conf conf/original/extra/httpd-manual.conf conf/original/extra/httpd-autoindex.conf conf/original/extra/httpd-vhosts.conf conf/original/extra/httpd-ssl.conf conf/original/extra/httpd-multilang-errordoc.conf conf/original/httpd.conf lib/apr-util-1/apr_dbd_odbc.la lib/apr-util-1/apr_dbd_sqlite3.la lib/pkgconfig/apr-util-1.pc lib/pkgconfig/apr-1.pc lib/libaprutil-1.la lib/libapr-1.la build/config_vars.mk build/config.nice build/apr_rules.mk bin/apu-1-config bin/apr-1-config include/ap_config_auto.h include/ap_config_layout.h" 
     105 
     106for one_file in $REPLACELIST; do 
     107    sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$one_file" > "$one_file.tmp" 
    107108    mv $one_file.tmp $one_file 
    108109    chmod u+w $one_file 
    109110done 
    110  
    111 cd "$currentdir/conf/original/extra/" 
    112 for one_file in httpd-dav.conf httpd-manual.conf httpd-autoindex.conf httpd-vhosts.conf httpd-ssl.conf httpd-multilang-errordoc.conf; do 
    113     sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 
    114     mv $one_file.tmp $one_file 
    115     chmod u+w $one_file 
    116 done 
    117  
    118 cd "$currentdir/lib/" 
    119 for one_file in "apr-util-1/apr_dbd_odbc.la" "apr-util-1/apr_dbd_sqlite3.la" "pkgconfig/apr-util-1.pc" "pkgconfig/apr-1.pc" libaprutil-1.la libapr-1.la; do 
    120     sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 
    121     mv $one_file.tmp $one_file 
    122     chmod u+w $one_file 
    123 done 
    124  
    125 cd "$currentdir/build/" 
    126 for one_file in config_vars.mk config.nice apr_rules.mk; do 
    127     sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 
    128     mv $one_file.tmp $one_file 
    129     chmod u+w $one_file 
    130 done 
    131  
    132 cd "$currentdir/bin/" 
    133 for one_file in apu-1-config apr-1-config; do 
    134     sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 
    135     mv $one_file.tmp $one_file 
    136     chmod u+w $one_file 
    137 done 
    138  
    139 cd "$currentdir/include/" 
    140 for one_file in ap_config_auto.h ap_config_layout.h; do 
    141     sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp" 
    142     mv $one_file.tmp $one_file 
    143     chmod u+w $one_file 
    144 done 
    145  
    146 sed -e "s;$PRE;$SR;" "$currentdir/conf/original/httpd.conf" > "$currentdir/conf/original/httpd.conf.tmp" 
    147     mv "$currentdir/conf/original/httpd.conf.tmp" "$currentdir/conf/original/httpd.conf" 
    148     chmod u+w "$currentdir/conf/original/httpd.conf" 
    149111 
    150112echo "Ready."