Updated Makefile for Linux.

diff --git a/Make.cmd b/Make.cmd
index a208038..530bc3f 100644 (file)
--- a/Make.cmd
+++ b/Make.cmd
@@ -16,7 +16,6 @@ REM Prerequisites
 set "PDOC_PATH=%~dp0\..\Prerequisites\Pandoc"
 set "ANT_HOME=%~dp0\..\Prerequisites\Ant"
 set "HTMLCMPR_PATH=%~dp0\..\Prerequisites\HTMLCompressor\bin"
-set "CSS_INC_PATH=%~dp0\..\Prerequisites\Pandoc\css"
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Check paths
@@ -154,7 +153,7 @@ REM ///////////////////////////////////////////////////////////////////////////
 REM // Generate Docs
 REM ///////////////////////////////////////////////////////////////////////////
 
-"%PDOC_PATH%\pandoc.exe" --from markdown_github+pandoc_title_block+header_attributes+implicit_figures --to html5 --toc -N --standalone -H "%CSS_INC_PATH%\github-pandoc.inc" "%%~i" | "%JAVA_HOME%\bin\java.exe" -jar "%HTMLCMPR_PATH%\htmlcompressor-1.5.3.jar" --compress-css -o "%%~dpni.html"
+"%PDOC_PATH%\pandoc.exe" --from markdown_github+pandoc_title_block+header_attributes+implicit_figures --to html5 --toc -N --standalone -H "%~dp0\etc\css\style.inc" "%%~i" | "%JAVA_HOME%\bin\java.exe" -jar "%HTMLCMPR_PATH%\htmlcompressor-1.5.3.jar" --compress-css -o "%%~dpni.html"
 if not "%ERRORLEVEL%"=="0" goto BuildHasFailed
 
 

diff --git a/Makefile b/Makefile
index 40ab73a..f08fdc8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ WITH_JAVA ?= 1
 CPU_ARCH ?= native
 CPU_TUNE ?= generic
 
+HOME ?= /tmp
 
 #############################################################################
 # CONFIGURATION
@@ -37,6 +38,7 @@ endif
 
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 WORK_DIR := /tmp/$(shell head /dev/urandom | tr -dc A-Za-z0-9 | head -c 12)
+JARS_DIR := $(HOME)/.jar
 ISO_DATE := $(shell date "+%Y-%m-%d")
 
 CM_FLAGS := -I$(ROOT_DIR)/include
@@ -44,8 +46,7 @@ RL_FLAGS := -DNDEBUG -O3 -march=$(CPU_ARCH) -mtune=$(CPU_TUNE)
 DB_FLAGS := -g
 EX_FLAGS := -static
 SO_FLAGS := $(DLLOPT) -static-libgcc -static-libstdc++
-PD_FLAGS := --from markdown --to html5 --toc -N --standalone
-
+PD_FLAGS := --from markdown_github+pandoc_title_block+header_attributes+implicit_figures --to html5 --toc -N --standalone -H "etc/css/style.inc"
 
 #############################################################################
 # FILE NAMES
@@ -53,6 +54,7 @@ PD_FLAGS := --from markdown --to html5 --toc -N --standalone
 
 TXT := $(ROOT_DIR)COPYING.txt
 DOC := $(ROOT_DIR)README.html 
+JPG := $(wildcard $(ROOT_DIR)/img/mhash/*.jpg)
 
 ifeq ($(CPLUSPLUS),1)
   CLI_CXX := g++
@@ -100,22 +102,28 @@ all: $(TARGETS)
 # -----------------------------------------------
 
 $(CLI_OUT): $(CLI_BIN) $(CLI_DBG) $(DOC) $(TXT)
-       mkdir -p $(dir $@) $(WORK_DIR)
-       rm -fv $@ $(WORK_DIR)/*
+       rm -rfv $@ $(WORK_DIR)
+       mkdir -p $(dir $@) $(WORK_DIR)/img/mhash
+       cp $(JPG) $(WORK_DIR)/img/mhash
        cp $(DOC) $(TXT) $(CLI_BIN) $(WORK_DIR)
        pushd $(WORK_DIR) && tar -czf $@ *
+       rm -rfv $(WORK_DIR)
 
 $(JAV_OUT): $(JAV_JAR) $(JAV_GUI) $(DOC) $(TXT)
-       mkdir -p $(dir $@) $(WORK_DIR)
-       rm -fv $@ $(WORK_DIR)/*
+       rm -rfv $@ $(WORK_DIR)
+       mkdir -p $(dir $@) $(WORK_DIR)/img/mhash
+       cp $(JPG) $(WORK_DIR)/img/mhash
        cp $(DOC) $(TXT) $(JAV_JAR) $(JAV_GUI) $(WORK_DIR)
        pushd $(WORK_DIR) && tar -czf $@ *
+       rm -rfv $(WORK_DIR)
 
 $(PYT_OUT): $(PYT_LIB) $(PYT_GUI) $(DOC) $(TXT)
-       mkdir -p $(dir $@) $(WORK_DIR)
-       rm -fv $@ $(WORK_DIR)/*
+       rm -rfv $@ $(WORK_DIR)
+       mkdir -p $(dir $@) $(WORK_DIR)/img/mhash
+       cp $(JPG) $(WORK_DIR)/img/mhash
        cp $(DOC) $(TXT) $(PYT_LIB) $(PYT_GUI) $(WORK_DIR)
        pushd $(WORK_DIR) && tar -czf $@ *
+       rm -rfv $(WORK_DIR)
 
 # -----------------------------------------------
 # COMPILE
@@ -143,7 +151,10 @@ $(JAV_GUI): $(abspath $(dir $(JAV_GUI))/../build.xml)
 # -----------------------------------------------
 
 %.html: %.md
-       pandoc $(PD_FLAGS) --output $@ $^
+       mkdir -p $(JARS_DIR)
+       wget -N -P $(JARS_DIR) https://repo1.maven.org/maven2/com/yahoo/platform/yui/yuicompressor/2.4.8/yuicompressor-2.4.8.jar
+       wget -N -P $(JARS_DIR) https://repo1.maven.org/maven2/com/googlecode/htmlcompressor/htmlcompressor/1.5.2/htmlcompressor-1.5.2.jar
+       pandoc $(PD_FLAGS) $^ | java -jar $(JARS_DIR)/htmlcompressor-1.5.2.jar --compress-css -o $@
 
 # -----------------------------------------------
 # CLEAN UP
@@ -154,4 +165,3 @@ clean:
        rm -fv $(JAV_BIN) $(JAV_JAR) $(JAV_GUI) $(JAV_OUT)
        rm -fv $(PYT_BIN) $(PYT_OUT)
        rm -fv $(DOC)
-

diff --git a/etc/css/style.inc b/etc/css/style.inc
index 9d79c0a..dec307a 100644 (file)
--- a/etc/css/style.inc
+++ b/etc/css/style.inc
@@ -1,10 +1,3 @@
 <style type="text/css">
-<!--
-  p { text-align: justify; }
-  tt, pre, code { background-color: #EDF3F7; padding: 1px; }
-  a { color: #0000BB; text-decoration: none; }
-  a:visited { color: #0000BB; text-decoration: none; }
-  a:active { color: #0000FF; text-decoration: none; }
-  a:hover { color: #0000FF; text-decoration: underline; }
--->
-</style>
+/*!normalize.css v3.0.1 | MIT License | git.io/normalize*/body,h1,h2,html,mark{color:#000}blockquote,h6{color:#777}code,table tr:nth-child(2n),tt{background-color:#f8f8f8}code,h3,h4,h5,tt{color:#333}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0;color:#4183c4;text-decoration:none}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,optgroup,strong{font-weight:700}dfn{font-style:italic}mark{background:#ff0}small{font-size:80%}sup{top:-.5em}img{border:0;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:1em 12px}hr{-moz-box-sizing:content-box;box-sizing:content-box}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}td,th{padding:0}.caption{margin-bottom:5em}body,html{margin:auto;padding-right:1em;padding-left:1em;max-width:57em}:not('#mkdbuttons'){margin:0;padding:0}body{font:13.34px helvetica,arial,freesans,clean,sans-serif;-webkit-font-smoothing:subpixel-antialiased;background:#fff;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;padding:30px;margin:15px;font-size:14px;line-height:1.6}dl dt,h1,h2,h3,h4,h5,h6{font-weight:700;padding:0}body>:first-child{margin-top:0!important}body>:last-child{margin-bottom:0!important}h1,h2,h3,h4,h5,h6{margin:20px 0 10px;-webkit-font-smoothing:subpixel-antialiased;cursor:text}h1{font-size:28px}h2{font-size:24px;border-bottom:1px solid #ccc}h3{font-size:18px}h4{font-size:16px}dl dt,h5,h6{font-size:14px}blockquote,p,pre,table{margin:15px 0}ol,ul{padding-left:30px}blockquote>:first-child,dl dd>:first-child,dl dt>:first-child,h1+p,h2+p,h3+p,h4+p,h5+p,h6+p,ol li ul:first-of-type,ol li>:first-child,ul li>:first-child{margin-top:0}hr{background:url('data:image/png; base64, iVBORw0KGgoAAAANSUhEUgAAAAYAAAAECAYAAACtBE5DAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OENDRjNBN0E2NTZBMTFFMEI3QjRBODM4NzJDMjlGNDgiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OENDRjNBN0I2NTZBMTFFMEI3QjRBODM4NzJDMjlGNDgiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4Q0NGM0E3ODY1NkExMUUwQjdCNEE4Mzg3MkMyOUY0OCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4Q0NGM0E3OTY1NkExMUUwQjdCNEE4Mzg3MkMyOUY0OCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PqqezsUAAAAfSURBVHjaYmRABcYwBiM2QSA4y4hNEKYDQxAEAAIMAHNGAzhkPOlYAAAAAElFTkSuQmCC') repeat-x;border:0;color:#ccc;height:4px;padding:0}a:first-child h1,a:first-child h2,a:first-child h3,a:first-child h4,a:first-child h5,a:first-child h6,body>h1:first-child,body>h1:first-child+h2,body>h2:first-child,body>h3:first-child,body>h4:first-child,body>h5:first-child,body>h6:first-child{margin-top:0;padding-top:0}table td,table th{border:1px solid #ccc;padding:6px 13px}dl,dl dt:first-child{padding:0}dl dt{font-style:italic;margin:15px 0 5px}blockquote>:last-child,dl dd>:last-child,dl dt>:last-child{margin-bottom:0}dl dd{margin:0 0 15px;padding:0 15px}blockquote{border-left:4px solid #DDD;padding:0 15px}table{border-collapse:collapse;border-spacing:0;font:inherit}.highlight .c,.highlight .c1,.highlight .cm,.highlight .cs,.highlight .ge,.poetry pre{font-style:italic}.highlight .cp,.highlight .cs,.highlight .gs,.highlight .k,.highlight .kc,.highlight .kd,.highlight .kn,.highlight .kp,.highlight .kr,.highlight .kt,.highlight .nc,.highlight .ne,.highlight .nf,.highlight .o,.highlight .ow,table th{font-weight:700}table tr{border-top:1px solid #ccc;background-color:#fff}code,tt{margin:0 2px;padding:0 5px;white-space:nowrap;border:1px solid #eaeaea;border-radius:3px;font-family:Consolas,'Liberation Mono',Courier,monospace;font-size:12px}.poetry pre,.poetry pre code{font-family:Georgia,Garamond,serif!important}pre>code{margin:0;padding:0;white-space:pre;border:0;background:0 0}.highlight pre,pre{background-color:#f8f8f8;border:1px solid #ccc;font-size:13px;line-height:19px;overflow:auto;padding:6px 10px;border-radius:3px}pre code,pre tt{background-color:transparent;border:0}.poetry pre{font-size:110%!important;line-height:1.6em;display:block;margin-left:1em}.poetry pre code{word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;hyphens:auto;white-space:pre-wrap}a.footnote,sub,sup{font-size:1.4ex;height:0;line-height:1;vertical-align:super;position:relative}sub{bottom:-.25em;vertical-align:sub;top:-1px}@media print{body,pre{background:#fff}body{border:0}blockquote,figure,img,pre,table{page-break-inside:avoid}code{background-color:#fff;color:#333!important;padding:0 .2em;border:1px solid #dedede}pre code{background-color:#fff!important;overflow:visible}}@media screen{body{box-shadow:0 0 0 1px #cacaca,0 0 0 4px #eee}.inverted .math,.inverted blockquote,.inverted body,.inverted caption,.inverted dd,.inverted dt,.inverted h1,.inverted h2,.inverted h3,.inverted h4,.inverted h5,.inverted h6,.inverted hr .inverted p,.inverted li,.inverted td,.inverted th,body.inverted{color:#eee!important;border-color:#555;box-shadow:none}.inverted td,.inverted th{background:#333}.inverted h2{border-color:#555}.inverted hr{border-color:#777;border-width:1px!important}::selection{background:rgba(157,193,200,.5)}h1::selection{background-color:rgba(45,156,208,.3)}h2::selection{background-color:rgba(90,182,224,.3)}h3::selection,h4::selection,h5::selection,h6::selection,li::selection,ol::selection{background-color:rgba(133,201,232,.3)}code::selection{background-color:rgba(0,0,0,.7);color:#eee}code span::selection{background-color:rgba(0,0,0,.7)!important;color:#eee!important}a::selection{background-color:rgba(255,230,102,.2)}.inverted a::selection{background-color:rgba(255,230,102,.6)}caption::selection,td::selection,th::selection{background-color:rgba(180,237,95,.5)}.inverted,.inverted body{background:#252a2a}.inverted a{color:#acd1d5}}.highlight .c{color:#998}.highlight .err{color:#a61717;background-color:#e3d2d2}.highlight .cm{color:#998}.highlight .cp{color:#999}.highlight .c1{color:#998}.highlight .cs{color:#999}.highlight .gd{color:#000;background-color:#fdd}.highlight .gd .x{color:#000;background-color:#faa}.highlight .gr{color:#a00}.highlight .gh{color:#999}.highlight .gi{color:#000;background-color:#dfd}.highlight .gi .x{color:#000;background-color:#afa}.highlight .go{color:#888}.highlight .gp{color:#555}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#a00}.highlight .kt{color:#458}.highlight .m{color:#099}.highlight .s{color:#d14}.highlight .na{color:teal}.highlight .nb{color:#0086b3}.highlight .nc{color:#458}.highlight .no{color:teal}.highlight .ni{color:purple}.highlight .ne,.highlight .nf{color:#900}.highlight .nn{color:#555}.highlight .nt{color:navy}.highlight .nv{color:teal}.highlight .w{color:#bbb}.highlight .mf,.highlight .mh,.highlight .mi,.highlight .mo{color:#099}.highlight .s2,.highlight .sb,.highlight .sc,.highlight .sd,.highlight .se,.highlight .sh,.highlight .si,.highlight .sx{color:#d14}.highlight .sr{color:#009926}.highlight .s1{color:#d14}.highlight .ss{color:#990073}.highlight .bp{color:#999}.highlight .vc,.highlight .vg,.highlight .vi{color:teal}.highlight .il{color:#099}.highlight .gc{color:#999;background-color:#eaf2f5}.type-csharp .highlight .k,.type-csharp .highlight .kt{color:#00F}.type-csharp .highlight .nf{color:#000;font-weight:400}.type-csharp .highlight .nc{color:#2b91af}.type-csharp .highlight .nn{color:#000}.type-csharp .highlight .s,.type-csharp .highlight .sc{color:#a31515}
+</style>
\ No newline at end of file