Changeset 41170 for branches/eam_branches/ipp-20191011/ippMonitor/Makefile.in

Timestamp:

Nov 27, 2019, 11:39:38 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly Ohana & ippMonitor improvements, some work on ippTools)

Location:

branches/eam_branches/ipp-20191011

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/Makefile.in (modified) (6 diffs)

branches/eam_branches/ipp-20191011/ippMonitor/Makefile.in

@@ -1 @@
-default: updateVersion php
+default: updateVersion php mklink
 help:
         @echo "USAGE: make php"
 
-SRC     =       src
-DEF     =       def
-RAW     =       raw
-SCRIPTS =       scripts
-DESTBIN =       @BINDIR@
-DESTWWW =       @HTDOCS@/ippMonitor
+SRC     = src
+DEF     = def
+RAW     = raw
+SCRIPTS = scripts
+DESTBIN = @BINDIR@
+DESTWWW = @HTDOCS@/ippMonitor
+CZARPLOTDIR = /export/@HOST2@.0/ipp/czartool_plots
+METRICSPLOTDIR = /export/@HOST2@.0/ipp/ippMetrics
 
 GENERATE = $(SCRIPTS)/generate
@@ -172 +174 @@
 $(DESTWWW)/fullforceRun.php \
 $(DESTWWW)/fullforceSummary.php \
+$(DESTWWW)/fullforce_failure.php \
 $(DESTWWW)/failedFullforce.php \
 $(DESTWWW)/diffSummary.php \
@@ -280 +283 @@
 $(DESTWWW)/noimage.png
 
-DESTLINK = $(DESTWWW)/index.php
-
-php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS)
+DESTLINK = $(DESTWWW)/index.php 
+CZPLOTSLINK = $(DESTWWW)/czartool_plots
+METRICSLINK = $(DESTWWW)/ippMetrics
+
+
+php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS) 
 
 # dependancy rules for binary code #########################
@@ -288 +294 @@
 # .PRECIOUS: $(BIN)/%.$(ARCH)
 
-$(DESTLINK): $(DESTWWW)/Login.php
+$(DESTLINK): $(DESTWWW)/Login.php 
         rm -f $@
         ln -s $(DESTWWW)/Login.php $@
@@ -311 +317 @@
 updateVersion:
         rm -f $(DESTWWW)/version.php
-
-test:
+        @if [ ! -d $(CZARPLOTDIR) ]; then mkdir -p $(CZARPLOTDIR); fi
+        @if [ ! -d $(METRICSPLOTDIR) ]; then mkdir -p $(METRICSPLOTDIR); fi
+
+mklink: $(CZPLOTSLINK) $(METRICSLINK)
+
+$(CZPLOTSLINK): $(CZARPLOTDIR)
+        rm -f $@
+        ln -s $(CZARPLOTDIR) $@
+
+$(METRICSLINK): $(METRICSPLOTDIR)
+        rm -f $@
+        ln -s $(METRICSPLOTDIR) $@
+
+test: 
 #DESTWWW := $(DESTWWW)/test
         echo $(DESTWWW)
@@ -355 +373 @@
         cp $(SCRIPTS)/$* $(DESTBIN)/$* || exit
         chmod +x $(DESTBIN)/$* || exit
+
+
+
 
 # utilities #################################################