IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 15784


Ignore:
Timestamp:
Dec 11, 2007, 11:42:43 AM (18 years ago)
Author:
eugene
Message:

moving scripts to a scripts subdir; adding bindir installation of dbadmin

Location:
trunk/ippMonitor
Files:
3 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/Makefile.in

    r14056 r15784  
    66DEF     =       def
    77RAW     =       raw
    8 DESTBIN =       @HTDOCS@/ippMonitor
     8SCRIPTS =       scripts
     9DESTBIN =       @BINDIR@
     10DESTWWW =       @HTDOCS@/ippMonitor
     11
     12GENERATE = $(SCRIPTS)/generate
     13
     14PROGRAMS = \
     15$(DESTBIN)/dbadmin
    916
    1017RAWSRC = \
    11 $(DESTBIN)/ipp.css \
    12 $(DESTBIN)/ipp.php \
    13 $(DESTBIN)/site.php \
    14 $(DESTBIN)/ipp.menu.dat \
    15 $(DESTBIN)/ipp.copy.dat \
    16 $(DESTBIN)/ipp.science.dat \
    17 $(DESTBIN)/ipp.detrend.dat \
    18 $(DESTBIN)/ipp.imfiles.dat \
    19 $(DESTBIN)/ipp.warp.dat \
    20 $(DESTBIN)/ipp.diff.dat \
    21 $(DESTBIN)/ipp.stack.dat \
    22 $(DESTBIN)/Login.php \
    23 $(DESTBIN)/SelectProject.php \
    24 $(DESTBIN)/LoadSetup.php \
    25 $(DESTBIN)/ScienceSteps.php \
    26 $(DESTBIN)/DetrendSteps.php \
    27 $(DESTBIN)/ImfileTables.php \
    28 $(DESTBIN)/WarpSteps.php \
    29 $(DESTBIN)/DiffSteps.php \
    30 $(DESTBIN)/StackSteps.php \
    31 $(DESTBIN)/phptest.php \
    32 $(DESTBIN)/getimage.php
     18$(DESTWWW)/ipp.css \
     19$(DESTWWW)/ipp.php \
     20$(DESTWWW)/site.php \
     21$(DESTWWW)/ipp.menu.dat \
     22$(DESTWWW)/ipp.copy.dat \
     23$(DESTWWW)/ipp.science.dat \
     24$(DESTWWW)/ipp.detrend.dat \
     25$(DESTWWW)/ipp.imfiles.dat \
     26$(DESTWWW)/ipp.warp.dat \
     27$(DESTWWW)/ipp.diff.dat \
     28$(DESTWWW)/ipp.stack.dat \
     29$(DESTWWW)/Login.php \
     30$(DESTWWW)/SelectProject.php \
     31$(DESTWWW)/LoadSetup.php \
     32$(DESTWWW)/ScienceSteps.php \
     33$(DESTWWW)/DetrendSteps.php \
     34$(DESTWWW)/ImfileTables.php \
     35$(DESTWWW)/WarpSteps.php \
     36$(DESTWWW)/DiffSteps.php \
     37$(DESTWWW)/StackSteps.php \
     38$(DESTWWW)/phptest.php \
     39$(DESTWWW)/getimage.php
    3340
    3441DEFSRC = \
    35 $(DESTBIN)/keptDetrendFrames.php \
    36 $(DESTBIN)/masterDetrendFrames.php \
    37 $(DESTBIN)/masterDetrendImfiles.php \
    38 $(DESTBIN)/detInputExp.php \
    39 $(DESTBIN)/detMasterFrame.php \
    40 $(DESTBIN)/detMasterImfile.php \
    41 $(DESTBIN)/detNormalizedExp.php \
    42 $(DESTBIN)/detNormalizedImfile.php \
    43 $(DESTBIN)/detNormalizedStatImfile.php \
    44 $(DESTBIN)/detProcessedImfile.php \
    45 $(DESTBIN)/detProcessedExp.php \
    46 $(DESTBIN)/detResidExp.php \
    47 $(DESTBIN)/detResidImfile.php \
    48 $(DESTBIN)/detRun.php \
    49 $(DESTBIN)/detRunSummary.php \
    50 $(DESTBIN)/detStackedImfile.php \
    51 $(DESTBIN)/newExp.php \
    52 $(DESTBIN)/newImfile.php \
    53 $(DESTBIN)/guidePendingExp.php \
    54 $(DESTBIN)/chipPendingExp.php \
    55 $(DESTBIN)/chipPendingImfile.php \
    56 $(DESTBIN)/chipProcessedExp.php \
    57 $(DESTBIN)/chipProcessedImfile.php \
    58 $(DESTBIN)/camPendingExp.php \
    59 $(DESTBIN)/camProcessedExp.php \
    60 $(DESTBIN)/pzPendingExp.php \
    61 $(DESTBIN)/pzPendingImfile.php \
    62 $(DESTBIN)/rawUnknownExp.php \
    63 $(DESTBIN)/rawDetrendExp.php \
    64 $(DESTBIN)/rawDetrendExp_detrend.php \
    65 $(DESTBIN)/rawImfile.php \
    66 $(DESTBIN)/rawImfile_failed.php \
    67 $(DESTBIN)/rawExp_failed.php \
    68 $(DESTBIN)/rawScienceExp.php \
    69 $(DESTBIN)/rawExp.php \
    70 $(DESTBIN)/summitExp.php \
    71 $(DESTBIN)/warpRun.php \
    72 $(DESTBIN)/warpInputExp.php \
    73 $(DESTBIN)/warpSkycellMap.php \
    74 $(DESTBIN)/warpSkyfile.php \
    75 $(DESTBIN)/diffRun.php \
    76 $(DESTBIN)/diffInputSkyfile.php \
    77 $(DESTBIN)/diffSkyfile.php \
    78 $(DESTBIN)/stackRun.php \
    79 $(DESTBIN)/stackInputSkyfile.php \
    80 $(DESTBIN)/stackSumSkyfile.php
     42$(DESTWWW)/keptDetrendFrames.php \
     43$(DESTWWW)/masterDetrendFrames.php \
     44$(DESTWWW)/masterDetrendImfiles.php \
     45$(DESTWWW)/detInputExp.php \
     46$(DESTWWW)/detMasterFrame.php \
     47$(DESTWWW)/detMasterImfile.php \
     48$(DESTWWW)/detNormalizedExp.php \
     49$(DESTWWW)/detNormalizedImfile.php \
     50$(DESTWWW)/detNormalizedStatImfile.php \
     51$(DESTWWW)/detProcessedImfile.php \
     52$(DESTWWW)/detProcessedExp.php \
     53$(DESTWWW)/detResidExp.php \
     54$(DESTWWW)/detResidImfile.php \
     55$(DESTWWW)/detRun.php \
     56$(DESTWWW)/detRunSummary.php \
     57$(DESTWWW)/detStackedImfile.php \
     58$(DESTWWW)/newExp.php \
     59$(DESTWWW)/newImfile.php \
     60$(DESTWWW)/guidePendingExp.php \
     61$(DESTWWW)/chipPendingExp.php \
     62$(DESTWWW)/chipPendingImfile.php \
     63$(DESTWWW)/chipProcessedExp.php \
     64$(DESTWWW)/chipProcessedImfile.php \
     65$(DESTWWW)/camPendingExp.php \
     66$(DESTWWW)/camProcessedExp.php \
     67$(DESTWWW)/pzPendingExp.php \
     68$(DESTWWW)/pzPendingImfile.php \
     69$(DESTWWW)/rawUnknownExp.php \
     70$(DESTWWW)/rawDetrendExp.php \
     71$(DESTWWW)/rawDetrendExp_detrend.php \
     72$(DESTWWW)/rawImfile.php \
     73$(DESTWWW)/rawImfile_failed.php \
     74$(DESTWWW)/rawExp_failed.php \
     75$(DESTWWW)/rawScienceExp.php \
     76$(DESTWWW)/rawExp.php \
     77$(DESTWWW)/summitExp.php \
     78$(DESTWWW)/warpRun.php \
     79$(DESTWWW)/warpInputExp.php \
     80$(DESTWWW)/warpSkycellMap.php \
     81$(DESTWWW)/warpSkyfile.php \
     82$(DESTWWW)/diffRun.php \
     83$(DESTWWW)/diffInputSkyfile.php \
     84$(DESTWWW)/diffSkyfile.php \
     85$(DESTWWW)/stackRun.php \
     86$(DESTWWW)/stackInputSkyfile.php \
     87$(DESTWWW)/stackSumSkyfile.php
    8188
    8289
    8390PICTURES = \
    84 $(DESTBIN)/PScolorlogo2.jpg \
    85 $(DESTBIN)/missing.png
     91$(DESTWWW)/PScolorlogo2.jpg \
     92$(DESTWWW)/missing.png
    8693
    87 DESTLINK = $(DESTBIN)/index.php
     94DESTLINK = $(DESTWWW)/index.php
    8895
    89 php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK)
     96php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS)
    9097
    9198# dependancy rules for binary code #########################
    … …  
    93100# .PRECIOUS: $(BIN)/%.$(ARCH)
    94101
    95 $(DESTLINK): $(DESTBIN)/Login.php
     102$(DESTLINK): $(DESTWWW)/Login.php
    96103        rm -f $@
    97         ln -s $(DESTBIN)/Login.php $@
     104        ln -s $(DESTWWW)/Login.php $@
    98105
    99 $(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php ./generate
     106$(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php $(GENERATE)
    100107        @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    101         ./generate $< $(DEF)/autocode.php $@
    102 
    103 # $(SRC)/%.php: $(RAW)/%.php
    104 #       @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    105 #       cp $< $@
    106 #
    107 # $(SRC)/%.css: $(RAW)/%.css
    108 #       @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    109 #       cp $< $@
    110 #
    111 # $(SRC)/%.dat: $(RAW)/%.dat
    112 #       @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    113 #       cp $< $@
    114 #
    115 # $(SRC)/%.jpg: $(RAW)/%.jpg
    116 #       @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    117 #       cp $< $@
    118 #
    119 # $(SRC)/%.png: $(RAW)/%.png
    120 #       @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    121 #       cp $< $@
    122 #
    123 # $(SRC)/%.jpeg: $(RAW)/%.jpeg
    124 #       @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
    125 #       cp $< $@
     108        $(GENERATE) $< $(DEF)/autocode.php $@
    126109
    127110# generated php code is built into SRC first
    128 $(DESTBIN)/%.php: $(SRC)/%.php
    129         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    130         rm -f $(DESTBIN)/$*.php || exit
    131         cp $(SRC)/$*.php $(DESTBIN)/$*.php || exit
     111$(DESTWWW)/%.php: $(SRC)/%.php
     112        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     113        rm -f $(DESTWWW)/$*.php || exit
     114        cp $(SRC)/$*.php $(DESTWWW)/$*.php || exit
    132115
    133116# non-generated php code is copied directly
    134 $(DESTBIN)/%.php: $(RAW)/%.php
    135         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    136         rm -f $(DESTBIN)/$*.php || exit
    137         cp $(RAW)/$*.php $(DESTBIN)/$*.php || exit
     117$(DESTWWW)/%.php: $(RAW)/%.php
     118        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     119        rm -f $(DESTWWW)/$*.php || exit
     120        cp $(RAW)/$*.php $(DESTWWW)/$*.php || exit
    138121
    139122# all other files are copied directly
    140 $(DESTBIN)/%.css: $(RAW)/%.css
     123$(DESTWWW)/%.css: $(RAW)/%.css
     124        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     125        rm -f $(DESTWWW)/$*.css || exit
     126        cp $(RAW)/$*.css $(DESTWWW)/$*.css || exit
     127
     128$(DESTWWW)/%.dat: $(RAW)/%.dat
     129        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     130        rm -f $(DESTWWW)/$*.dat || exit
     131        cp $(RAW)/$*.dat $(DESTWWW)/$*.dat || exit
     132
     133$(DESTWWW)/%.jpg: $(RAW)/%.jpg
     134        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     135        rm -f $(DESTWWW)/$*.jpg || exit
     136        cp $(RAW)/$*.jpg $(DESTWWW)/$*.jpg || exit
     137
     138$(DESTWWW)/%.jpeg: $(RAW)/%.jpeg
     139        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     140        rm -f $(DESTWWW)/$*.jpeg || exit
     141        cp $(RAW)/$*.jpeg $(DESTWWW)/$*.jpeg || exit
     142
     143$(DESTWWW)/%.png: $(RAW)/%.png
     144        @if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
     145        rm -f $(DESTWWW)/$*.png || exit
     146        cp $(RAW)/$*.png $(DESTWWW)/$*.png || exit
     147
     148$(DESTBIN)/%: $(SCRIPTS)/%
    141149        @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    142         rm -f $(DESTBIN)/$*.css || exit
    143         cp $(RAW)/$*.css $(DESTBIN)/$*.css || exit
    144 
    145 $(DESTBIN)/%.dat: $(RAW)/%.dat
    146         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    147         rm -f $(DESTBIN)/$*.dat || exit
    148         cp $(RAW)/$*.dat $(DESTBIN)/$*.dat || exit
    149 
    150 $(DESTBIN)/%.jpg: $(RAW)/%.jpg
    151         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    152         rm -f $(DESTBIN)/$*.jpg || exit
    153         cp $(RAW)/$*.jpg $(DESTBIN)/$*.jpg || exit
    154 
    155 $(DESTBIN)/%.jpeg: $(RAW)/%.jpeg
    156         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    157         rm -f $(DESTBIN)/$*.jpeg || exit
    158         cp $(RAW)/$*.jpeg $(DESTBIN)/$*.jpeg || exit
    159 
    160 $(DESTBIN)/%.png: $(RAW)/%.png
    161         @if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
    162         rm -f $(DESTBIN)/$*.png || exit
    163         cp $(RAW)/$*.png $(DESTBIN)/$*.png || exit
     150        cp $(SCRIPTS)/$* $(DESTBIN)/$* || exit
     151        chmod +x $(DESTBIN)/$* || exit
    164152
    165153# utilities #################################################

  • trunk/ippMonitor/configure.tcsh

    r13853 r15784  
    158158if (-e Makefile) mv -f Makefile Makefile~
    159159cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1
    160 mv tmp.1 Makefile
     160cat tmp.1       | sed "s|@BINDIR@|$bindir|" > Makefile
     161rm -f tmp.1
    161162
    162163# convert raw/site.php.in to raw/site.php
Note: See TracChangeset for help on using the changeset viewer.