IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34561


Ignore:
Timestamp:
Oct 24, 2012, 2:49:32 PM (14 years ago)
Author:
eugene
Message:

moving dvodist directories around so we can use a single build directory for both dvodist and ippdata

Location:
branches/eam_branches/ipp-20120905/dvodist
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120905/dvodist/Makefile.in

    r34557 r34561  
    1 default: php
     1default: help
    22help:
    3         @echo "USAGE: make php"
     3        @echo "USAGE: make (website)"
     4        @echo "  (website) = dvodist or ippdata"
    45
    56GENERATE = src/generate
    67
    7 SRC-ROOT = www-root
     8# we have 2 sites (or more?) controlled by this build directory
     9# make dvodist : internal web site
     10# make ippdata : external web site
     11
     12# these are common code not available via the web server
    813SRC-UTIL = www-util
    9 SRC-PROG = scripts
     14TGT-UTIL = @HTDOCS@/www-util
    1015
    11 TGT-ROOT = @HTDOCS@/www-root
    12 TGT-UTIL = @HTDOCS@/www-util
    13 TGT-PROG = @HTDOCS@/scripts
     16# these are the available web files
     17SRC-DVODIST = dvodist
     18SRC-IPPDATA = ippdata
     19TGT-DVODIST = @HTDOCS@/dvodist
     20TGT-IPPDATA = @HTDOCS@/ippdata
    1421
    15 PROG = \
    16 $(TGT-PROG)/mkdist.20120509.sh \
    17 $(TGT-PROG)/mkdist.20120525.sh \
    18 $(TGT-PROG)/mkdist.20120606.sh \
    19 $(TGT-PROG)/mkdist.testcat.sh \
    20 $(TGT-PROG)/mkindex.sh
    21 
     22# common code used by all installation?
    2223UTIL = \
    2324$(TGT-UTIL)/blank.html \
     25$(TGT-UTIL)/ipp.page.php \
    2426$(TGT-UTIL)/ipp.menu.dat \
    25 $(TGT-UTIL)/ipp.page.php \
    2627$(TGT-UTIL)/ipp.php \
    2728$(TGT-UTIL)/markdown.php \
    2829$(TGT-UTIL)/phptest.php
    2930
    30 ROOT = \
    31 $(TGT-ROOT)/PScolorlogo2.jpg \
    32 $(TGT-ROOT)/index.php \
    33 $(TGT-ROOT)/test.php \
    34 $(TGT-ROOT)/docs.php \
    35 $(TGT-ROOT)/help.php \
    36 $(TGT-ROOT)/ipp.css
     31DVODIST = \
     32$(TGT-UTIL)/dvodist.menu.dat \
     33$(TGT-UTIL)/dvodist.page.php \
     34$(TGT-DVODIST)/PScolorlogo2.jpg \
     35$(TGT-DVODIST)/index.php \
     36$(TGT-DVODIST)/test.php \
     37$(TGT-DVODIST)/docs.php \
     38$(TGT-DVODIST)/help.php \
     39$(TGT-DVODIST)/ipp.css
    3740
    38 include $(SRC-ROOT)/3pi.20120509/Makefile
    39 include $(SRC-ROOT)/3pi.20120525/Makefile
    40 include $(SRC-ROOT)/3pi.20120606/Makefile
    41 include $(SRC-ROOT)/allsky.tables.20120513/Makefile
    42 include $(SRC-ROOT)/allsky.tables.20120602/Makefile
    43 include $(SRC-ROOT)/ubercal.data/Makefile
     41IPPDATA = \
     42$(TGT-UTIL)/ippdata.menu.dat \
     43$(TGT-UTIL)/ippdata.page.php \
     44$(TGT-IPPDATA)/PScolorlogo2.jpg \
     45$(TGT-IPPDATA)/index.php \
     46$(TGT-IPPDATA)/test.php \
     47$(TGT-IPPDATA)/docs.php \
     48$(TGT-IPPDATA)/help.php \
     49$(TGT-IPPDATA)/ipp.css
    4450
    45 DIST = \
     51include $(SRC-DVODIST)/3pi.20120509/Makefile
     52include $(SRC-DVODIST)/3pi.20120525/Makefile
     53include $(SRC-DVODIST)/3pi.20120606/Makefile
     54include $(SRC-DVODIST)/allsky.tables.20120513/Makefile
     55include $(SRC-DVODIST)/allsky.tables.20120602/Makefile
     56include $(SRC-DVODIST)/ubercal.data/Makefile
     57
     58DVODIST_DIRS = \
    4659$(DIST-3pi-20120509) \
    4760$(DIST-3pi-20120525) \
    … …  
    5164$(DIST-ubercal-data)
    5265
    53 php: $(ROOT) $(UTIL) $(PROG)
    54 dist: $(DIST)
     66dvodist-all: $(UTIL) $(DVODIST) $(DVODIST_DIRS)
     67dvodist: $(UTIL) $(DVODIST)
    5568
    56 # mkd files are used to generate php files
    57 $(TGT-ROOT)/%.php: $(SRC-ROOT)/%.mkd
    58         @if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
    59         rm -f $(TGT-ROOT)/$*.php || exit
    60         $(GENERATE) --htdocs @HTDOCS@ $(SRC-ROOT)/$*.mkd $(TGT-ROOT)/$*.php || exit
     69ippdata: $(UTIL) $(IPPDATA)
    6170
    6271# mkd files are used to generate php files
    … …  
    6675        $(GENERATE) --htdocs @HTDOCS@ $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
    6776
    68 $(TGT-PROG)/%: $(SRC-PROG)/%
    69         @if [ ! -d $(TGT-PROG) ]; then mkdir -p $(TGT-PROG) || exit; fi
    70         cp $(SRC-PROG)/$* $(TGT-PROG)/$* || exit
    71         chmod +x $(TGT-PROG)/$* || exit
    72 
    73 # non-generated php code is copied directly
    74 $(TGT-ROOT)/%: $(SRC-ROOT)/%
    75         @if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
    76         cp $(SRC-ROOT)/$* $(TGT-ROOT)/$* || exit
    77         chmod +x $(TGT-ROOT)/$* || exit
    78 
    7977$(TGT-UTIL)/%: $(SRC-UTIL)/%
    8078        @if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi
    8179        cp $(SRC-UTIL)/$* $(TGT-UTIL)/$* || exit
    8280        chmod +x $(TGT-UTIL)/$* || exit
     81
     82# mkd files are used to generate php files
     83$(TGT-DVODIST)/%.php: $(SRC-DVODIST)/%.mkd
     84        @if [ ! -d $(TGT-DVODIST) ]; then mkdir -p $(TGT-DVODIST) || exit; fi
     85        rm -f $(TGT-DVODIST)/$*.php || exit
     86        $(GENERATE) --htdocs @HTDOCS@ $(SRC-DVODIST)/$*.mkd $(TGT-DVODIST)/$*.php || exit
     87
     88# non-generated php code is copied directly
     89$(TGT-DVODIST)/%: $(SRC-DVODIST)/%
     90        @if [ ! -d $(TGT-DVODIST) ]; then mkdir -p $(TGT-DVODIST) || exit; fi
     91        cp $(SRC-DVODIST)/$* $(TGT-DVODIST)/$* || exit
     92        chmod +x $(TGT-DVODIST)/$* || exit
     93
     94# mkd files are used to generate php files
     95$(TGT-IPPDATA)/%.php: $(SRC-IPPDATA)/%.mkd
     96        @if [ ! -d $(TGT-IPPDATA) ]; then mkdir -p $(TGT-IPPDATA) || exit; fi
     97        rm -f $(TGT-IPPDATA)/$*.php || exit
     98        $(GENERATE) --htdocs @HTDOCS@ $(SRC-IPPDATA)/$*.mkd $(TGT-IPPDATA)/$*.php || exit
     99
     100# non-generated php code is copied directly
     101$(TGT-IPPDATA)/%: $(SRC-IPPDATA)/%
     102        @if [ ! -d $(TGT-IPPDATA) ]; then mkdir -p $(TGT-IPPDATA) || exit; fi
     103        cp $(SRC-IPPDATA)/$* $(TGT-IPPDATA)/$* || exit
     104        chmod +x $(TGT-IPPDATA)/$* || exit
    83105
    84106# utilities #################################################
    … …  
    95117.PRECIOUS: $(SRC)/%.jpg
    96118.PRECIOUS: $(SRC)/%.jpeg
     119
     120
     121# these are the scripts used to generate the index listings
     122# probably do not need to install these (not used by the web ui)
     123PROG = \
     124$(SRC-PROG)/mkdist.20120509.sh \
     125$(SRC-PROG)/mkdist.20120525.sh \
     126$(SRC-PROG)/mkdist.20120606.sh \
     127$(SRC-PROG)/mkdist.testcat.sh \
     128$(SRC-PROG)/mkindex.sh
     129

  • branches/eam_branches/ipp-20120905/dvodist/dvodist/index.mkd

    r34558 r34561  
    1 <?php include "@HTDOCS@/www-util/ipp.page.php"; ?>
     1<?php include "@HTDOCS@/www-util/dvodist.page.php"; ?>
    22
    33# IPP Data & DVO Distribution

  • branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.page.mkd

    r34556 r34561  
    1414  $rootdir = "";
    1515 } else {
    16   $rootdir = "/dvodist";
     16  $rootdir = "/dvodist/dvodist";
    1717 }
    1818
Note: See TracChangeset for help on using the changeset viewer.