azkaban-memoizeit
Changes
build.xml 9(+3 -6)
src/less/.gitignore 2(+1 -1)
src/less/Makefile 21(+5 -16)
src/tl/.gitignore 2(+1 -1)
src/tl/Makefile 13(+7 -6)
Details
build.xml 9(+3 -6)
diff --git a/build.xml b/build.xml
index 26c0c38..e1f77bb 100644
--- a/build.xml
+++ b/build.xml
@@ -81,13 +81,13 @@
<!-- Compile dustjs templates -->
<exec dir="${dust.src.dir}" executable="make" failonerror="true"/>
<copy todir="${dist.dust.dir}">
- <fileset dir="${dust.src.dir}" includes="*.js" />
+ <fileset dir="${dust.src.dir}/obj" includes="*.js" />
</copy>
<!-- Compile LESS to CSS -->
<exec dir="${less.src.dir}" executable="make" failonerror="true"/>
<copy todir="${dist.less.dir}" >
- <fileset dir="${less.src.dir}" includes="*.css" />
+ <fileset dir="${less.src.dir}/obj" includes="*.css" />
</copy>
</target>
@@ -286,10 +286,7 @@
<!-- Copy compiled less CSS -->
<copy todir="${dist.solo.package.dir}/web/css">
- <fileset dir="${dist.less.dir}">
- <include name="azkaban.css" />
- <include name="azkaban-svg.css" />
- </fileset>
+ <fileset dir="${dist.less.dir}" />
</copy>
<!-- Copy sql files -->
src/less/.gitignore 2(+1 -1)
diff --git a/src/less/.gitignore b/src/less/.gitignore
index b3a5267..2416a67 100644
--- a/src/less/.gitignore
+++ b/src/less/.gitignore
@@ -1 +1 @@
-*.css
+obj/
src/less/Makefile 21(+5 -16)
diff --git a/src/less/Makefile b/src/less/Makefile
index 34f488f..48f04c6 100644
--- a/src/less/Makefile
+++ b/src/less/Makefile
@@ -1,26 +1,15 @@
+OBJ_DIR = obj
OBJ = \
- azkaban.css \
- azkaban-svg.css \
- base.css \
- context-menu.css \
- flow.css \
- header.css \
- job.css \
- login.css \
- log.css \
- navbar.css \
- non-responsive.css \
- off-canvas.css \
- project.css \
- tables.css
+ $(OBJ_DIR)/azkaban.css \
+ $(OBJ_DIR)/azkaban-svg.css
all: $(OBJ)
-.less.css:
+$(OBJ_DIR)/%.css: %.less
lessc $< $@
clean:
- rm -f $(OBJ)
+ rm -rf $(OBJ_DIR)
.SUFFIXES: .less .css
src/tl/.gitignore 2(+1 -1)
diff --git a/src/tl/.gitignore b/src/tl/.gitignore
index a6c7c28..2416a67 100644
--- a/src/tl/.gitignore
+++ b/src/tl/.gitignore
@@ -1 +1 @@
-*.js
+obj/
src/tl/Makefile 13(+7 -6)
diff --git a/src/tl/Makefile b/src/tl/Makefile
index 8c8a1d0..f559ce3 100644
--- a/src/tl/Makefile
+++ b/src/tl/Makefile
@@ -1,15 +1,16 @@
+OBJ_DIR = obj
OBJ = \
- flowsummary.js \
- flowsummary-no-data.js \
- flowsummary-last-run.js
+ $(OBJ_DIR)/flowsummary.js \
+ $(OBJ_DIR)/flowsummary-no-data.js \
+ $(OBJ_DIR)/flowsummary-last-run.js
all: $(OBJ)
-.tl.js:
- dustc --name=$(basename $<) $< $@
+$(OBJ_DIR)/%.js: %.tl
+ mkdir -p $(OBJ_DIR) && dustc --name=$(basename $<) $< $@
clean:
- rm -f $(OBJ)
+ rm -rf $(OBJ_DIR)
.SUFFIXES: .tl .js