employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

Add new c1root and local c1-service copying to build 

This maintains BC for existing raters that have not yet been migrated to use
the new c1-import service.

* build-aux/Makefile.am (path_c1root): New variable.
  (.PHONY): Add c1root target dependency.
  (program-data-copy): Copy to `@C1_IMPORT_MAPDEST@'.
  (c1root): New target.
* build-aux/m4/calcdsl.m4 (C1_IMPORT_MAPDEST): Configure depending on the
    existence of the `c1-import' directory.
master
Mike Gerwitz 2018-11-28 15:55:49 -05:00
parent 7f3e279cfa
commit cc7e09a700
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build-aux/Makefile.am
View File

@ -29,6 +29,7 @@ path_suppliers := suppliers
path_lv := lovullo
path_srv := srv
path_lvroot := lvroot
path_c1root := c1root
path_intralov_root := "intralov-root/@program@"
src_suppliers := $(wildcard $(path_suppliers)/*.xml)
@ -70,7 +71,7 @@ extless_supp_delim := $(subst .xml,,$(subst .xml ,$(comma),$(src_suppliers)))
ant = @ANT@ -e
.PHONY: FORCE default program-data-copy lvroot program-ui-immediate test \
.PHONY: FORCE default program-data-copy lvroot c1root program-ui-immediate test \
default clean interp-rate-tables summary-html c1map standalones \
strip program-ui version FORCE
@ -219,7 +220,7 @@ program-data-copy: standalones program-ui c1map .version.xml
cp -v "$(path_suppliers)/"*.js \
"$(path_lv)/src/node/program/rater/programs/@program@"
test ! -d "$(path_c1map)" || cp -v "$(path_c1map)/"*.php \
"$(path_lv)/src/lib/c1/interfaces/c1/contract/@program@/"
"@C1_IMPORT_MAPDEST@/@program@/"
ant -f "$(path_lv)/build.xml" js-mod-order
# TODO: merge this and the above
@ -248,6 +249,13 @@ lvroot: summary-html program-ui c1map strip
test ! -d "$(path_c1map)" || cp -v "$(path_c1map)/"*.php \
"$(path_lvroot)/src/lib/c1/interfaces/c1/contract/@program@/"
# used by newer systems (note that lvroot still contains the c1map files so
# as not to break BC)
c1root: c1map
mkdir -p "$(path_c1root)/src/RSG/ImportBundle/Lib/interfaces/c1/contract/@program@/"
cp -v "$(path_c1map)/"*.php \
"$(path_c1root)/src/RSG/ImportBundle/Lib/interfaces/c1/contract/@program@/"
intralov-root: summary-html
mkdir -p "$(path_intralov_root)/"{rater/scripts,suppliers}
ln -fL $(path_dsl)/summary.css "$(path_intralov_root)/rater"

5
build-aux/m4/calcdsl.m4
View File

@ -41,6 +41,11 @@ AC_ARG_VAR([PROGUI_TEST_PATH], [Path to JavaScript tests for Program UI])
AC_CHECK_PROGS(JAVA, [java])
AC_CHECK_PROGS(ANT, [ant])
# Destination paths for local development
AC_CHECK_FILE(c1-import,
[AC_SUBST(C1_IMPORT_MAPDEST, c1-import/src/RSG/ImportBundle/Lib/interfaces/c1/contract)],
[AC_SUBST(C1_IMPORT_MAPDEST, lovullo/src/lib/c1/interfaces/c1/contract)])
AS_IF([test "$JAVA"],,
[AC_MSG_ERROR([missing java])])
AS_IF([test "$ANT"],,