Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Frazer <joseph.frazer@ryansg.com>2020-04-08 09:10:18 -0400
committerJoseph Frazer <joseph.frazer@ryansg.com>2020-04-08 09:10:18 -0400
commitbb0c7486720134c1d6e9404851d28beef6971629 (patch)
tree82491f97f38e80e201966ccdd3c3517579b40320
parent587241bf9b1e390b28935b80f969d953d8e1bafe (diff)
parentf6bf0425050e512ff48b53c7ab15f21aae4528e2 (diff)
downloadtame-bb0c7486720134c1d6e9404851d28beef6971629.tar.gz
tame-bb0c7486720134c1d6e9404851d28beef6971629.tar.bz2
tame-bb0c7486720134c1d6e9404851d28beef6971629.zip
[DEV-7136] Add xmli files
Merge branch 'jira-7136' * jira-7136: [DEV-7136] Add xmli files
-rw-r--r--build-aux/Makefile.am7
-rw-r--r--core/.gitignore1
2 files changed, 7 insertions, 1 deletions
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index ba9256e..7e93e5e 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -113,8 +113,12 @@ common: $(xmlo_common)
program-ui: ui/package.strip.js ui/Program.js ui/html/index.phtml
+# Handle an intermediate step as we transition to the new compiler
+%.xmli: %.xml
+ cp $< $@
+
# Individual dependencies appear in suppliers.mk (see below)
-%.xmlo: %.xml $(path_tame)/.rev-xmlo
+%.xmlo: %.xmli $(path_tame)/.rev-xmlo
$(TAME_TS)
$(TAME) compile $< $@
@@ -207,6 +211,7 @@ clean:
find -L $(path_suppliers) $(path_map) $(path_c1map) common/ rater/core rater/lv \( \
-name '*.xmlo' \
-o -name '*.xmle' \
+ -o -name '*.xmli' \
-o -name '*.js' \
-o -name '*.html' \
-o -name '*.dep' \
diff --git a/core/.gitignore b/core/.gitignore
index 7a51172..7d3e9e3 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,5 +1,6 @@
# when core is built
*.xmlo
+*.xmli
*.xmle
*.js
*.dep